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

[juneau] branch master updated: Remove {@doc} tags from documentation.

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 80a00669d Remove {@doc} tags from documentation.
80a00669d is described below

commit 80a00669dbfa12f8e1218b05b7be9184ed8f3044
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Mon Oct 17 14:59:14 2022 -0400

    Remove {@doc} tags from documentation.
---
 .../org/apache/juneau/assertions/AnyAssertion.java |   2 +-
 .../apache/juneau/assertions/ArrayAssertion.java   |   2 +-
 .../org/apache/juneau/assertions/Assertion.java    |   2 +-
 .../juneau/assertions/AssertionPredicate.java      |   2 +-
 .../juneau/assertions/AssertionPredicates.java     |   2 +-
 .../org/apache/juneau/assertions/Assertions.java   |  64 +-
 .../apache/juneau/assertions/BeanAssertion.java    |   2 +-
 .../juneau/assertions/BeanListAssertion.java       |   2 +-
 .../apache/juneau/assertions/BooleanAssertion.java |   2 +-
 .../juneau/assertions/ByteArrayAssertion.java      |   2 +-
 .../juneau/assertions/CollectionAssertion.java     |   2 +-
 .../juneau/assertions/ComparableAssertion.java     |   2 +-
 .../apache/juneau/assertions/DateAssertion.java    |   2 +-
 .../juneau/assertions/FluentAnyAssertion.java      |   2 +-
 .../juneau/assertions/FluentArrayAssertion.java    |   2 +-
 .../apache/juneau/assertions/FluentAssertion.java  |   2 +-
 .../juneau/assertions/FluentBeanAssertion.java     |   2 +-
 .../juneau/assertions/FluentBeanListAssertion.java |   2 +-
 .../juneau/assertions/FluentBooleanAssertion.java  |   2 +-
 .../assertions/FluentByteArrayAssertion.java       |   2 +-
 .../assertions/FluentCollectionAssertion.java      |   2 +-
 .../assertions/FluentComparableAssertion.java      |   2 +-
 .../juneau/assertions/FluentDateAssertion.java     |   2 +-
 .../juneau/assertions/FluentIntegerAssertion.java  |   2 +-
 .../juneau/assertions/FluentListAssertion.java     |   2 +-
 .../juneau/assertions/FluentLongAssertion.java     |   2 +-
 .../juneau/assertions/FluentMapAssertion.java      |   2 +-
 .../juneau/assertions/FluentObjectAssertion.java   |   2 +-
 .../assertions/FluentPrimitiveArrayAssertion.java  |   2 +-
 .../juneau/assertions/FluentStringAssertion.java   |   2 +-
 .../assertions/FluentStringListAssertion.java      |   2 +-
 .../assertions/FluentThrowableAssertion.java       |   2 +-
 .../juneau/assertions/FluentVersionAssertion.java  |   2 +-
 .../assertions/FluentZonedDateTimeAssertion.java   |   2 +-
 .../apache/juneau/assertions/IntegerAssertion.java |   2 +-
 .../apache/juneau/assertions/ListAssertion.java    |   2 +-
 .../apache/juneau/assertions/LongAssertion.java    |   2 +-
 .../org/apache/juneau/assertions/MapAssertion.java |   2 +-
 .../apache/juneau/assertions/ObjectAssertion.java  |   2 +-
 .../juneau/assertions/PrimitiveArrayAssertion.java |   2 +-
 .../apache/juneau/assertions/StringAssertion.java  |   2 +-
 .../juneau/assertions/StringListAssertion.java     |   2 +-
 .../juneau/assertions/ThrowableAssertion.java      |   2 +-
 .../java/org/apache/juneau/assertions/Verify.java  |   2 +-
 .../apache/juneau/assertions/VersionAssertion.java |   2 +-
 .../juneau/assertions/ZonedDateTimeAssertion.java  |   2 +-
 .../org/apache/juneau/internal/StringUtils.java    |   2 +-
 .../main/java/org/apache/juneau/utils/Snippet.java |   2 +-
 .../main/java/org/apache/juneau/config/Config.java |   2 +-
 .../org/apache/juneau/config/mod/XorEncodeMod.java |   2 +-
 .../org/apache/juneau/config/vars/ConfigVar.java   |   4 +-
 .../org/apache/juneau/dto/atom/AtomBuilder.java    |   4 +-
 .../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     |   4 +-
 .../java/org/apache/juneau/dto/atom/package.html   |  14 -
 .../main/java/org/apache/juneau/dto/html5/A.java   |  16 +-
 .../java/org/apache/juneau/dto/html5/Abbr.java     |   4 +-
 .../java/org/apache/juneau/dto/html5/Address.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Area.java     |  22 +-
 .../java/org/apache/juneau/dto/html5/Article.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Aside.java    |   4 +-
 .../java/org/apache/juneau/dto/html5/Audio.java    |  20 +-
 .../main/java/org/apache/juneau/dto/html5/B.java   |   4 +-
 .../java/org/apache/juneau/dto/html5/Base.java     |   8 +-
 .../main/java/org/apache/juneau/dto/html5/Bdi.java |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Bdo.java |   4 +-
 .../org/apache/juneau/dto/html5/Blockquote.java    |   6 +-
 .../java/org/apache/juneau/dto/html5/Body.java     |  16 +-
 .../main/java/org/apache/juneau/dto/html5/Br.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Button.java   |  28 +-
 .../java/org/apache/juneau/dto/html5/Canvas.java   |   8 +-
 .../java/org/apache/juneau/dto/html5/Caption.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Cite.java     |   4 +-
 .../java/org/apache/juneau/dto/html5/Code.java     |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Col.java |   6 +-
 .../java/org/apache/juneau/dto/html5/Colgroup.java |   6 +-
 .../java/org/apache/juneau/dto/html5/Data.java     |   6 +-
 .../java/org/apache/juneau/dto/html5/Datalist.java |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Dd.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Del.java |   8 +-
 .../main/java/org/apache/juneau/dto/html5/Dfn.java |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Div.java |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Dl.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Dt.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Em.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Embed.java    |  12 +-
 .../java/org/apache/juneau/dto/html5/Fieldset.java |  10 +-
 .../org/apache/juneau/dto/html5/Figcaption.java    |   4 +-
 .../java/org/apache/juneau/dto/html5/Figure.java   |   4 +-
 .../java/org/apache/juneau/dto/html5/Footer.java   |   4 +-
 .../java/org/apache/juneau/dto/html5/Form.java     |  20 +-
 .../main/java/org/apache/juneau/dto/html5/H1.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/H2.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/H3.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/H4.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/H5.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/H6.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Head.java     |   4 +-
 .../java/org/apache/juneau/dto/html5/Header.java   |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Hr.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Html.java     |   6 +-
 .../juneau/dto/html5/HtmlBeanDictionary.java       |   2 +-
 .../org/apache/juneau/dto/html5/HtmlBuilder.java   |   2 +-
 .../org/apache/juneau/dto/html5/HtmlElement.java   | 126 ++--
 .../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   |   4 +-
 .../java/org/apache/juneau/dto/html5/Iframe.java   |  16 +-
 .../main/java/org/apache/juneau/dto/html5/Img.java |  18 +-
 .../java/org/apache/juneau/dto/html5/Input.java    |  70 +--
 .../main/java/org/apache/juneau/dto/html5/Ins.java |   8 +-
 .../main/java/org/apache/juneau/dto/html5/Kbd.java |   4 +-
 .../java/org/apache/juneau/dto/html5/Keygen.java   |  16 +-
 .../java/org/apache/juneau/dto/html5/Label.java    |   8 +-
 .../java/org/apache/juneau/dto/html5/Legend.java   |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Li.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Link.java     |  18 +-
 .../java/org/apache/juneau/dto/html5/Main.java     |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Map.java |   6 +-
 .../java/org/apache/juneau/dto/html5/Mark.java     |   4 +-
 .../java/org/apache/juneau/dto/html5/Meta.java     |  12 +-
 .../java/org/apache/juneau/dto/html5/Meter.java    |  16 +-
 .../main/java/org/apache/juneau/dto/html5/Nav.java |   4 +-
 .../java/org/apache/juneau/dto/html5/Noscript.java |   4 +-
 .../java/org/apache/juneau/dto/html5/Object_.java  |  20 +-
 .../main/java/org/apache/juneau/dto/html5/Ol.java  |  10 +-
 .../java/org/apache/juneau/dto/html5/Optgroup.java |   8 +-
 .../java/org/apache/juneau/dto/html5/Option.java   |  12 +-
 .../java/org/apache/juneau/dto/html5/Output.java   |  10 +-
 .../main/java/org/apache/juneau/dto/html5/P.java   |   4 +-
 .../java/org/apache/juneau/dto/html5/Param.java    |   8 +-
 .../main/java/org/apache/juneau/dto/html5/Pre.java |   4 +-
 .../java/org/apache/juneau/dto/html5/Progress.java |   8 +-
 .../main/java/org/apache/juneau/dto/html5/Q.java   |   6 +-
 .../main/java/org/apache/juneau/dto/html5/Rb.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Rp.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Rt.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Rtc.java |   4 +-
 .../java/org/apache/juneau/dto/html5/Ruby.java     |   4 +-
 .../main/java/org/apache/juneau/dto/html5/S.java   |   4 +-
 .../java/org/apache/juneau/dto/html5/Samp.java     |   4 +-
 .../java/org/apache/juneau/dto/html5/Script.java   |  16 +-
 .../java/org/apache/juneau/dto/html5/Section.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Select.java   |  18 +-
 .../java/org/apache/juneau/dto/html5/Small.java    |   4 +-
 .../java/org/apache/juneau/dto/html5/Source.java   |   8 +-
 .../java/org/apache/juneau/dto/html5/Span.java     |   4 +-
 .../java/org/apache/juneau/dto/html5/Strong.java   |   4 +-
 .../java/org/apache/juneau/dto/html5/Style.java    |   8 +-
 .../main/java/org/apache/juneau/dto/html5/Sub.java |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Sup.java |   4 +-
 .../java/org/apache/juneau/dto/html5/Table.java    |   6 +-
 .../java/org/apache/juneau/dto/html5/Tbody.java    |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Td.java  |  10 +-
 .../java/org/apache/juneau/dto/html5/Template.java |   4 +-
 .../java/org/apache/juneau/dto/html5/Textarea.java |  34 +-
 .../java/org/apache/juneau/dto/html5/Tfoot.java    |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Th.java  |  16 +-
 .../java/org/apache/juneau/dto/html5/Thead.java    |   4 +-
 .../java/org/apache/juneau/dto/html5/Time.java     |   6 +-
 .../java/org/apache/juneau/dto/html5/Title.java    |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Tr.java  |   4 +-
 .../java/org/apache/juneau/dto/html5/Track.java    |  14 +-
 .../main/java/org/apache/juneau/dto/html5/U.java   |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Ul.java  |   4 +-
 .../main/java/org/apache/juneau/dto/html5/Var.java |   4 +-
 .../java/org/apache/juneau/dto/html5/Video.java    |  26 +-
 .../main/java/org/apache/juneau/dto/html5/Wbr.java |   4 +-
 .../java/org/apache/juneau/dto/html5/package.html  |  14 -
 .../apache/juneau/dto/jsonschema/JsonSchema.java   |   2 +-
 .../juneau/dto/jsonschema/JsonSchemaArray.java     |   2 +-
 .../juneau/dto/jsonschema/JsonSchemaMap.java       |   2 +-
 .../juneau/dto/jsonschema/JsonSchemaProperty.java  |   2 +-
 .../jsonschema/JsonSchemaPropertySimpleArray.java  |   2 +-
 .../juneau/dto/jsonschema/JsonSchemaRef.java       |   2 +-
 .../org/apache/juneau/dto/jsonschema/JsonType.java |   2 +-
 .../juneau/dto/jsonschema/JsonTypeArray.java       |   2 +-
 .../org/apache/juneau/dto/jsonschema/package.html  |  13 +-
 .../org/apache/juneau/dto/swagger/Contact.java     |   2 +-
 .../juneau/dto/swagger/ExternalDocumentation.java  |   4 +-
 .../org/apache/juneau/dto/swagger/HeaderInfo.java  |   2 +-
 .../java/org/apache/juneau/dto/swagger/Info.java   |   4 +-
 .../java/org/apache/juneau/dto/swagger/Items.java  |   2 +-
 .../org/apache/juneau/dto/swagger/License.java     |   2 +-
 .../org/apache/juneau/dto/swagger/Operation.java   |  18 +-
 .../apache/juneau/dto/swagger/OperationMap.java    |   2 +-
 .../apache/juneau/dto/swagger/ParameterInfo.java   |   6 +-
 .../apache/juneau/dto/swagger/ResponseInfo.java    |   4 +-
 .../org/apache/juneau/dto/swagger/SchemaInfo.java  |   4 +-
 .../apache/juneau/dto/swagger/SecurityScheme.java  |   2 +-
 .../org/apache/juneau/dto/swagger/Swagger.java     |  18 +-
 .../apache/juneau/dto/swagger/SwaggerBuilder.java  |   2 +-
 .../apache/juneau/dto/swagger/SwaggerElement.java  |   2 +-
 .../java/org/apache/juneau/dto/swagger/Tag.java    |   6 +-
 .../java/org/apache/juneau/dto/swagger/Xml.java    |   2 +-
 .../apache/juneau/dto/swagger/ui/SwaggerUI.java    |   2 +-
 .../java/org/apache/juneau/jena/Constants.java     |   2 +-
 .../main/java/org/apache/juneau/jena/N3Parser.java |   2 +-
 .../java/org/apache/juneau/jena/N3Serializer.java  |   2 +-
 .../java/org/apache/juneau/jena/NTripleParser.java |   2 +-
 .../org/apache/juneau/jena/NTripleSerializer.java  |   2 +-
 .../java/org/apache/juneau/jena/RdfBeanMeta.java   |   2 +-
 .../apache/juneau/jena/RdfBeanPropertyMeta.java    |   2 +-
 .../java/org/apache/juneau/jena/RdfClassMeta.java  |   2 +-
 .../apache/juneau/jena/RdfCollectionFormat.java    |   2 +-
 .../org/apache/juneau/jena/RdfMetaProvider.java    |   2 +-
 .../java/org/apache/juneau/jena/RdfParser.java     |  20 +-
 .../org/apache/juneau/jena/RdfParserSession.java   |   2 +-
 .../java/org/apache/juneau/jena/RdfSerializer.java |  20 +-
 .../apache/juneau/jena/RdfSerializerSession.java   |   2 +-
 .../main/java/org/apache/juneau/jena/RdfUtils.java |   2 +-
 .../apache/juneau/jena/RdfXmlAbbrevSerializer.java |   2 +-
 .../java/org/apache/juneau/jena/RdfXmlParser.java  |   2 +-
 .../org/apache/juneau/jena/RdfXmlSerializer.java   |   2 +-
 .../java/org/apache/juneau/jena/TurtleParser.java  |   2 +-
 .../org/apache/juneau/jena/TurtleSerializer.java   |   2 +-
 .../org/apache/juneau/jena/annotation/Rdf.java     |   6 +-
 .../juneau/jena/annotation/RdfAnnotation.java      |   2 +-
 .../apache/juneau/jena/annotation/RdfConfig.java   |  86 +--
 .../jena/annotation/RdfConfigAnnotation.java       |   2 +-
 .../org/apache/juneau/jena/annotation/RdfNs.java   |   2 +-
 .../apache/juneau/jena/annotation/RdfSchema.java   |   2 +-
 .../main/java/org/apache/juneau/marshaller/N3.java |   4 +-
 .../java/org/apache/juneau/marshaller/NTriple.java |   4 +-
 .../java/org/apache/juneau/marshaller/RdfXml.java  |   4 +-
 .../org/apache/juneau/marshaller/RdfXmlAbbrev.java |   4 +-
 .../java/org/apache/juneau/marshaller/Turtle.java  |   4 +-
 .../main/java/org/apache/juneau/BeanContext.java   |   2 +-
 .../main/java/org/apache/juneau/MediaRange.java    |   4 +-
 .../main/java/org/apache/juneau/MediaRanges.java   |   6 +-
 .../src/main/java/org/apache/juneau/MediaType.java |   4 +-
 .../main/java/org/apache/juneau/StringRange.java   |   4 +-
 .../main/java/org/apache/juneau/StringRanges.java  |   6 +-
 .../java/org/apache/juneau/annotation/Bean.java    |   9 +-
 .../org/apache/juneau/annotation/BeanConfig.java   |  70 +--
 .../org/apache/juneau/annotation/BeanIgnore.java   |   6 +-
 .../java/org/apache/juneau/annotation/Beanc.java   |   5 +-
 .../java/org/apache/juneau/annotation/Beanp.java   |   4 +-
 .../java/org/apache/juneau/annotation/Builder.java |   2 +-
 .../java/org/apache/juneau/annotation/Example.java |   4 +-
 .../org/apache/juneau/annotation/ExternalDocs.java |  12 +-
 .../java/org/apache/juneau/annotation/Items.java   |  40 +-
 .../org/apache/juneau/annotation/Marshalled.java   |   6 +-
 .../org/apache/juneau/annotation/NameProperty.java |   4 +-
 .../apache/juneau/annotation/ParentProperty.java   |   4 +-
 .../java/org/apache/juneau/annotation/Schema.java  |  94 +--
 .../org/apache/juneau/annotation/SubItems.java     |  42 +-
 .../java/org/apache/juneau/annotation/Swap.java    |  10 +-
 .../java/org/apache/juneau/annotation/Uri.java     |   6 +-
 .../java/org/apache/juneau/csv/annotation/Csv.java |   4 +-
 .../java/org/apache/juneau/encoders/Encoder.java   |   2 +-
 .../org/apache/juneau/encoders/EncoderMatch.java   |   2 +-
 .../org/apache/juneau/encoders/EncoderSet.java     |   2 +-
 .../org/apache/juneau/encoders/Finishable.java     |   2 +-
 .../org/apache/juneau/encoders/GzipEncoder.java    |   2 +-
 .../apache/juneau/encoders/IdentityEncoder.java    |   2 +-
 .../java/org/apache/juneau/html/AnchorText.java    |   2 +-
 .../java/org/apache/juneau/html/AsideFloat.java    |   2 +-
 .../apache/juneau/html/BasicHtmlDocTemplate.java   |   2 +-
 .../apache/juneau/html/HtmlBeanPropertyMeta.java   |   2 +-
 .../java/org/apache/juneau/html/HtmlClassMeta.java |   2 +-
 .../org/apache/juneau/html/HtmlDocSerializer.java  |   6 +-
 .../juneau/html/HtmlDocSerializerSession.java      |   2 +-
 .../org/apache/juneau/html/HtmlDocTemplate.java    |   2 +-
 .../org/apache/juneau/html/HtmlMetaProvider.java   |   2 +-
 .../java/org/apache/juneau/html/HtmlParser.java    |   2 +-
 .../org/apache/juneau/html/HtmlParserSession.java  |   2 +-
 .../java/org/apache/juneau/html/HtmlRender.java    |   4 +-
 .../juneau/html/HtmlSchemaDocSerializer.java       |   2 +-
 .../html/HtmlSchemaDocSerializerSession.java       |   2 +-
 .../apache/juneau/html/HtmlSchemaSerializer.java   |   2 +-
 .../juneau/html/HtmlSchemaSerializerSession.java   |   2 +-
 .../org/apache/juneau/html/HtmlSerializer.java     |   2 +-
 .../apache/juneau/html/HtmlSerializerSession.java  |   2 +-
 .../juneau/html/HtmlStrippedDocSerializer.java     |   2 +-
 .../html/HtmlStrippedDocSerializerSession.java     |   2 +-
 .../main/java/org/apache/juneau/html/HtmlTag.java  |   2 +-
 .../java/org/apache/juneau/html/HtmlWidget.java    |   4 +-
 .../java/org/apache/juneau/html/HtmlWidgetMap.java |   4 +-
 .../java/org/apache/juneau/html/HtmlWidgetVar.java |   4 +-
 .../java/org/apache/juneau/html/HtmlWriter.java    |   2 +-
 .../org/apache/juneau/html/SimpleHtmlWriter.java   |   2 +-
 .../org/apache/juneau/html/annotation/Html.java    |   9 +-
 .../juneau/html/annotation/HtmlAnnotation.java     |   2 +-
 .../apache/juneau/html/annotation/HtmlConfig.java  |  14 +-
 .../html/annotation/HtmlConfigAnnotation.java      |   2 +-
 .../juneau/html/annotation/HtmlDocConfig.java      |  30 +-
 .../html/annotation/HtmlDocConfigAnnotation.java   |   2 +-
 .../apache/juneau/html/annotation/HtmlFormat.java  |   2 +-
 .../apache/juneau/html/annotation/HtmlLink.java    |   6 +-
 .../juneau/html/annotation/HtmlLinkAnnotation.java |   2 +-
 .../org/apache/juneau/http/annotation/Contact.java |  16 +-
 .../org/apache/juneau/http/annotation/Content.java |  10 +-
 .../apache/juneau/http/annotation/FormData.java    |  16 +-
 .../org/apache/juneau/http/annotation/Header.java  |  14 +-
 .../org/apache/juneau/http/annotation/License.java |  12 +-
 .../org/apache/juneau/http/annotation/Path.java    |  18 +-
 .../org/apache/juneau/http/annotation/Query.java   |  16 +-
 .../org/apache/juneau/http/annotation/Request.java |   6 +-
 .../apache/juneau/http/annotation/Response.java    |  20 +-
 .../apache/juneau/http/annotation/StatusCode.java  |   8 +-
 .../org/apache/juneau/http/annotation/Tag.java     |  18 +-
 .../apache/juneau/httppart/BaseHttpPartParser.java |   2 +-
 .../juneau/httppart/BaseHttpPartParserSession.java |   2 +-
 .../juneau/httppart/BaseHttpPartSerializer.java    |   2 +-
 .../httppart/BaseHttpPartSerializerSession.java    |   2 +-
 .../java/org/apache/juneau/httppart/Constants.java |   2 +-
 .../java/org/apache/juneau/httppart/HttpPart.java  |   2 +-
 .../juneau/httppart/HttpPartCollectionFormat.java  |   2 +-
 .../apache/juneau/httppart/HttpPartDataType.java   |   2 +-
 .../org/apache/juneau/httppart/HttpPartFormat.java |   2 +-
 .../org/apache/juneau/httppart/HttpPartParser.java |   2 +-
 .../juneau/httppart/HttpPartParserSession.java     |   2 +-
 .../org/apache/juneau/httppart/HttpPartSchema.java | 212 +++----
 .../apache/juneau/httppart/HttpPartSerializer.java |   2 +-
 .../juneau/httppart/HttpPartSerializerSession.java |   2 +-
 .../org/apache/juneau/httppart/HttpPartType.java   |   2 +-
 .../juneau/httppart/SchemaValidationException.java |   2 +-
 .../apache/juneau/httppart/SimplePartParser.java   |   2 +-
 .../juneau/httppart/SimplePartParserSession.java   |   2 +-
 .../juneau/httppart/SimplePartSerializer.java      |   2 +-
 .../httppart/SimplePartSerializerSession.java      |   2 +-
 .../juneau/httppart/bean/RequestBeanMeta.java      |   2 +-
 .../httppart/bean/RequestBeanPropertyMeta.java     |   2 +-
 .../juneau/httppart/bean/ResponseBeanMeta.java     |   2 +-
 .../httppart/bean/ResponseBeanPropertyMeta.java    |   2 +-
 .../apache/juneau/json/JsonBeanPropertyMeta.java   |   2 +-
 .../java/org/apache/juneau/json/JsonClassMeta.java |   2 +-
 .../org/apache/juneau/json/JsonMetaProvider.java   |   2 +-
 .../java/org/apache/juneau/json/JsonParser.java    |   2 +-
 .../org/apache/juneau/json/JsonParserSession.java  |   2 +-
 .../apache/juneau/json/JsonSchemaSerializer.java   |   2 +-
 .../juneau/json/JsonSchemaSerializerSession.java   |   2 +-
 .../org/apache/juneau/json/JsonSerializer.java     |   2 +-
 .../apache/juneau/json/JsonSerializerSession.java  |   3 +-
 .../java/org/apache/juneau/json/JsonWriter.java    |   2 +-
 .../org/apache/juneau/json/SimpleJsonParser.java   |   2 +-
 .../apache/juneau/json/SimpleJsonSerializer.java   |   2 +-
 .../org/apache/juneau/json/annotation/Json.java    |   6 +-
 .../juneau/json/annotation/JsonAnnotation.java     |   2 +-
 .../apache/juneau/json/annotation/JsonConfig.java  |  10 +-
 .../json/annotation/JsonConfigAnnotation.java      |   2 +-
 .../juneau/jsonschema/BasicBeanDefMapper.java      |   2 +-
 .../apache/juneau/jsonschema/BeanDefMapper.java    |   2 +-
 .../jsonschema/JsonSchemaBeanPropertyMeta.java     |   2 +-
 .../juneau/jsonschema/JsonSchemaClassMeta.java     |   2 +-
 .../juneau/jsonschema/JsonSchemaGenerator.java     |   2 +-
 .../jsonschema/JsonSchemaGeneratorSession.java     |   2 +-
 .../juneau/jsonschema/JsonSchemaMetaProvider.java  |   2 +-
 .../org/apache/juneau/jsonschema/SchemaUtils.java  |   2 +-
 .../org/apache/juneau/jsonschema/TypeCategory.java |   2 +-
 .../jsonschema/annotation/JsonSchemaConfig.java    |  22 +-
 .../annotation/JsonSchemaConfigAnnotation.java     |   2 +-
 .../apache/juneau/marshaller/CharMarshaller.java   |   2 +-
 .../java/org/apache/juneau/marshaller/Csv.java     |   2 +-
 .../java/org/apache/juneau/marshaller/Html.java    |   2 +-
 .../java/org/apache/juneau/marshaller/Json.java    |   2 +-
 .../org/apache/juneau/marshaller/Marshaller.java   |   2 +-
 .../java/org/apache/juneau/marshaller/MsgPack.java |   2 +-
 .../java/org/apache/juneau/marshaller/OpenApi.java |   2 +-
 .../org/apache/juneau/marshaller/PlainText.java    |   2 +-
 .../org/apache/juneau/marshaller/SimpleJson.java   |   2 +-
 .../apache/juneau/marshaller/StreamMarshaller.java |   2 +-
 .../java/org/apache/juneau/marshaller/Uon.java     |   2 +-
 .../org/apache/juneau/marshaller/UrlEncoding.java  |   2 +-
 .../java/org/apache/juneau/marshaller/Xml.java     |   2 +-
 .../java/org/apache/juneau/msgpack/DataType.java   |   2 +-
 .../juneau/msgpack/MsgPackBeanPropertyMeta.java    |   2 +-
 .../apache/juneau/msgpack/MsgPackClassMeta.java    |   2 +-
 .../apache/juneau/msgpack/MsgPackInputStream.java  |   2 +-
 .../apache/juneau/msgpack/MsgPackMetaProvider.java |   2 +-
 .../apache/juneau/msgpack/MsgPackOutputStream.java |   2 +-
 .../org/apache/juneau/msgpack/MsgPackParser.java   |   2 +-
 .../juneau/msgpack/MsgPackParserSession.java       |   2 +-
 .../apache/juneau/msgpack/MsgPackSerializer.java   |   2 +-
 .../juneau/msgpack/MsgPackSerializerSession.java   |   2 +-
 .../apache/juneau/msgpack/annotation/MsgPack.java  |   6 +-
 .../msgpack/annotation/MsgPackAnnotation.java      |   2 +-
 .../juneau/msgpack/annotation/MsgPackConfig.java   |   4 +-
 .../annotation/MsgPackConfigAnnotation.java        |   2 +-
 .../juneau/oapi/OpenApiBeanPropertyMeta.java       |   2 +-
 .../org/apache/juneau/oapi/OpenApiClassMeta.java   |   2 +-
 .../apache/juneau/oapi/OpenApiMetaProvider.java    |   2 +-
 .../java/org/apache/juneau/oapi/OpenApiParser.java |   3 +-
 .../apache/juneau/oapi/OpenApiParserSession.java   |   2 +-
 .../org/apache/juneau/oapi/OpenApiSerializer.java  |   3 +-
 .../juneau/oapi/OpenApiSerializerSession.java      |   2 +-
 .../org/apache/juneau/oapi/annotation/OpenApi.java |   6 +-
 .../juneau/oapi/annotation/OpenApiAnnotation.java  |   2 +-
 .../juneau/oapi/annotation/OpenApiConfig.java      |   2 +-
 .../oapi/annotation/OpenApiConfigAnnotation.java   |   2 +-
 .../apache/juneau/objecttools/AbstractMatcher.java |   2 +-
 .../org/apache/juneau/objecttools/Equality.java    |   2 +-
 .../apache/juneau/objecttools/MatcherFactory.java  |   2 +-
 .../juneau/objecttools/NumberMatcherFactory.java   |   2 +-
 .../apache/juneau/objecttools/ObjectPaginator.java |   2 +-
 .../apache/juneau/objecttools/ObjectSearcher.java  |   2 +-
 .../apache/juneau/objecttools/ObjectSorter.java    |   2 +-
 .../org/apache/juneau/objecttools/ObjectTool.java  |   2 +-
 .../apache/juneau/objecttools/ObjectViewer.java    |   2 +-
 .../org/apache/juneau/objecttools/PageArgs.java    |   2 +-
 .../juneau/objecttools/PatternException.java       |   2 +-
 .../org/apache/juneau/objecttools/SearchArgs.java  |   2 +-
 .../org/apache/juneau/objecttools/SortArgs.java    |   2 +-
 .../juneau/objecttools/StringMatcherFactory.java   |   2 +-
 .../juneau/objecttools/TimeMatcherFactory.java     |   2 +-
 .../org/apache/juneau/objecttools/ViewArgs.java    |   2 +-
 .../apache/juneau/parser/InputStreamParser.java    |   2 +-
 .../juneau/parser/InputStreamParserSession.java    |   2 +-
 .../org/apache/juneau/parser/ParseException.java   |   2 +-
 .../main/java/org/apache/juneau/parser/Parser.java |   4 +-
 .../apache/juneau/parser/ParserInputStream.java    |   2 +-
 .../org/apache/juneau/parser/ParserListener.java   |   2 +-
 .../java/org/apache/juneau/parser/ParserMatch.java |   2 +-
 .../java/org/apache/juneau/parser/ParserPipe.java  |   2 +-
 .../org/apache/juneau/parser/ParserReader.java     |   2 +-
 .../org/apache/juneau/parser/ParserSession.java    |   2 +-
 .../java/org/apache/juneau/parser/ParserSet.java   |   2 +-
 .../java/org/apache/juneau/parser/Position.java    |   2 +-
 .../org/apache/juneau/parser/Positionable.java     |   2 +-
 .../org/apache/juneau/parser/ReaderParser.java     |   2 +-
 .../apache/juneau/parser/ReaderParserSession.java  |   2 +-
 .../juneau/parser/annotation/ParserConfig.java     |  18 +-
 .../parser/annotation/ParserConfigAnnotation.java  |   2 +-
 .../apache/juneau/plaintext/PlainTextParser.java   |   2 +-
 .../juneau/plaintext/annotation/PlainText.java     |   4 +-
 .../juneau/serializer/OutputStreamSerializer.java  |   2 +-
 .../serializer/OutputStreamSerializerSession.java  |   2 +-
 .../juneau/serializer/SerializeException.java      |   2 +-
 .../org/apache/juneau/serializer/Serializer.java   |  10 +-
 .../juneau/serializer/SerializerListener.java      |   2 +-
 .../apache/juneau/serializer/SerializerMatch.java  |   2 +-
 .../apache/juneau/serializer/SerializerPipe.java   |   2 +-
 .../juneau/serializer/SerializerSession.java       |   2 +-
 .../apache/juneau/serializer/SerializerSet.java    |   2 +-
 .../apache/juneau/serializer/SerializerWriter.java |   3 +-
 .../apache/juneau/serializer/WriterSerializer.java |   2 +-
 .../juneau/serializer/WriterSerializerSession.java |   2 +-
 .../serializer/annotation/SerializerConfig.java    |  48 +-
 .../annotation/SerializerConfigAnnotation.java     |   2 +-
 .../org/apache/juneau/soap/annotation/SoapXml.java |   4 +-
 .../java/org/apache/juneau/svl/DefaultingVar.java  |   2 +-
 .../main/java/org/apache/juneau/svl/MapVar.java    |   2 +-
 .../apache/juneau/svl/MultipartResolvingVar.java   |   2 +-
 .../java/org/apache/juneau/svl/MultipartVar.java   |   2 +-
 .../org/apache/juneau/svl/ResolvingJsonMap.java    |   2 +-
 .../main/java/org/apache/juneau/svl/SimpleVar.java |   2 +-
 .../java/org/apache/juneau/svl/StreamedVar.java    |   2 +-
 .../src/main/java/org/apache/juneau/svl/Var.java   |   2 +-
 .../main/java/org/apache/juneau/svl/VarList.java   |   2 +-
 .../java/org/apache/juneau/svl/VarResolver.java    |   2 +-
 .../apache/juneau/svl/VarResolverException.java    |   2 +-
 .../org/apache/juneau/svl/VarResolverSession.java  |   2 +-
 .../java/org/apache/juneau/svl/vars/ArgsVar.java   |   2 +-
 .../org/apache/juneau/svl/vars/CoalesceVar.java    |   2 +-
 .../apache/juneau/svl/vars/EnvVariablesVar.java    |   2 +-
 .../java/org/apache/juneau/svl/vars/IfVar.java     |   2 +-
 .../java/org/apache/juneau/svl/vars/LenVar.java    |   2 +-
 .../org/apache/juneau/svl/vars/LowerCaseVar.java   |   2 +-
 .../apache/juneau/svl/vars/ManifestFileVar.java    |   2 +-
 .../org/apache/juneau/svl/vars/NotEmptyVar.java    |   2 +-
 .../apache/juneau/svl/vars/PatternExtractVar.java  |   2 +-
 .../apache/juneau/svl/vars/PatternMatchVar.java    |   2 +-
 .../apache/juneau/svl/vars/PatternReplaceVar.java  |   2 +-
 .../org/apache/juneau/svl/vars/SubstringVar.java   |   2 +-
 .../java/org/apache/juneau/svl/vars/SwitchVar.java |   2 +-
 .../juneau/svl/vars/SystemPropertiesVar.java       |   2 +-
 .../org/apache/juneau/svl/vars/UpperCaseVar.java   |   2 +-
 .../java/org/apache/juneau/swap/AutoListSwap.java  |   2 +-
 .../java/org/apache/juneau/swap/AutoMapSwap.java   |   2 +-
 .../org/apache/juneau/swap/AutoNumberSwap.java     |   2 +-
 .../org/apache/juneau/swap/AutoObjectSwap.java     |   2 +-
 .../org/apache/juneau/swap/BeanInterceptor.java    |   2 +-
 .../main/java/org/apache/juneau/swap/Builder.java  |   4 +-
 .../java/org/apache/juneau/swap/BuilderSwap.java   |   4 +-
 .../java/org/apache/juneau/swap/DefaultSwaps.java  |   2 +-
 .../org/apache/juneau/swap/FunctionalSwap.java     |   2 +-
 .../main/java/org/apache/juneau/swap/MapSwap.java  |   2 +-
 .../java/org/apache/juneau/swap/ObjectSwap.java    |  10 +-
 .../java/org/apache/juneau/swap/StringSwap.java    |   2 +-
 .../java/org/apache/juneau/swap/Surrogate.java     |   4 +-
 .../java/org/apache/juneau/swap/SurrogateSwap.java |   2 +-
 .../org/apache/juneau/swaps/BeanStringSwap.java    |   4 +-
 .../org/apache/juneau/swaps/ByteArraySwap.java     |   2 +-
 .../java/org/apache/juneau/swaps/ClassSwap.java    |   2 +-
 .../juneau/swaps/DefaultingTemporalAccessor.java   |   2 +-
 .../org/apache/juneau/swaps/EnumerationSwap.java   |   2 +-
 .../org/apache/juneau/swaps/InputStreamSwap.java   |   2 +-
 .../java/org/apache/juneau/swaps/IteratorSwap.java |   2 +-
 .../java/org/apache/juneau/swaps/LocaleSwap.java   |   2 +-
 .../org/apache/juneau/swaps/MatchResultSwap.java   |   2 +-
 .../org/apache/juneau/swaps/ParsedReaderSwap.java  |   2 +-
 .../java/org/apache/juneau/swaps/ReaderSwap.java   |   2 +-
 .../apache/juneau/swaps/StackTraceElementSwap.java |   2 +-
 .../org/apache/juneau/swaps/StringFormatSwap.java  |   2 +-
 .../apache/juneau/swaps/TemporalCalendarSwap.java  |   2 +-
 .../org/apache/juneau/swaps/TemporalDateSwap.java  |   2 +-
 .../java/org/apache/juneau/swaps/TemporalSwap.java |   2 +-
 .../java/org/apache/juneau/swaps/TimeZoneSwap.java |   2 +-
 .../juneau/swaps/XMLGregorianCalendarSwap.java     |   2 +-
 .../java/org/apache/juneau/swaps/ZoneIdSwap.java   |   2 +-
 .../java/org/apache/juneau/uon/ParamFormat.java    |   2 +-
 .../org/apache/juneau/uon/UonBeanPropertyMeta.java |   2 +-
 .../java/org/apache/juneau/uon/UonClassMeta.java   |   2 +-
 .../org/apache/juneau/uon/UonMetaProvider.java     |   2 +-
 .../main/java/org/apache/juneau/uon/UonParser.java |   2 +-
 .../org/apache/juneau/uon/UonParserSession.java    |   2 +-
 .../main/java/org/apache/juneau/uon/UonReader.java |   2 +-
 .../java/org/apache/juneau/uon/UonSerializer.java  |   2 +-
 .../apache/juneau/uon/UonSerializerSession.java    |   2 +-
 .../main/java/org/apache/juneau/uon/UonUtils.java  |   2 +-
 .../main/java/org/apache/juneau/uon/UonWriter.java |   2 +-
 .../java/org/apache/juneau/uon/annotation/Uon.java |   7 +-
 .../juneau/uon/annotation/UonAnnotation.java       |   2 +-
 .../apache/juneau/uon/annotation/UonConfig.java    |  12 +-
 .../juneau/uon/annotation/UonConfigAnnotation.java |   2 +-
 .../urlencoding/UrlEncodingBeanPropertyMeta.java   |   3 +-
 .../juneau/urlencoding/UrlEncodingClassMeta.java   |   2 +-
 .../urlencoding/UrlEncodingMetaProvider.java       |   2 +-
 .../juneau/urlencoding/UrlEncodingParser.java      |   2 +-
 .../urlencoding/UrlEncodingParserSession.java      |   2 +-
 .../juneau/urlencoding/UrlEncodingSerializer.java  |   2 +-
 .../urlencoding/UrlEncodingSerializerSession.java  |   2 +-
 .../juneau/urlencoding/annotation/UrlEncoding.java |   6 +-
 .../annotation/UrlEncodingAnnotation.java          |   2 +-
 .../urlencoding/annotation/UrlEncodingConfig.java  |   4 +-
 .../annotation/UrlEncodingConfigAnnotation.java    |   2 +-
 .../main/java/org/apache/juneau/xml/Namespace.java |   3 +-
 .../java/org/apache/juneau/xml/XmlBeanMeta.java    |   2 +-
 .../org/apache/juneau/xml/XmlBeanPropertyMeta.java |   3 +-
 .../java/org/apache/juneau/xml/XmlClassMeta.java   |   2 +-
 .../org/apache/juneau/xml/XmlDocSerializer.java    |   2 +-
 .../apache/juneau/xml/XmlDocSerializerSession.java |   2 +-
 .../org/apache/juneau/xml/XmlEventAllocator.java   |   2 +-
 .../org/apache/juneau/xml/XmlMetaProvider.java     |   2 +-
 .../main/java/org/apache/juneau/xml/XmlParser.java |   2 +-
 .../org/apache/juneau/xml/XmlParserSession.java    |   2 +-
 .../main/java/org/apache/juneau/xml/XmlReader.java |   2 +-
 .../java/org/apache/juneau/xml/XmlReporter.java    |   2 +-
 .../java/org/apache/juneau/xml/XmlResolver.java    |   2 +-
 .../java/org/apache/juneau/xml/XmlSerializer.java  |  10 +-
 .../apache/juneau/xml/XmlSerializerSession.java    |   2 +-
 .../main/java/org/apache/juneau/xml/XmlUtils.java  |   2 +-
 .../main/java/org/apache/juneau/xml/XmlWriter.java |   2 +-
 .../java/org/apache/juneau/xml/annotation/Xml.java |   6 +-
 .../juneau/xml/annotation/XmlAnnotation.java       |   2 +-
 .../apache/juneau/xml/annotation/XmlConfig.java    |  28 +-
 .../juneau/xml/annotation/XmlConfigAnnotation.java |   2 +-
 .../apache/juneau/xml/annotation/XmlFormat.java    |   2 +-
 .../org/apache/juneau/xml/annotation/XmlNs.java    |   2 +-
 .../apache/juneau/xml/annotation/XmlSchema.java    |   2 +-
 juneau-doc/docs/ReleaseNotes/8.2.0.html            |   2 +-
 .../docs/Topics/01.Overview/01.o.Marshalling.html  |  24 +-
 .../docs/Topics/01.Overview/02.o.EndToEndRest.html |   2 +-
 .../docs/Topics/01.Overview/03.o.RestServer.html   |   2 +-
 .../docs/Topics/01.Overview/04.o.RestClient.html   |   2 +-
 juneau-doc/docs/Topics/01.Overview/05.o.Dtos.html  |  10 +-
 .../docs/Topics/01.Overview/06.o.ConfigFiles.html  |   4 +-
 .../Topics/01.Overview/07.o.FluentAssertions.html  |   4 +-
 .../01.Overview/doc-files/03.o.ConfigFiles.html    |  60 --
 .../02.jm.SerializersAndParsers.html               |   2 +-
 .../02.juneau-marshall/04.jm.JavaBeansSupport.html |   4 +-
 .../07.jm.ContextAnnotations.html                  |   2 +-
 .../12.jm.DynamicallyAppliedAnnotations.html       |   4 +-
 .../02.juneau-marshall/14.jm.VirtualBeans.html     |   2 +-
 .../02.jm.OpenApiSerializers.html                  |   6 +-
 .../32.jm.OpenApiDetails/03.jm.OpenApiParsers.html |   6 +-
 .../docs/Topics/04.juneau-dto/01.jd.Html5.html     |   8 +-
 .../docs/Topics/04.juneau-dto/02.jd.Atom.html      |  12 +-
 .../02.jc.ReadingEntries/01.jc.Pojos.html          |   4 +-
 .../07.jrc.RemoteProxyInterfaces.html              |   2 +-
 .../08.juneau-rest-server/01.jrs.Overview.html     |   2 +-
 .../03.jrs.JavaMethodReturnTypes.html              |   2 +-
 .../02.jrs.HttpPartAnnotations.html                |   6 +-
 .../08.juneau-rest-server/05.jrs.Marshalling.html  |   2 +-
 .../08.juneau-rest-server/07.jrs.Guards.html       |   2 +-
 .../11.jrs.ConfigurationFiles.html                 |   2 +-
 .../08.juneau-rest-server/12.jrs.SvlVariables.html |   2 +-
 .../15.jrs.Swagger/02.jrs.BasicSwaggerInfo.html    |   2 +-
 .../15.jrs.Swagger/06.jrs.SwaggerResponses.html    |   2 +-
 .../04.jrs.HtmlUiCustomization.html                |   2 +-
 .../08.juneau-rest-server/22.jrs.RestContext.html  |   2 +-
 .../08.juneau-rest-server/25.jrs.RestRpc.html      |   6 +-
 .../26.jrs.SerializingUris.html                    |   2 +-
 .../09.jrc.Proxies/01.jrc.Remote.html              |   4 +-
 .../09.jrc.Proxies/02.jrc.RemoteMethod.html        |   4 +-
 .../09.jrc.Proxies/03.jrc.Content.html             |   4 +-
 .../09.jrc.Proxies/04.jrc.FormData.html            |   2 +-
 .../09.jrc.Proxies/05.jrc.Query.html               |   2 +-
 .../09.jrc.Proxies/06.jrc.Header.html              |   2 +-
 .../09.jrc.Proxies/07.jrc.Path.html                |   2 +-
 .../01.jmc.Overview.html                           |   2 +-
 .../12.juneau-microservice-core/05.jmc.Config.html |   2 +-
 .../07.jmc.VarResolver.html                        |   4 +-
 .../01.jmj.Overview.html                           |   2 +-
 .../05.jmj.Config.html                             |  10 +-
 .../docs/Topics/14.my-jetty-microservice.html      |   2 +-
 .../docs/Topics/15.my-springboot-microservice.html |   2 +-
 juneau-doc/docs/Topics/17.Glossaries.html          |  21 -
 .../Topics/17.Glossaries/01.g.LanguageSupport.html | 150 -----
 .../Topics/17.Glossaries/02.g.Annotations.html     | 336 ----------
 .../Topics/{18.Security.html => 17.Security.html}  |   2 +-
 .../01.s.Marshall.html                             |   0
 .../{18.Security => 17.Security}/02.s.Svl.html     |   0
 .../{18.Security => 17.Security}/03.s.Rest.html    |   0
 ...ion-guide.html => 18.v9.0-migration-guide.html} |   0
 .../org/apache/juneau/doc/internal/DocTag.java     | 153 -----
 .../main/javadoc/doc-files/03.o.ConfigFiles.html   |  60 --
 juneau-doc/src/main/javadoc/overview.html          | 691 ++++-----------------
 juneau-doc/src/main/javadoc/resources/docs.txt     |   3 -
 .../src/main/javadoc/resources/fragments/toc.html  |   5 -
 .../apache/juneau/examples/parser/ImageParser.java |   2 +-
 .../examples/serializer/ImageSerializer.java       |   2 +-
 .../juneau/examples/rest/springboot/App.java       |   2 +-
 .../rest/springboot/HelloWorldMessageProvider.java |   2 +-
 .../rest/springboot/HelloWorldResource.java        |   2 +-
 .../examples/rest/springboot/RootResources.java    |   2 +-
 .../juneau/examples/rest/HtmlBeansResource.java    |   4 +-
 .../juneau/examples/rest/PhotosResource.java       |   2 +-
 .../juneau/examples/rest/UtilityBeansResource.java |   4 +-
 .../microservice/BasicMicroserviceListener.java    |   2 +-
 .../apache/juneau/microservice/Microservice.java   |   2 +-
 .../juneau/microservice/MicroserviceListener.java  |   2 +-
 .../juneau/microservice/console/ConfigCommand.java |   2 +-
 .../microservice/console/ConsoleCommand.java       |   2 +-
 .../juneau/microservice/console/ExitCommand.java   |   2 +-
 .../juneau/microservice/console/HelpCommand.java   |   2 +-
 .../microservice/console/RestartCommand.java       |   2 +-
 .../microservice/resources/ConfigResource.java     |   2 +-
 .../microservice/resources/DirectoryResource.java  |   2 +-
 .../microservice/resources/SampleRootResource.java |   2 +-
 .../microservice/resources/ShutdownResource.java   |   2 +-
 .../jetty/BasicJettyMicroserviceListener.java      |   2 +-
 .../jetty/BasicJettyServerFactory.java             |   2 +-
 .../juneau/microservice/jetty/JettyLogger.java     |   2 +-
 .../microservice/jetty/JettyMicroservice.java      |   2 +-
 .../jetty/JettyMicroserviceListener.java           |   2 +-
 .../microservice/jetty/JettyServerFactory.java     |   2 +-
 .../jetty/resources/DebugResource.java             |   2 +-
 .../juneau/microservice/jetty/template/App.java    |   2 +-
 .../jetty/template/HelloWorldResource.java         |   3 +-
 .../microservice/jetty/template/RootResources.java |   3 +-
 .../microservice/springboot/template/App.java      |   2 +-
 .../template/HelloWorldMessageProvider.java        |   2 +-
 .../springboot/template/HelloWorldResource.java    |   2 +-
 .../springboot/template/RootResources.java         |   2 +-
 .../rest/client/BasicHttpEntityRequestBase.java    |   2 +-
 .../juneau/rest/client/BasicHttpRequestBase.java   |   2 +-
 .../rest/client/BasicHttpRequestRetryHandler.java  |   2 +-
 .../juneau/rest/client/BasicRestCallHandler.java   |   2 +-
 .../rest/client/BasicRestCallInterceptor.java      |   2 +-
 .../apache/juneau/rest/client/ResponseContent.java |   2 +-
 .../apache/juneau/rest/client/ResponseHeader.java  |   6 +-
 .../juneau/rest/client/ResponseStatusLine.java     |   2 +-
 .../juneau/rest/client/RestCallException.java      |   2 +-
 .../apache/juneau/rest/client/RestCallHandler.java |   2 +-
 .../juneau/rest/client/RestCallInterceptor.java    |   2 +-
 .../org/apache/juneau/rest/client/RestClient.java  |  25 +-
 .../apache/juneau/rest/client/RestOperation.java   |   2 +-
 .../org/apache/juneau/rest/client/RestRequest.java |   2 +-
 .../juneau/rest/client/RestRequestCreated.java     |   2 +-
 .../apache/juneau/rest/client/RestResponse.java    |   2 +-
 .../assertion/FluentResponseBodyAssertion.java     |   6 +-
 .../assertion/FluentResponseHeaderAssertion.java   |   6 +-
 .../FluentResponseStatusLineAssertion.java         |   4 +-
 .../juneau/rest/client/remote/RemoteMeta.java      |   4 +-
 .../client/remote/RemoteMetadataException.java     |   4 +-
 .../rest/client/remote/RemoteOperationArg.java     |   4 +-
 .../rest/client/remote/RemoteOperationBeanArg.java |   4 +-
 .../rest/client/remote/RemoteOperationMeta.java    |   4 +-
 .../rest/client/remote/RemoteOperationReturn.java  |   4 +-
 .../org/apache/juneau/http/BasicStatusLine.java    |   2 +-
 .../java/org/apache/juneau/http/HttpEntities.java  |   2 +-
 .../java/org/apache/juneau/http/HttpHeaders.java   |   2 +-
 .../java/org/apache/juneau/http/HttpMethod.java    |  22 +-
 .../java/org/apache/juneau/http/HttpParts.java     |   2 +-
 .../java/org/apache/juneau/http/HttpResources.java |   2 +-
 .../java/org/apache/juneau/http/HttpResponses.java |   2 +-
 .../apache/juneau/http/entity/BasicHttpEntity.java |   2 +-
 .../apache/juneau/http/entity/ByteArrayEntity.java |   2 +-
 .../org/apache/juneau/http/entity/FileEntity.java  |   2 +-
 .../apache/juneau/http/entity/ReaderEntity.java    |   2 +-
 .../juneau/http/entity/SerializedEntity.java       |   2 +-
 .../apache/juneau/http/entity/StreamEntity.java    |   2 +-
 .../apache/juneau/http/entity/StringEntity.java    |   2 +-
 .../java/org/apache/juneau/http/header/Accept.java |   4 +-
 .../apache/juneau/http/header/AcceptCharset.java   |   4 +-
 .../apache/juneau/http/header/AcceptEncoding.java  |   4 +-
 .../apache/juneau/http/header/AcceptLanguage.java  |   4 +-
 .../apache/juneau/http/header/AcceptRanges.java    |   4 +-
 .../java/org/apache/juneau/http/header/Age.java    |   4 +-
 .../java/org/apache/juneau/http/header/Allow.java  |   4 +-
 .../apache/juneau/http/header/Authorization.java   |   4 +-
 .../juneau/http/header/BasicBooleanHeader.java     |   4 +-
 .../apache/juneau/http/header/BasicCsvHeader.java  |   4 +-
 .../apache/juneau/http/header/BasicDateHeader.java |   4 +-
 .../juneau/http/header/BasicEntityTagHeader.java   |   4 +-
 .../juneau/http/header/BasicEntityTagsHeader.java  |   4 +-
 .../org/apache/juneau/http/header/BasicHeader.java |   4 +-
 .../juneau/http/header/BasicHeaderIterator.java    |   3 +-
 .../juneau/http/header/BasicIntegerHeader.java     |   4 +-
 .../apache/juneau/http/header/BasicLongHeader.java |   4 +-
 .../juneau/http/header/BasicMediaRangesHeader.java |   6 +-
 .../juneau/http/header/BasicMediaTypeHeader.java   |   4 +-
 .../juneau/http/header/BasicStringHeader.java      |   4 +-
 .../http/header/BasicStringRangesHeader.java       |   6 +-
 .../apache/juneau/http/header/BasicUriHeader.java  |   4 +-
 .../apache/juneau/http/header/CacheControl.java    |   4 +-
 .../apache/juneau/http/header/ClientVersion.java   |   2 +-
 .../org/apache/juneau/http/header/Connection.java  |   4 +-
 .../juneau/http/header/ContentDisposition.java     |   4 +-
 .../apache/juneau/http/header/ContentEncoding.java |   4 +-
 .../apache/juneau/http/header/ContentLanguage.java |   4 +-
 .../apache/juneau/http/header/ContentLength.java   |   4 +-
 .../apache/juneau/http/header/ContentLocation.java |   4 +-
 .../apache/juneau/http/header/ContentRange.java    |   4 +-
 .../org/apache/juneau/http/header/ContentType.java |   4 +-
 .../java/org/apache/juneau/http/header/Date.java   |   4 +-
 .../java/org/apache/juneau/http/header/Debug.java  |   2 +-
 .../java/org/apache/juneau/http/header/ETag.java   |   4 +-
 .../org/apache/juneau/http/header/EntityTag.java   |   4 +-
 .../java/org/apache/juneau/http/header/Expect.java |   4 +-
 .../org/apache/juneau/http/header/Expires.java     |   4 +-
 .../org/apache/juneau/http/header/Forwarded.java   |   4 +-
 .../java/org/apache/juneau/http/header/From.java   |   4 +-
 .../apache/juneau/http/header/HeaderBeanMeta.java  |   2 +-
 .../org/apache/juneau/http/header/HeaderList.java  |   2 +-
 .../org/apache/juneau/http/header/Headerable.java  |   2 +-
 .../java/org/apache/juneau/http/header/Host.java   |   4 +-
 .../org/apache/juneau/http/header/IfMatch.java     |   4 +-
 .../apache/juneau/http/header/IfModifiedSince.java |   4 +-
 .../org/apache/juneau/http/header/IfNoneMatch.java |   4 +-
 .../org/apache/juneau/http/header/IfRange.java     |   4 +-
 .../juneau/http/header/IfUnmodifiedSince.java      |   4 +-
 .../apache/juneau/http/header/LastModified.java    |   4 +-
 .../org/apache/juneau/http/header/Location.java    |   4 +-
 .../org/apache/juneau/http/header/MaxForwards.java |   4 +-
 .../org/apache/juneau/http/header/NoTrace.java     |   2 +-
 .../java/org/apache/juneau/http/header/Origin.java |   4 +-
 .../java/org/apache/juneau/http/header/Pragma.java |   4 +-
 .../juneau/http/header/ProxyAuthenticate.java      |   4 +-
 .../juneau/http/header/ProxyAuthorization.java     |   4 +-
 .../java/org/apache/juneau/http/header/Range.java  |   4 +-
 .../org/apache/juneau/http/header/Referer.java     |   4 +-
 .../org/apache/juneau/http/header/RetryAfter.java  |   4 +-
 .../juneau/http/header/SerializedHeader.java       |   2 +-
 .../java/org/apache/juneau/http/header/Server.java |   4 +-
 .../java/org/apache/juneau/http/header/TE.java     |   4 +-
 .../java/org/apache/juneau/http/header/Thrown.java |   2 +-
 .../org/apache/juneau/http/header/Trailer.java     |   4 +-
 .../juneau/http/header/TransferEncoding.java       |   4 +-
 .../org/apache/juneau/http/header/Upgrade.java     |   4 +-
 .../org/apache/juneau/http/header/UserAgent.java   |   4 +-
 .../java/org/apache/juneau/http/header/Vary.java   |   4 +-
 .../java/org/apache/juneau/http/header/Via.java    |   4 +-
 .../org/apache/juneau/http/header/Warning.java     |   4 +-
 .../apache/juneau/http/header/WwwAuthenticate.java |   4 +-
 .../apache/juneau/http/part/BasicBooleanPart.java  |   2 +-
 .../apache/juneau/http/part/BasicCsvArrayPart.java |   2 +-
 .../org/apache/juneau/http/part/BasicDatePart.java |   2 +-
 .../apache/juneau/http/part/BasicIntegerPart.java  |   2 +-
 .../org/apache/juneau/http/part/BasicLongPart.java |   2 +-
 .../org/apache/juneau/http/part/BasicPart.java     |   2 +-
 .../apache/juneau/http/part/BasicPartIterator.java |   2 +-
 .../apache/juneau/http/part/BasicStringPart.java   |   2 +-
 .../org/apache/juneau/http/part/BasicUriPart.java  |   2 +-
 .../apache/juneau/http/part/NameValuePairable.java |   2 +-
 .../org/apache/juneau/http/part/PartBeanMeta.java  |   2 +-
 .../org/apache/juneau/http/part/PartIterator.java  |   2 +-
 .../java/org/apache/juneau/http/part/PartList.java |   2 +-
 .../apache/juneau/http/part/SerializedPart.java    |   2 +-
 .../java/org/apache/juneau/http/remote/Remote.java |  11 +-
 .../apache/juneau/http/remote/RemoteDelete.java    |   2 +-
 .../org/apache/juneau/http/remote/RemoteGet.java   |   2 +-
 .../org/apache/juneau/http/remote/RemoteOp.java    |   2 +-
 .../org/apache/juneau/http/remote/RemotePatch.java |   2 +-
 .../org/apache/juneau/http/remote/RemotePost.java  |   2 +-
 .../org/apache/juneau/http/remote/RemotePut.java   |   2 +-
 .../apache/juneau/http/remote/RemoteReturn.java    |   2 +-
 .../juneau/http/remote/RrpcInterfaceMeta.java      |   2 +-
 .../http/remote/RrpcInterfaceMethodMeta.java       |   2 +-
 .../apache/juneau/http/resource/BasicResource.java |   2 +-
 .../juneau/http/resource/ByteArrayResource.java    |   2 +-
 .../apache/juneau/http/resource/FileResource.java  |   2 +-
 .../apache/juneau/http/resource/HttpResource.java  |   2 +-
 .../juneau/http/resource/ReaderResource.java       |   2 +-
 .../juneau/http/resource/StreamResource.java       |   2 +-
 .../juneau/http/resource/StringResource.java       |   2 +-
 .../org/apache/juneau/http/response/Accepted.java  |   2 +-
 .../juneau/http/response/AlreadyReported.java      |   2 +-
 .../apache/juneau/http/response/BadRequest.java    |   2 +-
 .../juneau/http/response/BasicHttpException.java   |   2 +-
 .../juneau/http/response/BasicHttpResponse.java    |   2 +-
 .../org/apache/juneau/http/response/Conflict.java  |   2 +-
 .../org/apache/juneau/http/response/Continue.java  |   2 +-
 .../org/apache/juneau/http/response/Created.java   |   2 +-
 .../apache/juneau/http/response/EarlyHints.java    |   2 +-
 .../juneau/http/response/ExpectationFailed.java    |   2 +-
 .../juneau/http/response/FailedDependency.java     |   2 +-
 .../org/apache/juneau/http/response/Forbidden.java |   2 +-
 .../org/apache/juneau/http/response/Found.java     |   2 +-
 .../java/org/apache/juneau/http/response/Gone.java |   2 +-
 .../http/response/HttpVersionNotSupported.java     |   2 +-
 .../org/apache/juneau/http/response/IMUsed.java    |   2 +-
 .../juneau/http/response/InsufficientStorage.java  |   2 +-
 .../juneau/http/response/InternalServerError.java  |   2 +-
 .../juneau/http/response/LengthRequired.java       |   2 +-
 .../org/apache/juneau/http/response/Locked.java    |   2 +-
 .../apache/juneau/http/response/LoopDetected.java  |   2 +-
 .../juneau/http/response/MethodNotAllowed.java     |   2 +-
 .../juneau/http/response/MisdirectedRequest.java   |   2 +-
 .../juneau/http/response/MovedPermanently.java     |   2 +-
 .../apache/juneau/http/response/MultiStatus.java   |   2 +-
 .../juneau/http/response/MultipleChoices.java      |   2 +-
 .../response/NetworkAuthenticationRequired.java    |   2 +-
 .../org/apache/juneau/http/response/NoContent.java |   2 +-
 .../http/response/NonAuthoritiveInformation.java   |   2 +-
 .../apache/juneau/http/response/NotAcceptable.java |   2 +-
 .../apache/juneau/http/response/NotExtended.java   |   2 +-
 .../org/apache/juneau/http/response/NotFound.java  |   2 +-
 .../juneau/http/response/NotImplemented.java       |   2 +-
 .../apache/juneau/http/response/NotModified.java   |   2 +-
 .../java/org/apache/juneau/http/response/Ok.java   |   2 +-
 .../juneau/http/response/PartialContent.java       |   2 +-
 .../juneau/http/response/PayloadTooLarge.java      |   2 +-
 .../juneau/http/response/PermanentRedirect.java    |   2 +-
 .../juneau/http/response/PreconditionFailed.java   |   2 +-
 .../juneau/http/response/PreconditionRequired.java |   2 +-
 .../apache/juneau/http/response/Processing.java    |   2 +-
 .../juneau/http/response/RangeNotSatisfiable.java  |   2 +-
 .../http/response/RequestHeaderFieldsTooLarge.java |   2 +-
 .../apache/juneau/http/response/ResetContent.java  |   2 +-
 .../org/apache/juneau/http/response/SeeOther.java  |   2 +-
 .../juneau/http/response/ServiceUnavailable.java   |   2 +-
 .../juneau/http/response/SwitchingProtocols.java   |   2 +-
 .../juneau/http/response/TemporaryRedirect.java    |   2 +-
 .../juneau/http/response/TooManyRequests.java      |   2 +-
 .../apache/juneau/http/response/Unauthorized.java  |   2 +-
 .../http/response/UnavailableForLegalReasons.java  |   2 +-
 .../juneau/http/response/UnprocessableEntity.java  |   2 +-
 .../juneau/http/response/UnsupportedMediaType.java |   2 +-
 .../juneau/http/response/UpgradeRequired.java      |   2 +-
 .../apache/juneau/http/response/UriTooLong.java    |   2 +-
 .../org/apache/juneau/http/response/UseProxy.java  |   2 +-
 .../http/response/VariantAlsoNegotiates.java       |   2 +-
 .../org/apache/juneau/rest/mock/MockConsole.java   |   2 +-
 .../rest/mock/MockHttpClientConnectionManager.java |   2 +-
 .../apache/juneau/rest/mock/MockHttpSession.java   |   2 +-
 .../org/apache/juneau/rest/mock/MockLogger.java    |   2 +-
 .../apache/juneau/rest/mock/MockPathResolver.java  |   2 +-
 .../apache/juneau/rest/mock/MockRestClient.java    |   2 +-
 .../apache/juneau/rest/mock/MockRestRequest.java   |   2 +-
 .../apache/juneau/rest/mock/MockRestResponse.java  |   2 +-
 .../juneau/rest/mock/MockServletRequest.java       |   2 +-
 .../juneau/rest/mock/MockServletResponse.java      |   2 +-
 .../rest/config/BasicUniversalJenaConfig.java      |   2 +-
 .../rest/springboot/BasicSpringRestServlet.java    |   5 +-
 .../springboot/BasicSpringRestServletGroup.java    |   4 +-
 .../juneau/rest/springboot/SpringBeanStore.java    |   2 +-
 .../juneau/rest/springboot/SpringRestServlet.java  |   4 +-
 .../rest/OverrideableHttpServletRequest.java       |   4 -
 .../java/org/apache/juneau/rest/RestChild.java     |   2 +-
 .../org/apache/juneau/rest/RestChildMatch.java     |   2 +-
 .../java/org/apache/juneau/rest/RestChildren.java  |   2 +-
 .../java/org/apache/juneau/rest/RestContext.java   | 130 ++--
 .../java/org/apache/juneau/rest/RestOpContext.java |  10 +-
 .../java/org/apache/juneau/rest/RestOpInvoker.java |   2 +-
 .../java/org/apache/juneau/rest/RestRequest.java   |  18 +-
 .../java/org/apache/juneau/rest/RestResponse.java  |   2 +-
 .../org/apache/juneau/rest/annotation/Attr.java    |   2 +-
 .../org/apache/juneau/rest/annotation/Method.java  |   2 +-
 .../apache/juneau/rest/annotation/OpSwagger.java   |  40 +-
 .../rest/annotation/OpSwaggerAnnotation.java       |   2 +-
 .../org/apache/juneau/rest/annotation/Rest.java    |  68 +-
 .../juneau/rest/annotation/RestAnnotation.java     |   2 +-
 .../apache/juneau/rest/annotation/RestDelete.java  |  28 +-
 .../rest/annotation/RestDeleteAnnotation.java      |   2 +-
 .../apache/juneau/rest/annotation/RestDestroy.java |   4 +-
 .../rest/annotation/RestDestroyAnnotation.java     |   2 +-
 .../apache/juneau/rest/annotation/RestEndCall.java |   4 +-
 .../rest/annotation/RestEndCallAnnotation.java     |   2 +-
 .../org/apache/juneau/rest/annotation/RestGet.java |  32 +-
 .../juneau/rest/annotation/RestGetAnnotation.java  |   2 +-
 .../apache/juneau/rest/annotation/RestInit.java    |   4 +-
 .../juneau/rest/annotation/RestInitAnnotation.java |   2 +-
 .../org/apache/juneau/rest/annotation/RestOp.java  |  40 +-
 .../juneau/rest/annotation/RestOpAnnotation.java   |   2 +-
 .../apache/juneau/rest/annotation/RestOptions.java |  32 +-
 .../rest/annotation/RestOptionsAnnotation.java     |   2 +-
 .../apache/juneau/rest/annotation/RestPatch.java   |  40 +-
 .../rest/annotation/RestPatchAnnotation.java       |   2 +-
 .../apache/juneau/rest/annotation/RestPost.java    |  40 +-
 .../juneau/rest/annotation/RestPostAnnotation.java |   2 +-
 .../juneau/rest/annotation/RestPostCall.java       |   4 +-
 .../rest/annotation/RestPostCallAnnotation.java    |   2 +-
 .../juneau/rest/annotation/RestPostInit.java       |   2 +-
 .../rest/annotation/RestPostInitAnnotation.java    |   2 +-
 .../apache/juneau/rest/annotation/RestPreCall.java |   4 +-
 .../rest/annotation/RestPreCallAnnotation.java     |   2 +-
 .../org/apache/juneau/rest/annotation/RestPut.java |  40 +-
 .../juneau/rest/annotation/RestPutAnnotation.java  |   2 +-
 .../juneau/rest/annotation/RestStartCall.java      |   4 +-
 .../rest/annotation/RestStartCallAnnotation.java   |   2 +-
 .../org/apache/juneau/rest/annotation/Swagger.java |  34 +-
 .../juneau/rest/annotation/SwaggerAnnotation.java  |   2 +-
 .../org/apache/juneau/rest/arg/ArgException.java   |   2 +-
 .../org/apache/juneau/rest/arg/AttributeArg.java   |   2 +-
 .../org/apache/juneau/rest/arg/ContentArg.java     |   2 +-
 .../org/apache/juneau/rest/arg/CookieList.java     |   2 +-
 .../org/apache/juneau/rest/arg/DefaultArg.java     |   2 +-
 .../org/apache/juneau/rest/arg/FormDataArg.java    |   2 +-
 .../org/apache/juneau/rest/arg/HasFormDataArg.java |   2 +-
 .../org/apache/juneau/rest/arg/HasQueryArg.java    |   2 +-
 .../java/org/apache/juneau/rest/arg/HeaderArg.java |   2 +-
 .../juneau/rest/arg/HttpServletRequestArgs.java    |   2 +-
 .../juneau/rest/arg/HttpServletResponseArgs.java   |   2 +-
 .../apache/juneau/rest/arg/HttpSessionArgs.java    |   2 +-
 .../juneau/rest/arg/InputStreamParserArg.java      |   2 +-
 .../java/org/apache/juneau/rest/arg/MethodArg.java |   2 +-
 .../java/org/apache/juneau/rest/arg/ParserArg.java |   2 +-
 .../java/org/apache/juneau/rest/arg/PathArg.java   |   2 +-
 .../java/org/apache/juneau/rest/arg/QueryArg.java  |   2 +-
 .../apache/juneau/rest/arg/ReaderParserArg.java    |   2 +-
 .../org/apache/juneau/rest/arg/RequestBeanArg.java |   2 +-
 .../apache/juneau/rest/arg/ResponseBeanArg.java    |   2 +-
 .../apache/juneau/rest/arg/ResponseCodeArg.java    |   2 +-
 .../apache/juneau/rest/arg/ResponseHeaderArg.java  |   2 +-
 .../apache/juneau/rest/arg/RestContextArgs.java    |   2 +-
 .../java/org/apache/juneau/rest/arg/RestOpArg.java |   2 +-
 .../org/apache/juneau/rest/arg/RestOpArgList.java  |   2 +-
 .../apache/juneau/rest/arg/RestOpContextArgs.java  |   2 +-
 .../apache/juneau/rest/arg/RestOpSessionArgs.java  |   2 +-
 .../apache/juneau/rest/arg/RestRequestArgs.java    |   2 +-
 .../apache/juneau/rest/arg/RestResponseArgs.java   |   2 +-
 .../apache/juneau/rest/arg/RestSessionArgs.java    |   2 +-
 .../juneau/rest/arg/SimpleRestOperationArg.java    |   2 +-
 .../assertions/FluentProtocolVersionAssertion.java |   2 +-
 .../assertions/FluentRequestContentAssertion.java  |   6 +-
 .../FluentRequestFormParamAssertion.java           |   4 +-
 .../assertions/FluentRequestHeaderAssertion.java   |   4 +-
 .../assertions/FluentRequestLineAssertion.java     |   2 +-
 .../FluentRequestQueryParamAssertion.java          |   4 +-
 .../apache/juneau/rest/beans/BeanDescription.java  |   2 +-
 .../rest/beans/ChildResourceDescriptions.java      |   2 +-
 .../org/apache/juneau/rest/beans/Hyperlink.java    |   2 +-
 .../juneau/rest/beans/ResourceDescription.java     |   2 +-
 .../juneau/rest/beans/ResourceDescriptions.java    |   2 +-
 .../org/apache/juneau/rest/beans/SeeOtherRoot.java |   2 +-
 .../apache/juneau/rest/config/BasicJsonConfig.java |   2 +-
 .../juneau/rest/config/BasicJsonHtmlConfig.java    |   2 +-
 .../juneau/rest/config/BasicOpenApiConfig.java     |   2 +-
 .../juneau/rest/config/BasicSimpleJsonConfig.java  |   2 +-
 .../juneau/rest/config/BasicUniversalConfig.java   |   2 +-
 .../juneau/rest/converter/Introspectable.java      |   3 +-
 .../apache/juneau/rest/converter/Queryable.java    |   2 +-
 .../juneau/rest/converter/RestConverter.java       |   2 +-
 .../juneau/rest/converter/RestConverterList.java   |   2 +-
 .../apache/juneau/rest/converter/Traversable.java  |   2 +-
 .../juneau/rest/debug/BasicDebugEnablement.java    |   2 +-
 .../apache/juneau/rest/debug/DebugEnablement.java  |   2 +-
 .../juneau/rest/debug/DebugEnablementMap.java      |   2 +-
 .../org/apache/juneau/rest/guard/RestGuard.java    |   2 +-
 .../apache/juneau/rest/guard/RestGuardList.java    |   2 +-
 .../juneau/rest/guard/RoleBasedRestGuard.java      |   2 +-
 .../org/apache/juneau/rest/guard/RoleMatcher.java  |   2 +-
 .../juneau/rest/httppart/BasicNamedAttribute.java  |   2 +-
 .../juneau/rest/httppart/NamedAttribute.java       |   2 +-
 .../juneau/rest/httppart/NamedAttributeMap.java    |   2 +-
 .../juneau/rest/httppart/RequestAttribute.java     |   2 +-
 .../juneau/rest/httppart/RequestAttributes.java    |   2 +-
 .../juneau/rest/httppart/RequestContent.java       |   4 +-
 .../juneau/rest/httppart/RequestFormParam.java     |   2 +-
 .../juneau/rest/httppart/RequestFormParams.java    |   2 +-
 .../apache/juneau/rest/httppart/RequestHeader.java |   2 +-
 .../juneau/rest/httppart/RequestHeaders.java       |   2 +-
 .../juneau/rest/httppart/RequestHttpPart.java      |   4 +-
 .../juneau/rest/httppart/RequestPathParam.java     |   2 +-
 .../juneau/rest/httppart/RequestPathParams.java    |   2 +-
 .../juneau/rest/httppart/RequestQueryParam.java    |   2 +-
 .../juneau/rest/httppart/RequestQueryParams.java   |   2 +-
 .../juneau/rest/httppart/ResponsePartMeta.java     |   2 +-
 .../apache/juneau/rest/httppart/RestPartType.java  |   2 +-
 .../apache/juneau/rest/logger/BasicCallLogger.java |   2 +-
 .../rest/logger/BasicDisabledCallLogger.java       |   2 +-
 .../juneau/rest/logger/BasicTestCallLogger.java    |   2 +-
 .../rest/logger/BasicTestCaptureCallLogger.java    |   2 +-
 .../org/apache/juneau/rest/logger/CallLogger.java  |   2 +-
 .../apache/juneau/rest/logger/CallLoggerRule.java  |   2 +-
 .../juneau/rest/logger/CallLoggingDetail.java      |   2 +-
 .../juneau/rest/matcher/ClientVersionMatcher.java  |   2 +-
 .../rest/matcher/MultipartFormDataMatcher.java     |   3 +-
 .../apache/juneau/rest/matcher/RestMatcher.java    |   2 +-
 .../juneau/rest/matcher/RestMatcherList.java       |   2 +-
 .../juneau/rest/matcher/UrlEncodedFormMatcher.java |   2 +-
 .../juneau/rest/processor/HttpEntityProcessor.java |   2 +-
 .../rest/processor/HttpResourceProcessor.java      |   2 +-
 .../rest/processor/HttpResponseProcessor.java      |   2 +-
 .../rest/processor/InputStreamProcessor.java       |   2 +-
 .../rest/processor/PlainTextPojoProcessor.java     |   2 +-
 .../juneau/rest/processor/ReaderProcessor.java     |   2 +-
 .../rest/processor/ResponseBeanProcessor.java      |   2 +-
 .../juneau/rest/processor/ResponseProcessor.java   |   2 +-
 .../rest/processor/ResponseProcessorList.java      |   2 +-
 .../rest/processor/SerializedPojoProcessor.java    |   2 +-
 .../juneau/rest/processor/ThrowableProcessor.java  |   2 +-
 .../org/apache/juneau/rest/remote/RrpcServlet.java |   3 +-
 .../apache/juneau/rest/rrpc/RrpcRestOpContext.java |   2 +-
 .../apache/juneau/rest/rrpc/RrpcRestOpSession.java |   2 +-
 .../juneau/rest/servlet/BasicGroupOperations.java  |   2 +-
 .../juneau/rest/servlet/BasicRestObject.java       |   2 +-
 .../juneau/rest/servlet/BasicRestObjectGroup.java  |   2 +-
 .../juneau/rest/servlet/BasicRestOperations.java   |   2 +-
 .../juneau/rest/servlet/BasicRestServlet.java      |   2 +-
 .../juneau/rest/servlet/BasicRestServletGroup.java |   2 +-
 .../org/apache/juneau/rest/servlet/RestObject.java |   2 +-
 .../apache/juneau/rest/servlet/RestServlet.java    |   2 +-
 .../juneau/rest/staticfile/BasicStaticFiles.java   |   2 +-
 .../apache/juneau/rest/staticfile/StaticFiles.java |   2 +-
 .../apache/juneau/rest/stats/MethodExecStats.java  |   2 +-
 .../apache/juneau/rest/stats/MethodExecStore.java  |   2 +-
 .../apache/juneau/rest/stats/RestContextStats.java |   2 +-
 .../org/apache/juneau/rest/stats/ThrownStats.java  |   2 +-
 .../org/apache/juneau/rest/stats/ThrownStore.java  |   2 +-
 .../juneau/rest/swagger/BasicSwaggerProvider.java  |   2 +-
 .../rest/swagger/BasicSwaggerProviderSession.java  |   2 +-
 .../juneau/rest/swagger/SwaggerProvider.java       |   2 +-
 .../java/org/apache/juneau/rest/vars/FileVar.java  |   2 +-
 .../apache/juneau/rest/vars/LocalizationVar.java   |   2 +-
 .../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   |   2 +-
 .../apache/juneau/rest/vars/RequestSwaggerVar.java |   2 +-
 .../org/apache/juneau/rest/vars/RequestVar.java    |   2 +-
 .../juneau/rest/vars/SerializedRequestAttrVar.java |   2 +-
 .../juneau/rest/vars/ServletInitParamVar.java      |   2 +-
 .../org/apache/juneau/rest/vars/SwaggerVar.java    |   2 +-
 .../org/apache/juneau/rest/vars/UrlEncodeVar.java  |   2 +-
 .../java/org/apache/juneau/rest/vars/UrlVar.java   |   2 +-
 .../juneau/rest/widget/ContentTypeMenuItem.java    |   4 +-
 .../apache/juneau/rest/widget/MenuItemWidget.java  |   4 +-
 .../apache/juneau/rest/widget/PoweredByApache.java |   4 +-
 .../apache/juneau/rest/widget/PoweredByJuneau.java |   4 +-
 .../apache/juneau/rest/widget/QueryMenuItem.java   |   4 +-
 .../apache/juneau/rest/widget/ThemeMenuItem.java   |   4 +-
 .../org/apache/juneau/rest/widget/Tooltip.java     |   4 +-
 .../java/org/apache/juneau/rest/widget/Widget.java |  10 +-
 pom.xml                                            |   6 -
 1065 files changed, 2575 insertions(+), 3911 deletions(-)

diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
index 8f5fb1462..4ac1cd0ff 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
@@ -121,7 +121,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The object type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
index 5de394f20..d46a979bd 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
@@ -105,7 +105,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
index 24f38968f..4c42be31d 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -50,7 +50,7 @@ import org.apache.juneau.internal.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a>
  * </ul>
  */
 @FluentSetters
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index e90d08d7f..5645913c1 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -47,7 +47,7 @@ import org.apache.juneau.cp.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> the type of input being tested.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index cffe408a1..cf9cd930a 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -44,7 +44,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 public class AssertionPredicates {
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
index be42e85c1..de240cfbb 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
@@ -65,7 +65,7 @@ import org.apache.juneau.utils.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a>
  * </ul>
  */
 public class Assertions {
@@ -96,7 +96,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link AnyAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link AnyAssertion} for supported operations on this type.
 	 *
 	 * @param <T> The value type.
 	 * @param value
@@ -124,7 +124,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ArrayAssertion} for supported operations on this type.
 	 *
 	 * @param <E> The value element type.
 	 * @param value
@@ -153,7 +153,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link BeanAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BeanAssertion} for supported operations on this type.
 	 *
 	 * @param <T> The value type.
 	 * @param value
@@ -182,7 +182,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link BeanListAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BeanListAssertion} for supported operations on this type.
 	 *
 	 * @param <E> The element type.
 	 * @param value
@@ -209,7 +209,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link BooleanAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BooleanAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -236,7 +236,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -268,7 +268,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -299,7 +299,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ByteArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ByteArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -325,7 +325,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ByteArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ByteArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -353,7 +353,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -384,7 +384,7 @@ public class Assertions {
 	 * provides more functionality than {@link CollectionAssertion}.
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link CollectionAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link CollectionAssertion} for supported operations on this type.
 	 *
 	 * @param <E> The element type.
 	 * @param value
@@ -411,7 +411,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ComparableAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ComparableAssertion} for supported operations on this type.
 	 *
 	 * @param <T> The value type.
 	 * @param value
@@ -438,7 +438,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link DateAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link DateAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -465,7 +465,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -492,7 +492,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -519,7 +519,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -545,7 +545,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link IntegerAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link IntegerAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -572,7 +572,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ListAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ListAssertion} for supported operations on this type.
 	 *
 	 * @param <E> The element type.
 	 * @param value
@@ -600,7 +600,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ListAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ListAssertion} for supported operations on this type.
 	 *
 	 * @param <E> The element type.
 	 * @param value
@@ -629,7 +629,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link LongAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link LongAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -656,7 +656,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -683,7 +683,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link MapAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link MapAssertion} for supported operations on this type.
 	 *
 	 * @param <K> The key type.
 	 * @param <V> The value type.
@@ -713,7 +713,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ObjectAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ObjectAssertion} for supported operations on this type.
 	 *
 	 * @param <T> The value type.
 	 * @param value
@@ -742,7 +742,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link AnyAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link AnyAssertion} for supported operations on this type.
 	 *
 	 * @param <T> The value type.
 	 * @param value
@@ -769,7 +769,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link StringAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -798,7 +798,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -825,7 +825,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link StringAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -856,7 +856,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link StringListAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringListAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -883,7 +883,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ThrowableAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ThrowableAssertion} for supported operations on this type.
 	 *
 	 * @param <T> The value type.
 	 * @param value
@@ -910,7 +910,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link VersionAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link VersionAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
@@ -936,7 +936,7 @@ public class Assertions {
 	 * </p>
 	 *
 	 * <p>
-	 * See {@doc ja.Overview Fluent Assertions} for general assertion usage and {@link ZonedDateTimeAssertion} for supported operations on this type.
+	 * See <a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ZonedDateTimeAssertion} for supported operations on this type.
 	 *
 	 * @param value
 	 * 	The object being tested.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
index 2af85ab35..68baee503 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
@@ -89,7 +89,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The bean type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
index ba6516828..0e9f73d59 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
@@ -119,7 +119,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The bean type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
index d49b8b591..87ae16e01 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
@@ -87,7 +87,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="BooleanAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
index 29c678a2e..64da83fbe 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
@@ -107,7 +107,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="ByteArrayAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
index df5cba728..1f6fb3edf 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
@@ -96,7 +96,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
index 0aaee8322..89a5f1d75 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
@@ -82,7 +82,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The comparable type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
index fcfc89808..dac1e934d 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
@@ -104,7 +104,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="DateAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
index 326f7e81c..8348c2598 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
@@ -127,7 +127,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The object type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index f647b9270..3be20ee13 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -106,7 +106,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The entry type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
index f134b56d9..9e8a7f7c1 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
@@ -75,7 +75,7 @@ import org.apache.juneau.internal.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
index 18321d1d2..0b405a727 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
@@ -85,7 +85,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The bean type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
index 7cf14e5fc..e29d834de 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
@@ -113,7 +113,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The bean type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
index b94db4e9d..a32a3639f 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
@@ -89,7 +89,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
index a2e39cf77..00013a41b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
@@ -102,7 +102,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index e9458e0fe..d19569822 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -95,7 +95,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index c9c05ec5d..1765ad10e 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -85,7 +85,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The value type
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index 96427060b..5a5821c1a 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -112,7 +112,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
index 38e396f59..6631b870b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
@@ -93,7 +93,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
index 86bab1c6b..3de4da8ae 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
@@ -111,7 +111,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
index 6274d449e..7f0c06758 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
@@ -97,7 +97,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index 5a642d0dc..587144abc 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -95,7 +95,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <K> The key type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 6827d18ed..7bc8a564d 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -83,7 +83,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The object type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index 2d143c4bf..b83e66433 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -99,7 +99,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The array element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 4387a63e4..4773277ae 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -122,7 +122,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
index 358c9673f..66822afa4 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
@@ -114,7 +114,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index 09ac1edf3..91580c92d 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -92,7 +92,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The throwable type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
index bc668e9cf..c4e2ce4bc 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
@@ -100,7 +100,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index 305233e3c..f4b18ca33 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -106,7 +106,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
index e06fdb096..9fab8bff5 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
@@ -88,7 +88,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="IntegerAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
index 2311578c9..6e51eca44 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
@@ -113,7 +113,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
index c0505818b..fe60cf04e 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
@@ -93,7 +93,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="LongAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
index a710619db..501501cc7 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
@@ -97,7 +97,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <K> The map key type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
index 442f918b0..194a0c194 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
@@ -81,7 +81,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The object type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
index 9af4061b2..10af76419 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
@@ -98,7 +98,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <E> The array element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index 79020a3b1..3527c777b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -115,7 +115,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="StringAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
index 873f49dad..0d4d69976 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
@@ -112,7 +112,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="StringListAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
index 11ce5626a..bcb93445e 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
@@ -92,7 +92,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  *
  * @param <T> The throwable type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
index 90509b89c..e61a83891 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
@@ -33,7 +33,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 public class Verify {
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
index 1701a741d..3ed4844a5 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
@@ -97,7 +97,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="VersionAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
index ecde65837..1da93db0a 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
@@ -100,7 +100,7 @@ import org.apache.juneau.serializer.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Overview &gt; juneau-assertions &gt; Overview</a>
  * </ul>
  */
 @FluentSetters(returns="ZonedDateTimeAssertion")
diff --git a/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/StringUtils.java b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/StringUtils.java
index a1ac80449..36c6b2542 100644
--- a/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/StringUtils.java
+++ b/juneau-core/juneau-common/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -1371,7 +1371,7 @@ public final class StringUtils {
 	 * Characters are composed of lower-case ASCII letters and numbers only.
 	 *
 	 * <p>
-	 * This method conforms to the restrictions for hostnames as specified in {@doc https://tools.ietf.org/html/rfc952 RFC 952}
+	 * This method conforms to the restrictions for hostnames as specified in <a class="doclink" href="https://tools.ietf.org/html/rfc952">RFC 952</a>
 	 * Since each character has 36 possible values, the square approximation formula for the number of generated IDs
 	 * that would produce a 50% chance of collision is:
 	 * <c>sqrt(36^N)</c>.
diff --git a/juneau-core/juneau-common/src/main/java/org/apache/juneau/utils/Snippet.java b/juneau-core/juneau-common/src/main/java/org/apache/juneau/utils/Snippet.java
index b3057350d..7a3d5319e 100644
--- a/juneau-core/juneau-common/src/main/java/org/apache/juneau/utils/Snippet.java
+++ b/juneau-core/juneau-common/src/main/java/org/apache/juneau/utils/Snippet.java
@@ -22,7 +22,7 @@ package org.apache.juneau.utils;
  * See <c>Assertions.<jsm>assertThrown</jsm>(Snippet)</c> for an example.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc ja.Overview}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-assertions.ja.Overview">Fluent Assertions</a>
  * </ul>
  */
 public interface Snippet {
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 886fc03ca..a5aa8d8ed 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -45,7 +45,7 @@ import org.apache.juneau.utils.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-config}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-config">Overview &gt; juneau-config</a>
  * </ul>
  */
 public final class Config extends Context implements ConfigEventListener {
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
index 03bc132ec..de361d4c8 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
@@ -23,7 +23,7 @@ import static org.apache.juneau.internal.IOUtils.*;
  * This is not intended to be used as strong encryption.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jc.ModdedEntries}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-config.jc.ModdedEntries">Overview &gt; juneau-config &gt; Modded/Encoded Entries</a>
  * </ul>
  */
 public class XorEncodeMod extends Mod {
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
index 4cc6497ea..d62b2ba64 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
@@ -46,8 +46,8 @@ import org.apache.juneau.svl.*;
  * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.SimpleVariableLanguage}
- * 	<li class='link'>{@doc jc.Variables}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage">Overview &gt; juneau-marshall &gt; Simple Variable Language</a>
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-config.jc.Variables">Overview &gt; juneau-config &gt; Variables</a>
  * </ul>
  */
 public class ConfigVar extends DefaultingVar {
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 4f55ea461..73d004223 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
@@ -38,8 +38,8 @@ import org.apache.juneau.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 public class AtomBuilder {
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 1f08a1c37..5b4dbf5c7 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
@@ -37,8 +37,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @Bean(typeName="category")
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 99aca2016..c89ba011e 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
@@ -33,8 +33,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @FluentSetters
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 d222b4fb4..b86369e50 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
@@ -24,8 +24,8 @@ import org.apache.juneau.xml.annotation.*;
  * Parent class of {@link Entry}, {@link Feed}, and {@link Source}.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @FluentSetters
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 6efbd4ff0..7ee7e4b84 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
@@ -61,8 +61,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @FluentSetters
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 10b150ff5..e84bb20a1 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
@@ -44,8 +44,8 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @Bean(typeName="entry")
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 5e3fc16e0..52a35f934 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
@@ -49,8 +49,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @Bean(typeName="feed")
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 8d99a45a7..3efed2906 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
@@ -35,8 +35,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @Bean(typeName="generator")
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 2c3443958..65f1ff44a 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
@@ -34,8 +34,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @Bean(typeName="icon")
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 bbf74b4de..05b51b618 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
@@ -30,8 +30,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @Bean(typeName="id")
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 13831cfce..3c23d04ba 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
@@ -37,8 +37,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @Bean(typeName="link")
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 3cf227cf2..035e3240b 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
@@ -34,8 +34,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @Bean(typeName="logo")
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 2559948b3..dc8e31ee0 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
@@ -33,8 +33,8 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @FluentSetters
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 98bdb3def..d1d83c178 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
@@ -41,8 +41,8 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @FluentSetters
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 660d13f04..b0a30bb20 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
@@ -42,8 +42,8 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 @FluentSetters
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 e29171917..cf856f08e 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
@@ -20,8 +20,8 @@ import javax.xml.bind.*;
  * Static utility methods for ATOM marshalling code.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Atom}
- * 	<li class='jp'>{@doc package-summary.html#TOC}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Atom">Overview &gt; juneau-dto &gt; Atom</a>
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
  * </ul>
  */
 class Utils {
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 8f92cb7d3..74b6624a1 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
@@ -30,20 +30,6 @@
 </head>
 <body>
 <p>ATOM Data Transfer Objects</p>
-<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-<ol class='toc'>
-	<li><p>{@doc package-summary.html#Overview Overview}</p>
-	<ol>
-		<li><p>{@doc package-summary.html#Serialize Serializing ATOM feeds}</p>
-		<ol>
-			<li><p>{@doc package-summary.html#AtomJson ATOM/JSON}</p>
-			<li><p>{@doc package-summary.html#AtomRdfXml ATOM/RDF/XML}</p>
-			<li><p>{@doc package-summary.html#AtomHtml ATOM/HTML}</p>
-		</ol>
-		<li><p>{@doc package-summary.html#Parse Parsing ATOM feeds}</p>
-	</ol>
-</ol>
-
 
 <!-- ======================================================================================================== -->
 <a id="Overview"></a>
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 e40a2aa43..32f139a6f 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-a-element <a>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="a")
@@ -47,7 +47,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-download download} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
 	 *
 	 * <p>
 	 * Whether to download the resource instead of navigating to it, and its file name if so.
@@ -63,7 +63,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-href href} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
 	 *
 	 * <p>
 	 * Address of the hyperlink.
@@ -86,7 +86,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-hreflang hreflang} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.
 	 *
 	 * <p>
 	 * Language of the linked resource.
@@ -100,7 +100,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-rel rel} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.
 	 *
 	 * <p>
 	 * Relationship between the document containing the hyperlink and the destination resource.
@@ -114,7 +114,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-target target} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.
 	 *
 	 * <p>
 	 * Default browsing context for hyperlink navigation and form submission.
@@ -128,7 +128,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Hint for the type of the referenced resource.
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 178094be5..7d5fa5df9 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-abbr-element <abbr>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="abbr")
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 4f7de7362..5acb8195d 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-address-element <address>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-address-element">&lt;address&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="address")
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 43a1ef8cf..2a8debc47 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-area-element <area>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="area")
@@ -48,7 +48,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-area-alt alt} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-alt">alt</a> attribute.
 	 *
 	 * <p>
 	 * Replacement text for use when images are not available.
@@ -62,7 +62,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-area-coords coords}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-coords">coords</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -77,7 +77,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-download download} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-download">download</a> attribute.
 	 *
 	 * <p>
 	 * Whether to download the resource instead of navigating to it, and its file name if so.
@@ -93,7 +93,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-href href} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-href">href</a> attribute.
 	 *
 	 * <p>
 	 * Address of the hyperlink.
@@ -116,7 +116,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-hreflang hreflang} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-hreflang">hreflang</a> attribute.
 	 *
 	 * <p>
 	 * Language of the linked resource.
@@ -130,7 +130,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-rel rel} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-rel">rel</a> attribute.
 	 *
 	 * <p>
 	 * Relationship between the document containing the hyperlink and the destination resource.
@@ -144,7 +144,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-area-shape shape} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-area-shape">shape</a> attribute.
 	 *
 	 * <p>
 	 * The kind of shape to be created in an image map.
@@ -158,7 +158,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-target target} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-target">target</a> attribute.
 	 *
 	 * <p>
 	 * Browsing context for hyperlink navigation.
@@ -172,7 +172,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-hyperlink-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-hyperlink-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Hint for the type of the referenced resource.
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 80bd6a811..ff2426244 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-article-element <article>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-article-element">&lt;article&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="article")
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 df899e837..4e81feab3 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-aside-element <aside>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-aside-element">&lt;aside&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="aside")
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 84ac1af7a..e5818431b 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-audio-element <audio>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="audio")
@@ -45,7 +45,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-autoplay autoplay}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-autoplay">autoplay</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -62,7 +62,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-controls controls}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-controls">controls</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -79,7 +79,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-crossorigin crossorigin}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-crossorigin">crossorigin</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -94,7 +94,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-loop loop} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-loop">loop</a> attribute.
 	 *
 	 * <p>
 	 * Whether to loop the media resource.
@@ -110,7 +110,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-mediagroup mediagroup}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-mediagroup">mediagroup</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -125,7 +125,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-muted muted}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-muted">muted</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -142,7 +142,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-preload preload}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-preload">preload</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -157,7 +157,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
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 00824eb44..a3459bc35 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-b-element <b>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="b")
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 61fda860d..9a800bdd4 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.document-metadata#the-base-element <base>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="base")
@@ -45,7 +45,7 @@ public class Base extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-base-href href} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-base-href">href</a> attribute.
 	 *
 	 * <p>
 	 * Document base URL.
@@ -68,7 +68,7 @@ public class Base extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-base-target target}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-base-target">target</a>
 	 * attribute.
 	 *
 	 * <p>
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 f34276433..98c89c0bb 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-bdi-element <bdi>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="bdi")
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 59310df95..eeaf08696 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-bdo-element <bdo>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="bdo")
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 a55a76913..4cc7d7996 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-blockquote-element <blockquote>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="blockquote")
@@ -42,7 +42,7 @@ public class Blockquote extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.grouping-content#attr-blockquote-cite cite}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#attr-blockquote-cite">cite</a>
 	 * attribute.
 	 *
 	 * <p>
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 63c4ddf5d..0f337dbe5 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-body-element <body>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-body-element">&lt;body&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="body")
@@ -42,7 +42,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-window-onafterprint onafterprint}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onafterprint">onafterprint</a>
 	 * attribute.
 	 *
 	 * @param onafterprint The new value for this attribute.
@@ -54,7 +54,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-window-onbeforeunload onbeforeunload}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onbeforeunload">onbeforeunload</a>
 	 * attribute.
 	 *
 	 * @param onbeforeunload The new value for this attribute.
@@ -66,7 +66,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-window-onmessage onmessage}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onmessage">onmessage</a>
 	 * attribute.
 	 *
 	 * @param onmessage The new value for this attribute.
@@ -78,7 +78,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-window-ononline ononline}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-ononline">ononline</a>
 	 * attribute.
 	 *
 	 * @param ononline The new value for this attribute.
@@ -90,7 +90,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-window-onpageshow onpageshow}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onpageshow">onpageshow</a>
 	 * attribute.
 	 *
 	 * @param onpageshow The new value for this attribute.
@@ -102,7 +102,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-window-onstorage onstorage}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-window-onstorage">onstorage</a>
 	 * attribute.
 	 *
 	 * @param onstorage The new value for this attribute.
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 e79766f9a..7b64b28a5 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-br-element <br>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="br")
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 b9b231a54..0fd5e50e8 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-button-element <button>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-button-element">&lt;button&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="button")
@@ -56,7 +56,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -72,7 +72,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -88,7 +88,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -102,7 +102,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formaction formaction} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formaction">formaction</a> attribute.
 	 *
 	 * <p>
 	 * URL to use for form submission.
@@ -123,7 +123,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formenctype formenctype} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formenctype">formenctype</a> attribute.
 	 *
 	 * <p>
 	 * Form data set encoding type to use for form submission.
@@ -137,7 +137,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formmethod formmethod} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formmethod">formmethod</a> attribute.
 	 *
 	 * <p>
 	 * HTTP method to use for form submission.
@@ -151,7 +151,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formnovalidate formnovalidate}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formnovalidate">formnovalidate</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -166,7 +166,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formtarget formtarget} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formtarget">formtarget</a> attribute.
 	 *
 	 * <p>
 	 * Browsing context for form submission.
@@ -180,7 +180,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-menu menu} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-menu">menu</a> attribute.
 	 *
 	 * <p>
 	 * Specifies the element's designated pop-up menu.
@@ -194,7 +194,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
@@ -208,7 +208,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-button-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-button-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Type of button.
@@ -222,7 +222,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-button-value value} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-button-value">value</a> attribute.
 	 *
 	 * <p>
 	 * Value to be used for form submission.
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 687d1af7e..b3038b0db 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.scripting-1#the-canvas-element <canvas>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="canvas")
@@ -44,7 +44,7 @@ public class Canvas extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.scripting-1#attr-canvas-height height} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-canvas-height">height</a> attribute.
 	 *
 	 * <p>
 	 * Vertical dimension.
@@ -60,7 +60,7 @@ public class Canvas extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.scripting-1#attr-canvas-width width} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-canvas-width">width</a> attribute.
 	 *
 	 * <p>
 	 * Horizontal dimension.
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 a6441ae2e..d9012875c 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-caption-element <caption>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="caption")
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 513249e29..4c83db796 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-cite-element <cite>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="cite")
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 1af4999c6..355889842 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-code-element <code>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="code")
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 ffd96c45d..fbbba0581 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-col-element <col>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="col")
@@ -42,7 +42,7 @@ public class Col extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-col-span span} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-col-span">span</a> attribute.
 	 *
 	 * <p>
 	 * Number of columns spanned by the element.
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 4afeec8e1..38565be4c 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-colgroup-element <colgroup>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="colgroup")
@@ -42,7 +42,7 @@ public class Colgroup extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-colgroup-span span} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-colgroup-span">span</a> attribute.
 	 *
 	 * <p>
 	 * Number of columns spanned by the element.
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 1e41ebc77..97375606a 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-data-element <data>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="data")
@@ -43,7 +43,7 @@ public class Data extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.text-level-semantics#attr-data-value value}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#attr-data-value">value</a>
 	 * attribute.
 	 *
 	 * <p>
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 d140851f5..285573984 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-datalist-element <datalist>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-datalist-element">&lt;datalist&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="datalist")
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 3c246ada6..9787a8751 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-dd-element <dd>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="dd")
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 10faf7995..6d5e82344 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.edits#the-del-element <del>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#the-del-element">&lt;del&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="del")
@@ -42,7 +42,7 @@ public class Del extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.edits#attr-mod-cite cite} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#attr-mod-cite">cite</a> attribute.
 	 *
 	 * <p>
 	 * Link to the source of the quotation or more information about the edit.
@@ -56,7 +56,7 @@ public class Del extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.edits#attr-mod-datetime datetime} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#attr-mod-datetime">datetime</a> attribute.
 	 *
 	 * <p>
 	 * Date and (optionally) time of the change.
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 67d0e201c..a7ba69669 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-dfn-element <dfn>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="dfn")
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 71ffcedb2..78d6f9a7d 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-div-element <div>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="div")
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 d2cecc6ce..329f35d22 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-dl-element <dl>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="dl")
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 dbdc031eb..8e1332c6d 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-dt-element <dt>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="dt")
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 74b2d63c7..d29746ae3 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-em-element <em>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="em")
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 3f5e7294d..2b9a9719f 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-embed-element <embed>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="embed")
@@ -45,7 +45,7 @@ public class Embed extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-height height}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -62,7 +62,7 @@ public class Embed extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-embed-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-embed-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -85,7 +85,7 @@ public class Embed extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-embed-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-embed-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Type of embedded resource.
@@ -99,7 +99,7 @@ public class Embed extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
 	 *
 	 * <p>
 	 * Horizontal dimension.
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 f32c59a7d..9b4d05547 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-fieldset-element <fieldset>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-fieldset-element">&lt;fieldset&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
 */
 @Bean(typeName="fieldset")
@@ -42,7 +42,7 @@ public class Fieldset extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fieldset-disabled disabled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fieldset-disabled">disabled</a> attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -58,7 +58,7 @@ public class Fieldset extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -72,7 +72,7 @@ public class Fieldset extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
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 ff27c165f..e9bd57249 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-figcaption-element <figcaption>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="figcaption")
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 13751601b..bd5b8e6bb 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-figure-element <figure>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="figure")
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 f8b1caf71..53a12365c 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-footer-element <footer>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-footer-element">&lt;footer&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="footer")
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 bb237825c..c0883d4f3 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-form-element <form>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-form-element">&lt;form&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="form")
@@ -55,7 +55,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-form-accept-charset accept-charset}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-form-accept-charset">accept-charset</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -70,7 +70,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-action action} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-action">action</a> attribute.
 	 *
 	 * <p>
 	 * URL to use for form submission.
@@ -91,7 +91,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-form-autocomplete autocomplete}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-form-autocomplete">autocomplete</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -106,7 +106,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-enctype enctype} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-enctype">enctype</a> attribute.
 	 *
 	 * <p>
 	 * Form data set encoding type to use for form submission.
@@ -120,7 +120,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-method method} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-method">method</a> attribute.
 	 *
 	 * <p>
 	 * HTTP method to use for form submission.
@@ -134,7 +134,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-form-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-form-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of form to use in the document.forms API.
@@ -148,7 +148,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-novalidate novalidate} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-novalidate">novalidate</a> attribute.
 	 *
 	 * <p>
 	 * Bypass form control validation for form submission.
@@ -163,7 +163,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-target target} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-target">target</a> attribute.
 	 *
 	 * <p>
 	 * Browsing context for form submission.
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 543f8ea6a..91ca747b6 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h1>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="h1")
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 bdce66119..14a7342e6 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h2>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="h2")
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 843b4cd7b..abeafe171 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h3>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="h3")
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 a9c4aa713..25200a5dc 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h4>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="h4")
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 fca677794..2aba7510c 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h5>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="h5")
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 760b223b3..e738b1cce 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h6>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="h6")
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 5908d2efc..06c3236a8 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.document-metadata#the-head-element <head>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="head")
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 2ea0f4259..4951d96c2 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-header-element <header>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-header-element">&lt;header&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="header")
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 72f95f8e1..109d09261 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-hr-element <hr>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="hr")
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 e374f9e22..f692ba8f1 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.semantics#the-html-element <html>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/semantics.html#the-html-element">&lt;html&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="html")
@@ -42,7 +42,7 @@ public class Html extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.semantics#attr-html-manifest manifest} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/semantics.html#attr-html-manifest">manifest</a> attribute.
 	 *
 	 * <p>
 	 * Application cache manifest.
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 a0bba53a3..2bc649601 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
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
  * Defines the Java classes that make up the HTML DTO type dictionary.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  *
  * @serial exclude
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 9532413b0..752414bba 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
@@ -16,7 +16,7 @@ package org.apache.juneau.dto.html5;
  * Various useful static methods for creating HTML elements.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 public class HtmlBuilder {
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 eb79c4e48..aa38aa412 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
@@ -32,7 +32,7 @@ import org.apache.juneau.xml.annotation.*;
  * These are beans that when serialized using {@link HtmlSerializer} generate valid HTML5 elements.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @org.apache.juneau.html.annotation.Html(format=XML)
@@ -141,7 +141,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.editing#the-accesskey-attribute accesskey}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#the-accesskey-attribute">accesskey</a>
 	 * attribute.
 	 *
 	 * @param accesskey The new value for this attribute.
@@ -154,7 +154,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.dom#classes class} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/dom.html#classes">class</a> attribute.
 	 *
 	 * @param _class The new value for this attribute.
 	 * @return This object.
@@ -166,7 +166,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.editing#attr-contenteditable contenteditable}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#attr-contenteditable">contenteditable</a>
 	 * attribute.
 	 *
 	 * @param contenteditable The new value for this attribute.
@@ -180,7 +180,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.dom#the-dir-attribute dir} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/dom.html#the-dir-attribute">dir</a> attribute.
 	 *
 	 * @param dir The new value for this attribute.
 	 * @return This object.
@@ -192,7 +192,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.editing#the-hidden-attribute hidden} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#the-hidden-attribute">hidden</a> attribute.
 	 *
 	 * @param hidden
 	 * 	The new value for this attribute.
@@ -206,7 +206,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.dom#the-id-attribute id} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/dom.html#the-id-attribute">id</a> attribute.
 	 *
 	 * @param id The new value for this attribute.
 	 * @return This object.
@@ -218,7 +218,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.dom#attr-lang lang} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/dom.html#attr-lang">lang</a> attribute.
 	 *
 	 * @param lang The new value for this attribute.
 	 * @return This object.
@@ -230,7 +230,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onabort onabort} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onabort">onabort</a> attribute.
 	 *
 	 * @param onabort The new value for this attribute.
 	 * @return This object.
@@ -242,7 +242,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onblur onblur} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onblur">onblur</a> attribute.
 	 *
 	 * @param onblur The new value for this attribute.
 	 * @return This object.
@@ -254,7 +254,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-oncancel oncancel} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-oncancel">oncancel</a> attribute.
 	 *
 	 * @param oncancel The new value for this attribute.
 	 * @return This object.
@@ -266,7 +266,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-oncanplay oncanplay} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-oncanplay">oncanplay</a> attribute.
 	 *
 	 * @param oncanplay The new value for this attribute.
 	 * @return This object.
@@ -278,7 +278,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-oncanplaythrough oncanplaythrough}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-oncanplaythrough">oncanplaythrough</a>
 	 * attribute.
 	 *
 	 * @param oncanplaythrough The new value for this attribute.
@@ -291,7 +291,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onchange onchange} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onchange">onchange</a> attribute.
 	 *
 	 * @param onchange The new value for this attribute.
 	 * @return This object.
@@ -303,7 +303,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onclick onclick} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onclick">onclick</a> attribute.
 	 *
 	 * @param onclick The new value for this attribute.
 	 * @return This object.
@@ -315,7 +315,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-oncuechange oncuechange}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-oncuechange">oncuechange</a>
 	 * attribute.
 	 *
 	 * @param oncuechange The new value for this attribute.
@@ -328,7 +328,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-ondblclick ondblclick} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-ondblclick">ondblclick</a> attribute.
 	 *
 	 * @param ondblclick The new value for this attribute.
 	 * @return This object.
@@ -340,7 +340,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-ondurationchange ondurationchange}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-ondurationchange">ondurationchange</a>
 	 * attribute.
 	 *
 	 * @param ondurationchange The new value for this attribute.
@@ -353,7 +353,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onemptied onemptied} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onemptied">onemptied</a> attribute.
 	 *
 	 * @param onemptied The new value for this attribute.
 	 * @return This object.
@@ -365,7 +365,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onended onended} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onended">onended</a> attribute.
 	 *
 	 * @param onended The new value for this attribute.
 	 * @return This object.
@@ -377,7 +377,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onerror onerror} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onerror">onerror</a> attribute.
 	 *
 	 * @param onerror The new value for this attribute.
 	 * @return This object.
@@ -389,7 +389,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onfocus onfocus} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onfocus">onfocus</a> attribute.
 	 *
 	 * @param onfocus The new value for this attribute.
 	 * @return This object.
@@ -401,7 +401,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-oninput oninput} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-oninput">oninput</a> attribute.
 	 *
 	 * @param oninput The new value for this attribute.
 	 * @return This object.
@@ -413,7 +413,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-oninvalid oninvalid} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-oninvalid">oninvalid</a> attribute.
 	 *
 	 * @param oninvalid The new value for this attribute.
 	 * @return This object.
@@ -425,7 +425,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onkeydown onkeydown} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onkeydown">onkeydown</a> attribute.
 	 *
 	 * @param onkeydown The new value for this attribute.
 	 * @return This object.
@@ -437,7 +437,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onkeypress onkeypress} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onkeypress">onkeypress</a> attribute.
 	 *
 	 * @param onkeypress The new value for this attribute.
 	 * @return This object.
@@ -449,7 +449,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onkeyup onkeyup} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onkeyup">onkeyup</a> attribute.
 	 *
 	 * @param onkeyup The new value for this attribute.
 	 * @return This object.
@@ -461,7 +461,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onload onload} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onload">onload</a> attribute.
 	 *
 	 * @param onload The new value for this attribute.
 	 * @return This object.
@@ -473,7 +473,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onloadeddata onloadeddata}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onloadeddata">onloadeddata</a>
 	 * attribute.
 	 *
 	 * @param onloadeddata The new value for this attribute.
@@ -486,7 +486,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onloadedmetadata onloadedmetadata}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onloadedmetadata">onloadedmetadata</a>
 	 * attribute.
 	 *
 	 * @param onloadedmetadata The new value for this attribute.
@@ -499,7 +499,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onloadstart onloadstart}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onloadstart">onloadstart</a>
 	 * attribute.
 	 *
 	 * @param onloadstart The new value for this attribute.
@@ -512,7 +512,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onmousedown onmousedown}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onmousedown">onmousedown</a>
 	 * attribute.
 	 *
 	 * @param onmousedown The new value for this attribute.
@@ -525,7 +525,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onmouseenter onmouseenter} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onmouseenter">onmouseenter</a> attribute.
 	 *
 	 * @param onmouseenter The new value for this attribute.
 	 * @return This object.
@@ -537,7 +537,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onmouseleave onmouseleave}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onmouseleave">onmouseleave</a>
 	 * attribute.
 	 *
 	 * @param onmouseleave The new value for this attribute.
@@ -550,7 +550,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onmousemove onmousemove}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onmousemove">onmousemove</a>
 	 * attribute.
 	 *
 	 * @param onmousemove The new value for this attribute.
@@ -563,7 +563,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onmouseout onmouseout} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onmouseout">onmouseout</a> attribute.
 	 *
 	 * @param onmouseout The new value for this attribute.
 	 * @return This object.
@@ -575,7 +575,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onmouseover onmouseover}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onmouseover">onmouseover</a>
 	 * attribute.
 	 *
 	 * @param onmouseover The new value for this attribute.
@@ -588,7 +588,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onmouseup onmouseup} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onmouseup">onmouseup</a> attribute.
 	 *
 	 * @param onmouseup The new value for this attribute.
 	 * @return This object.
@@ -600,7 +600,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onmousewheel onmousewheel}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onmousewheel">onmousewheel</a>
 	 * attribute.
 	 *
 	 * @param onmousewheel The new value for this attribute.
@@ -613,7 +613,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onpause onpause} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onpause">onpause</a> attribute.
 	 *
 	 * @param onpause The new value for this attribute.
 	 * @return This object.
@@ -625,7 +625,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onplay onplay} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onplay">onplay</a> attribute.
 	 *
 	 * @param onplay The new value for this attribute.
 	 * @return This object.
@@ -637,7 +637,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onplaying onplaying} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onplaying">onplaying</a> attribute.
 	 *
 	 * @param onplaying The new value for this attribute.
 	 * @return This object.
@@ -649,7 +649,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onprogress onprogress} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onprogress">onprogress</a> attribute.
 	 *
 	 * @param onprogress The new value for this attribute.
 	 * @return This object.
@@ -661,7 +661,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onratechange onratechange}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onratechange">onratechange</a>
 	 * attribute.
 	 *
 	 * @param onratechange The new value for this attribute.
@@ -674,7 +674,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onreset onreset} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onreset">onreset</a> attribute.
 	 *
 	 * @param onreset The new value for this attribute.
 	 * @return This object.
@@ -686,7 +686,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onresize onresize} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onresize">onresize</a> attribute.
 	 *
 	 * @param onresize The new value for this attribute.
 	 * @return This object.
@@ -698,7 +698,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onscroll onscroll} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onscroll">onscroll</a> attribute.
 	 *
 	 * @param onscroll The new value for this attribute.
 	 * @return This object.
@@ -710,7 +710,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onseeked onseeked} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onseeked">onseeked</a> attribute.
 	 *
 	 * @param onseeked The new value for this attribute.
 	 * @return This object.
@@ -722,7 +722,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onseeking onseeking} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onseeking">onseeking</a> attribute.
 	 *
 	 * @param onseeking The new value for this attribute.
 	 * @return This object.
@@ -734,7 +734,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onselect onselect} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onselect">onselect</a> attribute.
 	 *
 	 * @param onselect The new value for this attribute.
 	 * @return This object.
@@ -746,7 +746,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onshow onshow} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onshow">onshow</a> attribute.
 	 *
 	 * @param onshow The new value for this attribute.
 	 * @return This object.
@@ -758,7 +758,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onstalled onstalled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onstalled">onstalled</a> attribute.
 	 *
 	 * @param onstalled The new value for this attribute.
 	 * @return This object.
@@ -770,7 +770,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onsubmit onsubmit} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onsubmit">onsubmit</a> attribute.
 	 *
 	 * @param onsubmit The new value for this attribute.
 	 * @return This object.
@@ -782,7 +782,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onsuspend onsuspend} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onsuspend">onsuspend</a> attribute.
 	 *
 	 * @param onsuspend The new value for this attribute.
 	 * @return This object.
@@ -794,7 +794,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-ontimeupdate ontimeupdate}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-ontimeupdate">ontimeupdate</a>
 	 * attribute.
 	 *
 	 * @param ontimeupdate The new value for this attribute.
@@ -807,7 +807,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-ontoggle ontoggle} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-ontoggle">ontoggle</a> attribute.
 	 *
 	 * @param ontoggle The new value for this attribute.
 	 * @return This object.
@@ -819,7 +819,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onvolumechange onvolumechange}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onvolumechange">onvolumechange</a>
 	 * attribute.
 	 *
 	 * @param onvolumechange The new value for this attribute.
@@ -832,7 +832,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.webappapis#handler-onwaiting onwaiting} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/webappapis.html#handler-onwaiting">onwaiting</a> attribute.
 	 *
 	 * @param onwaiting The new value for this attribute.
 	 * @return This object.
@@ -844,7 +844,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.editing#attr-spellcheck spellcheck} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#attr-spellcheck">spellcheck</a> attribute.
 	 *
 	 * @param spellcheck
 	 * 	The new value for this attribute.
@@ -858,7 +858,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.dom#the-style-attribute style} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/dom.html#the-style-attribute">style</a> attribute.
 	 *
 	 * @param style The new value for this attribute.
 	 * @return This object.
@@ -870,7 +870,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.editing#attr-tabindex tabindex} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/editing.html#attr-tabindex">tabindex</a> attribute.
 	 *
 	 * @param tabindex
 	 * 	The new value for this attribute.
@@ -884,7 +884,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.dom#attr-title title} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/dom.html#attr-title">title</a> attribute.
 	 *
 	 * @param title The new value for this attribute.
 	 * @return This object.
@@ -896,7 +896,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc ext.HTML5.dom#attr-translate translate} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/dom.html#attr-translate">translate</a> attribute.
 	 *
 	 * @param translate
 	 * 	The new value for this attribute.
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 ee27be56c..c5af01010 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
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
  * A subclass of HTML elements that contain only other elements, not text.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @FluentSetters
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 3bd43b394..f8dc64bca 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
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
  * A subclass of HTML elements that contain mixed content (elements and text).
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @FluentSetters
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 1a8ddb8d8..8be78aaf5 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
@@ -21,7 +21,7 @@ import org.apache.juneau.xml.annotation.*;
  * only.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @FluentSetters
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 bdecfceff..e0c677bb9 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
@@ -20,7 +20,7 @@ import org.apache.juneau.xml.annotation.*;
  * A subclass of HTML elements that contain text only.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @FluentSetters
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 4ea80a041..1b82aa20c 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
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
  * See <a href="https://www.w3.org/TR/html51/syntax.html#void-elements">void elements</a>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Xml(format=VOID)
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 1bddf972a..e801f28a5 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-i-element <i>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="i")
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 bae2793b4..68df6d835 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-iframe-element <iframe>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="iframe")
@@ -45,7 +45,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-height height}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -62,7 +62,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-iframe-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-iframe-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of nested browsing context.
@@ -76,7 +76,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-iframe-sandbox sandbox}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-iframe-sandbox">sandbox</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -91,7 +91,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-iframe-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-iframe-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -114,7 +114,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-iframe-srcdoc srcdoc}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-iframe-srcdoc">srcdoc</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -129,7 +129,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
 	 *
 	 * <p>
 	 * Horizontal dimension.
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 10231c9e0..bc5f7a254 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-img-element <img>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="img")
@@ -45,7 +45,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-img-alt alt} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-img-alt">alt</a> attribute.
 	 *
 	 * <p>
 	 * Replacement text for use when images are not available.
@@ -59,7 +59,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-img-crossorigin crossorigin}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-img-crossorigin">crossorigin</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -74,7 +74,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-height height}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -91,7 +91,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-img-ismap ismap} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-img-ismap">ismap</a> attribute.
 	 *
 	 * <p>
 	 * Whether the image is a server-side image map.
@@ -107,7 +107,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-img-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-img-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -130,7 +130,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-hyperlink-usemap usemap}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-hyperlink-usemap">usemap</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -145,7 +145,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
 	 *
 	 * <p>
 	 * Horizontal dimension.
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 11308d9ad..b4ac3717a 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
@@ -18,11 +18,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-input-element <input>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-input-element">&lt;input&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="input")
@@ -44,7 +44,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-accept accept} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-accept">accept</a> attribute.
 	 *
 	 * <p>
 	 * Hint for expected file type in file upload controls.
@@ -58,7 +58,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-alt alt} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-alt">alt</a> attribute.
 	 *
 	 * <p>
 	 * Replacement text for use when images are not available.
@@ -72,7 +72,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-autocomplete autocomplete} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autocomplete">autocomplete</a> attribute.
 	 *
 	 * <p>
 	 * Hint for form auto-fill feature.
@@ -86,7 +86,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -100,7 +100,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-checked checked} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-checked">checked</a> attribute.
 	 *
 	 * <p>
 	 * Whether the command or control is checked.
@@ -116,7 +116,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-dirname dirname} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-dirname">dirname</a> attribute.
 	 *
 	 * <p>
 	 * Name of form field to use for sending the element's directionality in form submission.
@@ -130,7 +130,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -146,7 +146,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -160,7 +160,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formaction formaction} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formaction">formaction</a> attribute.
 	 *
 	 * <p>
 	 * URL to use for form submission.
@@ -174,7 +174,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formenctype formenctype} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formenctype">formenctype</a> attribute.
 	 *
 	 * <p>
 	 * Form data set encoding type to use for form submission.
@@ -188,7 +188,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formmethod formmethod} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formmethod">formmethod</a> attribute.
 	 *
 	 * <p>
 	 * HTTP method to use for form submission.
@@ -202,7 +202,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formnovalidate formnovalidate}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formnovalidate">formnovalidate</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -217,7 +217,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fs-formtarget formtarget} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fs-formtarget">formtarget</a> attribute.
 	 *
 	 * <p>
 	 * Browsing context for form submission.
@@ -231,7 +231,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-height height}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -248,7 +248,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-input-inputmode inputmode}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-input-inputmode">inputmode</a>
 	 * attribute.
 	 * Hint for selecting an input modality.
 	 *
@@ -261,7 +261,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-list list} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-list">list</a> attribute.
 	 *
 	 * <p>
 	 * List of auto-complete options.
@@ -275,7 +275,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-max max} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-max">max</a> attribute.
 	 *
 	 * <p>
 	 * Maximum value.
@@ -291,7 +291,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-maxlength maxlength} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-maxlength">maxlength</a> attribute.
 	 * Maximum length of value.
 	 *
 	 * @param maxlength The new value for this attribute.
@@ -304,7 +304,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-min min} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-min">min</a> attribute.
 	 *
 	 * <p>
 	 * Minimum value.
@@ -320,7 +320,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-minlength minlength} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-minlength">minlength</a> attribute.
 	 *
 	 * <p>
 	 * Minimum length of value.
@@ -336,7 +336,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-multiple multiple} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-multiple">multiple</a> attribute.
 	 *
 	 * <p>
 	 * Whether to allow multiple values.
@@ -352,7 +352,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
@@ -366,7 +366,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-pattern pattern} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-pattern">pattern</a> attribute.
 	 *
 	 * <p>
 	 * Pattern to be matched by the form control's value.
@@ -380,7 +380,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-placeholder placeholder} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-placeholder">placeholder</a> attribute.
 	 *
 	 * <p>
 	 * User-visible label to be placed within the form control.
@@ -394,7 +394,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-readonly readonly} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-readonly">readonly</a> attribute.
 	 *
 	 * <p>
 	 * Whether to allow the value to be edited by the user.
@@ -411,7 +411,7 @@ public class Input extends HtmlElementVoid {
 
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-readonly readonly} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-readonly">readonly</a> attribute.
 	 *
 	 * <p>
 	 * Whether to allow the value to be edited by the user.
@@ -426,7 +426,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-readonly required} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-readonly">required</a> attribute.
 	 *
 	 * <p>
 	 * Whether the control is required for form submission.
@@ -442,7 +442,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-size size} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-size">size</a> attribute.
 	 *
 	 * <p>
 	 * Size of the control.
@@ -458,7 +458,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -474,7 +474,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-step step} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-step">step</a> attribute.
 	 *
 	 * <p>
 	 * Granularity to be matched by the form control's value.
@@ -488,7 +488,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Type of form control.
@@ -502,7 +502,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-input-value value} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-input-value">value</a> attribute.
 	 *
 	 * <p>
 	 * Value of the form control.
@@ -518,7 +518,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
 	 *
 	 * <p>
 	 * Horizontal dimension.
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 d120a8d36..6ca315d90 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.edits#the-ins-element <ins>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#the-ins-element">&lt;ins&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="ins")
@@ -42,7 +42,7 @@ public class Ins extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.edits#attr-mod-cite cite} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#attr-mod-cite">cite</a> attribute.
 	 *
 	 * <p>
 	 * Link to the source of the quotation or more information about the edit.
@@ -56,7 +56,7 @@ public class Ins extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.edits#attr-mod-datetime datetime} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/edits.html#attr-mod-datetime">datetime</a> attribute.
 	 *
 	 * <p>
 	 * Date and (optionally) time of the change.
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 6d2db8c82..5634ef2df 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-kbd-element <kbd>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="kbd")
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 22a3f6f48..81502086e 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-keygen-element <keygen>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-keygen-element">&lt;keygen&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="keygen")
@@ -33,7 +33,7 @@ public class Keygen extends HtmlElementVoid {
 	public Keygen() {}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -49,7 +49,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-keygen-challenge challenge} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-keygen-challenge">challenge</a> attribute.
 	 *
 	 * <p>
 	 * String to package with the generated and signed public key.
@@ -63,7 +63,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -79,7 +79,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -93,7 +93,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-keygen-keytype keytype} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-keygen-keytype">keytype</a> attribute.
 	 *
 	 * <p>
 	 * The type of cryptographic key to generate.
@@ -107,7 +107,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
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 8998f75b6..790d4afde 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-label-element <label>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-label-element">&lt;label&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="label")
@@ -42,7 +42,7 @@ public class Label extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-label-for for} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-label-for">for</a> attribute.
 	 *
 	 * <p>
 	 * Associate the label with form control.
@@ -56,7 +56,7 @@ public class Label extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
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 660d1e8f4..fd7be8ee1 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-legend-element <legend>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-legend-element">&lt;legend&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="legend")
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 5ad5a2eed..7f68fb3f6 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-li-element <li>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="li")
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 86703d320..0fd3c6bc7 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.document-metadata#the-link-element <link>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="link")
@@ -45,7 +45,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-link-crossorigin crossorigin}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-link-crossorigin">crossorigin</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -60,7 +60,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-link-href href} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-link-href">href</a> attribute.
 	 *
 	 * <p>
 	 * Address of the hyperlink.
@@ -83,7 +83,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-link-hreflang hreflang}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-link-hreflang">hreflang</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -98,7 +98,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-link-media media} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-link-media">media</a> attribute.
 	 *
 	 * <p>
 	 * Applicable media.
@@ -112,7 +112,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-link-rel rel} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-link-rel">rel</a> attribute.
 	 *
 	 * <p>
 	 * Relationship between the document containing the hyperlink and the destination resource.
@@ -126,7 +126,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.links#attr-link-sizes sizes} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/links.html#attr-link-sizes">sizes</a> attribute.
 	 *
 	 * <p>
 	 * Sizes of the icons (for rel="icon").
@@ -140,7 +140,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-link-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-link-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Hint for the type of the referenced resource.
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 0fffacf39..fad25deab 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-main-element <main>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="main")
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 077249dea..a68c79f2f 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-map-element <map>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="map")
@@ -42,7 +42,7 @@ public class Map extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-map-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-map-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of image map to reference from the usemap attribute.
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 ee668f974..107a8c8da 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-mark-element <mark>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="mark")
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 c001e1d0f..3c52170f0 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.document-metadata#the-meta-element <meta>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="meta")
@@ -33,7 +33,7 @@ public class Meta extends HtmlElementVoid {
 	public Meta() {}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-meta-charset charset}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-meta-charset">charset</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -48,7 +48,7 @@ public class Meta extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-meta-content content}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-meta-content">content</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -63,7 +63,7 @@ public class Meta extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-meta-http-equiv http-equiv}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-meta-http-equiv">http-equiv</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -78,7 +78,7 @@ public class Meta extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-meta-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-meta-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Metadata name.
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 47b53f936..2ca093a43 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-meter-element <meter>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-meter-element">&lt;meter&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="meter")
@@ -42,7 +42,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-meter-high high} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-high">high</a> attribute.
 	 *
 	 * <p>
 	 * Low limit of high range.
@@ -58,7 +58,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-meter-low low} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-low">low</a> attribute.
 	 *
 	 * <p>
 	 * High limit of low range.
@@ -74,7 +74,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-meter-max max} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-max">max</a> attribute.
 	 *
 	 * <p>
 	 * Upper bound of range.
@@ -90,7 +90,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-meter-min min} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-min">min</a> attribute.
 	 *
 	 * <p>
 	 * Lower bound of range.
@@ -106,7 +106,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-meter-optimum optimum} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-optimum">optimum</a> attribute.
 	 *
 	 * <p>
 	 * Optimum value in gauge.
@@ -122,7 +122,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-meter-value value} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-meter-value">value</a> attribute.
 	 *
 	 * <p>
 	 * Current value of the element.
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 6fbf034ba..fad7e1d4a 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-nav-element <nav>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-nav-element">&lt;nav&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="nav")
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 a599cefba..9d2e18c1c 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.scripting-1#the-noscript-element <noscript>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="noscript")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
index 0e1a19b72..797b33146 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-object-element <object>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="object")
@@ -42,7 +42,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-object-data data} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-object-data">data</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -56,7 +56,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -70,7 +70,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-height height}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -87,7 +87,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-object-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-object-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of nested browsing context.
@@ -101,7 +101,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-object-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-object-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Type of embedded resource.
@@ -115,7 +115,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-object-typemustmatch typemustmatch}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-object-typemustmatch">typemustmatch</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -132,7 +132,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-hyperlink-usemap usemap}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-hyperlink-usemap">usemap</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -147,7 +147,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
 	 *
 	 * <p>
 	 * Horizontal dimension.
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 f1bb27927..deadbb1c7 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-ol-element <ol>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="ol")
@@ -42,7 +42,7 @@ public class Ol extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.grouping-content#attr-ol-reversed reversed}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#attr-ol-reversed">reversed</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -59,7 +59,7 @@ public class Ol extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.grouping-content#attr-ol-start start} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#attr-ol-start">start</a> attribute.
 	 *
 	 * <p>
 	 * Ordinal value of the first item.
@@ -75,7 +75,7 @@ public class Ol extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.grouping-content#attr-ol-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/grouping-content.html#attr-ol-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Kind of list marker.
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 107ebed8b..55047376d 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-optgroup-element <optgroup>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-optgroup-element">&lt;optgroup&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="optgroup")
@@ -42,7 +42,7 @@ public class Optgroup extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-optgroup-disabled disabled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-optgroup-disabled">disabled</a> attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -58,7 +58,7 @@ public class Optgroup extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-optgroup-label label} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-optgroup-label">label</a> attribute.
 	 *
 	 * <p>
 	 * User-visible label.
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 e3aeba122..78edc0b6a 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-option-element <option>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-option-element">&lt;option&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="option")
@@ -53,7 +53,7 @@ public class Option extends HtmlElementText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-option-disabled disabled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-option-disabled">disabled</a> attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -69,7 +69,7 @@ public class Option extends HtmlElementText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-option-label label} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-option-label">label</a> attribute.
 	 *
 	 * <p>
 	 * User-visible label.
@@ -83,7 +83,7 @@ public class Option extends HtmlElementText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-option-selected selected} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-option-selected">selected</a> attribute.
 	 *
 	 * <p>
 	 * Whether the option is selected by default.
@@ -99,7 +99,7 @@ public class Option extends HtmlElementText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-option-value value} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-option-value">value</a> attribute.
 	 *
 	 * <p>
 	 * Value to be used for form submission.
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 4e651cbae..7da092b55 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-output-element <output>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-output-element">&lt;output&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="output")
@@ -42,7 +42,7 @@ public class Output extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-output-for for} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-output-for">for</a> attribute.
 	 *
 	 * <p>
 	 * Specifies controls from which the output was calculated.
@@ -56,7 +56,7 @@ public class Output extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -70,7 +70,7 @@ public class Output extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
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 d1e74b8be..baf57970e 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-p-element <p>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="p")
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 3d2f682a4..d1da5a1c9 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-param-element <param>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="param")
@@ -44,7 +44,7 @@ public class Param extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-param-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-param-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of parameter.
@@ -58,7 +58,7 @@ public class Param extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-param-value value}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-param-value">value</a>
 	 * attribute.
 	 *
 	 * <p>
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 168a32d98..2c69d61f7 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
@@ -21,11 +21,11 @@ import org.apache.juneau.internal.*;
 import org.apache.juneau.xml.annotation.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-pre-element <pre>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="pre")
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 8f9590057..88b5778a8 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-progress-element <progress>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-progress-element">&lt;progress&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="progress")
@@ -42,7 +42,7 @@ public class Progress extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-progress-max max} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-progress-max">max</a> attribute.
 	 *
 	 * <p>
 	 * Upper bound of range.
@@ -58,7 +58,7 @@ public class Progress extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-progress-value value} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-progress-value">value</a> attribute.
 	 *
 	 * <p>
 	 * Current value of the element.
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 f0db14d79..d1dd43b2a 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-q-element <q>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="q")
@@ -42,7 +42,7 @@ public class Q extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.text-level-semantics#attr-q-cite cite} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#attr-q-cite">cite</a> attribute.
 	 *
 	 * <p>
 	 * Link to the source of the quotation or more information about the edit.
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 f95dd5cb2..70e6a2619 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-rb-element <rb>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="rb")
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 24cd7be3e..11d16c9b8 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-rp-element <rp>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="rp")
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 32bbb85d3..827c958c1 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-rt-element <rt>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="rt")
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 0a8cd9046..141cfc866 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-rtc-element <rtc>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="rtc")
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 a4dbac2b2..dc13b0cc8 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-ruby-element <ruby>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="ruby")
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 04b7a4dab..026344f03 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-s-element <s>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="s")
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 bce8c30fb..21fcb886a 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-samp-element <samp>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="samp")
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 a44060ff2..4f5516fc2 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
@@ -21,11 +21,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.scripting-1#the-script-element <script>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="script")
@@ -49,7 +49,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.scripting-1#attr-script-async async} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-async">async</a> attribute.
 	 *
 	 * <p>
 	 * Execute script asynchronously.
@@ -65,7 +65,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.scripting-1#attr-script-charset charset} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-charset">charset</a> attribute.
 	 *
 	 * <p>
 	 * Character encoding of the external script resource.
@@ -79,7 +79,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.scripting-1#attr-script-crossorigin crossorigin}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-crossorigin">crossorigin</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -94,7 +94,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.scripting-1#attr-script-defer defer} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-defer">defer</a> attribute.
 	 *
 	 * <p>
 	 * Defer script execution.
@@ -110,7 +110,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.scripting-1#attr-script-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -133,7 +133,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.scripting-1#attr-script-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/scripting-1.html#attr-script-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Type of embedded resource.
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 d05eee8aa..093a67c75 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.sections#the-section-element <section>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/sections.html#the-section-element">&lt;section&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="section")
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 497db97a2..0f60d9d37 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,11 +18,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-select-element <select>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-select-element">&lt;select&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="select")
@@ -45,7 +45,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -61,7 +61,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -77,7 +77,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -91,7 +91,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-select-multiple multiple} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-select-multiple">multiple</a> attribute.
 	 *
 	 * <p>
 	 * Whether to allow multiple values.
@@ -107,7 +107,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
@@ -121,7 +121,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-select-required required} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-select-required">required</a> attribute.
 	 *
 	 * <p>
 	 * Whether the control is required for form submission.
@@ -137,7 +137,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-select-size size} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-select-size">size</a> attribute.
 	 *
 	 * <p>
 	 * Size of the control.
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 bafc6e7b8..2312e2f69 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-small-element <small>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="small")
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 a77ad12bd..37e59ac4b 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-source-element <source>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="source")
@@ -47,7 +47,7 @@ public class Source extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-source-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-source-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -70,7 +70,7 @@ public class Source extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-source-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-source-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Type of embedded resource.
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 1a5305015..46f927683 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-span-element <span>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="span")
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 cc2c4d62e..d7875e565 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-strong-element <strong>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="strong")
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 890b1bbcb..b2e0d71bd 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,11 +18,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.document-metadata#the-style-element <style>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="style")
@@ -55,7 +55,7 @@ public class Style extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-style-media media} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-style-media">media</a> attribute.
 	 *
 	 * <p>
 	 * Applicable media.
@@ -69,7 +69,7 @@ public class Style extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.document-metadata#attr-style-type type} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/document-metadata.html#attr-style-type">type</a> attribute.
 	 *
 	 * <p>
 	 * Type of embedded resource.
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 1e4a315b0..669ff2f17 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-sub-and-sup-elements <sub>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="sub")
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 76a769cb9..911d455b6 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-sub-and-sup-elements <sup>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="sup")
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 803e6d858..d420687e3 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-table-element <table>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="table")
@@ -42,7 +42,7 @@ public class Table extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-table-border border} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-table-border">border</a> attribute.
 	 *
 	 * @param border
 	 * 	The new value for this attribute.
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 f768dd82d..ff393cd25 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-tbody-element <tbody>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="tbody")
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 e98a4967c..db4995926 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-td-element <td>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="td")
@@ -42,7 +42,7 @@ public class Td extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-tdth-colspan colspan} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-colspan">colspan</a> attribute.
 	 *
 	 * <p>
 	 * Number of columns that the cell is to span.
@@ -58,7 +58,7 @@ public class Td extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-tdth-headers headers} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-headers">headers</a> attribute.
 	 *
 	 * <p>
 	 * The header cells for this cell.
@@ -72,7 +72,7 @@ public class Td extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-tdth-rowspan rowspan} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-rowspan">rowspan</a> attribute.
 	 *
 	 * <p>
 	 * Number of rows that the cell is to span.
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 f73c56586..f9423431b 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.scripting-1#the-template-element <template>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="template")
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 7035666bc..68b39f3d5 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.forms#the-textarea-element <textarea>}
+ * DTO for an HTML <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#the-textarea-element">&lt;textarea&gt;</a>
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="textarea")
@@ -44,7 +44,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-autocomplete autocomplete} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autocomplete">autocomplete</a> attribute.
 	 *
 	 * <p>
 	 * Hint for form auto-fill feature.
@@ -58,7 +58,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-autofocus">autofocus</a> attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -74,7 +74,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-textarea-cols cols} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-cols">cols</a> attribute.
 	 *
 	 * <p>
 	 * Maximum number of characters per line.
@@ -90,7 +90,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-dirname dirname} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-dirname">dirname</a> attribute.
 	 *
 	 * <p>
 	 * Name of form field to use for sending the element's directionality in form submission.
@@ -104,7 +104,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-disabled">disabled</a> attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -120,7 +120,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fae-form form} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fae-form">form</a> attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -134,7 +134,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#inputmode inputmode} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#inputmode">inputmode</a> attribute.
 	 *
 	 * <p>
 	 * Hint for selecting an input modality.
@@ -148,7 +148,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-textarea-maxlength maxlength} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-maxlength">maxlength</a> attribute.
 	 *
 	 * <p>
 	 * Maximum length of value.
@@ -164,7 +164,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-textarea-minlength minlength} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-minlength">minlength</a> attribute.
 	 *
 	 * <p>
 	 * Minimum length of value.
@@ -180,7 +180,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-fe-name name} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-fe-name">name</a> attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
@@ -194,7 +194,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-textarea-placeholder placeholder}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-placeholder">placeholder</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -209,7 +209,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-textarea-readonly readonly} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-readonly">readonly</a> attribute.
 	 *
 	 * <p>
 	 * Whether to allow the value to be edited by the user.
@@ -225,7 +225,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-textarea-required required} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-required">required</a> attribute.
 	 *
 	 * <p>
 	 * Whether the control is required for form submission.
@@ -241,7 +241,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-textarea-rows rows} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-rows">rows</a> attribute.
 	 *
 	 * <p>
 	 * Number of lines to show.
@@ -257,7 +257,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc ext.HTML5.forms#attr-textarea-wrap wrap} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/forms.html#attr-textarea-wrap">wrap</a> attribute.
 	 *
 	 * <p>
 	 * How the value of the form control is to be wrapped for form submission.
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 e0748e7b9..909c6c81a 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-tfoot-element <tfoot>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="tfoot")
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 3a4c2512b..92266f66d 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-th-element <th>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="th")
@@ -42,7 +42,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-th-abbr abbr} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-th-abbr">abbr</a> attribute.
 	 *
 	 * <p>
 	 * Alternative label to use for the header cell when referencing the cell in other contexts.
@@ -56,7 +56,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-tdth-colspan colspan} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-colspan">colspan</a> attribute.
 	 *
 	 * <p>
 	 * Number of columns that the cell is to span.
@@ -72,7 +72,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-tdth-headers headers} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-headers">headers</a> attribute.
 	 *
 	 * <p>
 	 * The headers for this cell.
@@ -86,7 +86,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-tdth-rowspan rowspan} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-tdth-rowspan">rowspan</a> attribute.
 	 *
 	 * <p>
 	 * Number of rows that the cell is to span.
@@ -102,7 +102,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-th-scope scope} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-th-scope">scope</a> attribute.
 	 *
 	 * <p>
 	 * Specifies which cells the header cell applies to.
@@ -116,7 +116,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.tabular-data#attr-th-sorted sorted}  attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/tabular-data.html#attr-th-sorted">sorted</a> attribute.
 	 *
 	 * <p>
 	 * Column sort direction and ordinality.
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 25c5d370e..f5dffb5d2 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-thead-element <thead>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="thead")
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 8821c5c3b..c8aeeb879 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-time-element <time>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="time")
@@ -42,7 +42,7 @@ public class Time extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc ext.HTML5.text-level-semantics#attr-time-datetime datetime}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/text-level-semantics.html#attr-time-datetime">datetime</a>
 	 * attribute.
 	 *
 	 * <p>
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 bce83f147..5f6f22ee2 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.document-metadata#the-title-element <title>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="title")
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 29220c45f..32ed5237e 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.tabular-data#the-tr-element <tr>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="tr")
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 2da7d01e8..adca0bda9 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-track-element <track>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="track")
@@ -47,7 +47,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-track-default default}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-track-default">default</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -62,7 +62,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-track-kind kind} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-track-kind">kind</a> attribute.
 	 *
 	 * <p>
 	 * The type of text track.
@@ -76,7 +76,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-track-label label} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-track-label">label</a> attribute.
 	 *
 	 * <p>
 	 * User-visible label.
@@ -90,7 +90,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-track-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-track-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -113,7 +113,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-track-srclang srclang}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-track-srclang">srclang</a>
 	 * attribute.
 	 *
 	 * <p>
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 0283baf9f..fae2c0dbf 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-u-element <u>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="u")
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 ef7e5d02f..ae389767d 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.grouping-content#the-ul-element <ul>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="ul")
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 7099acd47..b53404ae3 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-var-element <var>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="var")
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 3a7f80927..94bf9ed8c 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
@@ -19,11 +19,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.embedded-content-0#the-video-element <video>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="video")
@@ -45,7 +45,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-autoplay autoplay}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-autoplay">autoplay</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -62,7 +62,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-controls controls}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-controls">controls</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -79,7 +79,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-crossorigin crossorigin}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-crossorigin">crossorigin</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -94,7 +94,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-height height}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-height">height</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -111,7 +111,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-loop loop} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-loop">loop</a> attribute.
 	 *
 	 * <p>
 	 * Whether to loop the media resource.
@@ -127,7 +127,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-mediagroup mediagroup}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-mediagroup">mediagroup</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -142,7 +142,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-muted muted}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-muted">muted</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -159,7 +159,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-video-poster poster}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-video-poster">poster</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -174,7 +174,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-preload preload}
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-preload">preload</a>
 	 * attribute.
 	 *
 	 * <p>
@@ -189,7 +189,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-media-src src} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-media-src">src</a> attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -212,7 +212,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc ext.HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * <a class="doclink" href="https://www.w3.org/TR/html5/embedded-content-0.html#attr-dim-width">width</a> attribute.
 	 *
 	 * <p>
 	 * Horizontal dimension.
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 76f93230a..6829a8756 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc ext.HTML5.text-level-semantics#the-wbr-element <wbr>}
+ * 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.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Html5}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Html5">Overview &gt; juneau-dto &gt; HTML5</a>
  * </ul>
  */
 @Bean(typeName="wbr")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html
index 2c80830e6..79863fc2c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/package.html
@@ -30,16 +30,6 @@
 </head>
 <body>
 <p>HTML5 Data Transfer Objects</p>
-<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-<ol class='toc'>
-	<li><p>{@doc package-summary.html#Overview Overview}</p>
-	<ol>
-		<li><p>{@doc package-summary.html#Serialize Generating HTML5}</p>
-		<li><p>{@doc package-summary.html#Parse Parsing HTML5}</p>
-		<li><p>{@doc package-summary.html#Templates HTML5 Templates}</p>
-	</ol>
-</ol>
-
 
 <!-- ======================================================================================================== -->
 <a id="Overview"></a>
@@ -312,10 +302,6 @@
 		}
 	}
 		</p>
-		<p>
-			Refer to {@doc jm.AutoSwaps} 
-			for information about defining swap methods on classes.
-		</p>
 	</div>
 
 </div>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
index 8f66fab85..b464b7ca2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
@@ -30,7 +30,7 @@ import org.apache.juneau.swap.*;
  * Represents a top-level schema object bean in the JSON-Schema core specification.
  *
  * <ul class='seealso'>
- * 	<li class='jp'>{@doc package-summary.html#TOC org.apache.juneau.dto.jsonschema}
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
  * </ul>
  */
 @Bean(typeName="schema",
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
index 70b63a7f9..10c131af5 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
@@ -18,7 +18,7 @@ import java.util.*;
  * Represents a list of {@link JsonSchema} objects.
  *
  * <ul class='seealso'>
- * 	<li class='jp'>{@doc package-summary.html#TOC org.apache.juneau.dto.jsonschema}
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
  * </ul>
  *
  * @serial exclude
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
index 88ed89e8f..ce5426e98 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
@@ -35,7 +35,7 @@ import org.apache.juneau.json.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='jp'>{@doc package-summary.html#TOC org.apache.juneau.dto.jsonschema}
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
  * </ul>
  *
  * @serial exclude
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaProperty.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaProperty.java
index 8e62b6f60..94cc20b9c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaProperty.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaProperty.java
@@ -16,7 +16,7 @@ package org.apache.juneau.dto.jsonschema;
  * Represents a JSON property in the JSON-Schema core specification.
  *
  * <ul class='seealso'>
- * 	<li class='jp'>{@doc package-summary.html#TOC org.apache.juneau.dto.jsonschema}
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
  * </ul>
  */
 public class JsonSchemaProperty extends JsonSchema {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
index 040710ec0..9b321ece2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
@@ -27,7 +27,7 @@ package org.apache.juneau.dto.jsonschema;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='jp'>{@doc package-summary.html#TOC org.apache.juneau.dto.jsonschema}
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
  * </ul>
  */
 public class JsonSchemaPropertySimpleArray extends JsonSchemaProperty {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
index a3a18cdac..12a4e7b13 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
@@ -27,7 +27,7 @@ import org.apache.juneau.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='jp'>{@doc package-summary.html#TOC org.apache.juneau.dto.jsonschema}
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
  * </ul>
  */
 public class JsonSchemaRef extends JsonSchema {
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 7b16d17fc..4b996fe97 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
@@ -27,7 +27,7 @@ package org.apache.juneau.dto.jsonschema;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='jp'>{@doc package-summary.html#TOC org.apache.juneau.dto.jsonschema}
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
  * </ul>
  */
 public enum JsonType {
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 ee150145c..7d28d765d 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
@@ -18,7 +18,7 @@ import java.util.*;
  * Represents a list of {@link JsonType} objects.
  *
  * <ul class='seealso'>
- * 	<li class='jp'>{@doc package-summary.html#TOC org.apache.juneau.dto.jsonschema}
+ * 	<li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
  * </ul>
  *
  * @serial exclude
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 2e79af7ca..292046ea4 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
@@ -30,18 +30,7 @@
 </head>
 <body>
 <p>JSON-Schema Data Transfer Objects</p>
-<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
-<ol class='toc'>
-	<li><p>{@doc package-summary.html#Overview Overview}</p>
-	<ol>
-		<li><p>{@doc package-summary.html#SchemaDefinition JSON-Schema schema definition}</p>
-		<li><p>{@doc package-summary.html#Serialize Creating JSON-Schema documents}</p>
-		<ol>
-			<li><p>{@doc package-summary.html#SerializeToOther Serializing to other data types}</p>
-		</ol>
-		<li><p>{@doc package-summary.html#Parse Parsing JSON-Schema documents}</p>
-	</ol>
-</ol>
+
 <!-- ======================================================================================================== -->
 <a id="Overview"></a>
 <h2 class='topic'>1 - Overview</h2>
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 2db8e249e..d19c9d259 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
@@ -46,7 +46,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="name,url,email,*")
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 1775e2f23..0190917c6 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
@@ -46,7 +46,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="description,url,*")
@@ -106,7 +106,7 @@ public class ExternalDocumentation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc ext.GFM} can be used for rich text representation.
+	 * 	<br><a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
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 1e12af8f2..7dd37f25f 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
@@ -45,7 +45,7 @@ import org.apache.juneau.marshaller.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="description,type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,$ref,example,*")
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 8153f8011..390855ad7 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
@@ -67,7 +67,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="siteName,title,description,version,contact,license,termsOfService,*")
@@ -166,7 +166,7 @@ public class Info extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc ext.GFM} can be used for rich text representation.
+	 * 	<br><a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
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 7a87c254b..a12c3d374 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
@@ -49,7 +49,7 @@ import org.apache.juneau.marshaller.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,$ref,*")
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 9f227fab2..dcb095112 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
@@ -46,7 +46,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="name,url,*")
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 c80c2830f..aaf91239f 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
@@ -124,7 +124,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="operationId,summary,description,tags,externalDocs,consumes,produces,parameters,responses,schemes,deprecated,security,*")
@@ -229,7 +229,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Values MUST be as described under {@doc ext.SwaggerMimeTypes}.
+	 * 	<br>Values MUST be as described under <a class="doclink" href="https://swagger.io/specification#mimeTypes">Swagger Mime Types</a>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -246,7 +246,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Values MUST be as described under {@doc ext.SwaggerMimeTypes}.
+	 * 	<br>Values MUST be as described under <a class="doclink" href="https://swagger.io/specification#mimeTypes">Swagger Mime Types</a>.
 	 * @return This object.
 	 */
 	public Operation setConsumes(MediaType...value) {
@@ -326,7 +326,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc ext.GFM} can be used for rich text representation.
+	 * 	<br><a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -402,15 +402,15 @@ public class Operation extends SwaggerElement {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		If a parameter is already defined at the {@doc ext.SwaggerPathItemObject Path Item},
+	 * 		If a parameter is already defined at the <a class="doclink" href="https://swagger.io/specification#pathItemObject">Path Item</a>,
 	 * 		the new definition will override it, but can never remove it.
 	 * 	<li class='note'>
 	 * 		The list MUST NOT include duplicated parameters.
 	 * 	<li class='note'>
 	 * 		A unique parameter is defined by a combination of a <c>name</c> and <c>location</c>.
 	 * 	<li class='note'>
-	 * 		The list can use the {@doc ext.SwaggerReferenceObject}
-	 * 		to link to parameters that are defined at the {@doc ext.SwaggerParameterObject Swagger Object's parameters}.
+	 * 		The list can use the <a class="doclink" href="https://swagger.io/specification#referenceObject">Swagger Reference Object</a>
+	 * 		to link to parameters that are defined at the <a class='doclink' href='https://swagger.io/specification/v2#parameterObject'>Swagger Object's parameters</a>.
 	 * 	<li class='note'>
 	 * 		There can be one <js>"body"</js> parameter at most.
 	 * </ul>
@@ -506,7 +506,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Value MUST be as described under {@doc ext.SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under <a class="doclink" href="https://swagger.io/specification#mimeTypes">Swagger Mime Types</a>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -523,7 +523,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Value MUST be as described under {@doc ext.SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under <a class="doclink" href="https://swagger.io/specification#mimeTypes">Swagger Mime Types</a>.
 	 * @return This object.
 	 */
 	public Operation setProduces(MediaType...value) {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
index e8bd3c111..8a1a1d7f8 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
@@ -36,7 +36,7 @@ import org.apache.juneau.internal.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  *
  * @serial exclude
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 33c60df73..ec72a4893 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
@@ -87,7 +87,7 @@ import org.apache.juneau.marshaller.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="in,name,type,description,required,schema,format,allowEmptyValue,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,*")
@@ -381,7 +381,7 @@ public class ParameterInfo extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc ext.GFM} can be used for rich text representation.
+	 * 	<br><a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -730,7 +730,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * 		Parameter names are case sensitive.
 	 * 	<li class='note'>
 	 * 		If <c>in</c> is <js>"path"</js>, the <c>name</c> field MUST correspond to the associated path segment
-	 * 		from the <c>path</c> field in the {@doc ext.SwaggerPathsObject Paths Object}.
+	 * 		from the <c>path</c> field in the <a class="doclink" href="https://swagger.io/specification/v2#pathsObject">Paths Object</a>.
 	 * 	<li class='note'>
 	 * 		For all other cases, the name corresponds to the parameter name used based on the <c>in</c> property.
 	 * </ul>
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 96eb55cfd..75419ed7c 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
@@ -57,7 +57,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="description,schema,headers,examples,*")
@@ -151,7 +151,7 @@ public class ResponseInfo extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc ext.GFM} can be used for rich text representation.
+	 * 	<br><a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used for rich text representation.
 	 * 	<br>Property value is required.
 	 * @return This object.
 	 */
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 64812cba2..e75b04578 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
@@ -55,7 +55,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="format,title,description,default,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,maxProperties,minProperties,required,requiredProperties,enum,type,items,allOf,properties,additionalProperties,discriminator,readOnly,xml,externalDocs,example,$ref,*")
@@ -279,7 +279,7 @@ public class SchemaInfo extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc ext.GFM} can be used for rich text representation.
+	 * 	<br><a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
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 af95cbaf0..d9460b292 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
@@ -57,7 +57,7 @@ import org.apache.juneau.marshaller.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="type,description,name,in,flow,authorizationUrl,tokenUrl,scopes,*")
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 cd87bda98..a2627890d 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
@@ -29,7 +29,7 @@ import org.apache.juneau.objecttools.*;
  * This is the root document object for the API specification.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="swagger,info,tags,externalDocs,basePath,schemes,consumes,produces,paths,definitions,parameters,responses,securityDefinitions,security,*")
@@ -180,7 +180,7 @@ public class Swagger extends SwaggerElement {
 	 * 	The new value for this property.
 	 * 	<br>If it is not included, the API is served directly under the <c>host</c>.
 	 * 	<br>The value MUST start with a leading slash (/).
-	 * 	<br>The <c>basePath</c> does not support {@doc ext.SwaggerPathTemplating path templating}.
+	 * 	<br>The <c>basePath</c> does not support <a class="doclink" href="https://swagger.io/specification/v2#pathTemplating">path templating</a>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -209,7 +209,7 @@ public class Swagger extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Value MUST be as described under {@doc ext.SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under <a class="doclink" href="https://swagger.io/specification#mimeTypes">Swagger Mime Types</a>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -226,7 +226,7 @@ public class Swagger extends SwaggerElement {
 	 *
 	 * @param values
 	 * 	The values to add to this property.
-	 * 	<br>Values MUST be as described under {@doc ext.SwaggerMimeTypes}.
+	 * 	<br>Values MUST be as described under <a class="doclink" href="https://swagger.io/specification#mimeTypes">Swagger Mime Types</a>.
 	 * 	<br>Ignored if <jk>null</jk>.
 	 * @return This object.
 	 */
@@ -344,7 +344,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<br>This MUST be the host only and does not include the scheme nor sub-paths.
 	 * 	<br>It MAY include a port.
 	 * 	<br>If the host is not included, the host serving the documentation is to be used (including the port).
-	 * 	<br>The host does not support {@doc ext.SwaggerPathTemplating path templating}
+	 * 	<br>The host does not support <a class="doclink" href="https://swagger.io/specification/v2#pathTemplating">path templating</a>
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -495,7 +495,7 @@ public class Swagger extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Value MUST be as described under {@doc ext.SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under <a class="doclink" href="https://swagger.io/specification#mimeTypes">Swagger Mime Types</a>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -512,7 +512,7 @@ public class Swagger extends SwaggerElement {
 	 *
 	 * @param values
 	 * 	The values to add to this property.
-	 * 	<br>Value MUST be as described under {@doc ext.SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under <a class="doclink" href="https://swagger.io/specification#mimeTypes">Swagger Mime Types</a>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
@@ -791,7 +791,7 @@ public class Swagger extends SwaggerElement {
 	 * @param value
 	 * 	The new value for this property.
 	 * 	<br>The order of the tags can be used to reflect on their order by the parsing tools.
-	 * 	<br>Not all tags that are used by the {@doc ext.SwaggerOperationObject Operation Object} must be declared.
+	 * 	<br>Not all tags that are used by the <a class="doclink" href="https://swagger.io/specification/v2#operationObject">Operation Object</a> must be declared.
 	 * 	<br>The tags that are not declared may be organized randomly or based on the tools' logic.
 	 * 	<br>Each tag name in the list MUST be unique.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
@@ -811,7 +811,7 @@ public class Swagger extends SwaggerElement {
 	 * @param values
 	 * 	The values to add to this property.
 	 * 	<br>The order of the tags can be used to reflect on their order by the parsing tools.
-	 * 	<br>Not all tags that are used by the {@doc ext.SwaggerOperationObject Operation Object} must be declared.
+	 * 	<br>Not all tags that are used by the <a class="doclink" href="https://swagger.io/specification/v2#operationObject">Operation Object</a> must be declared.
 	 * 	<br>The tags that are not declared may be organized randomly or based on the tools' logic.
 	 * 	<br>Each tag name in the list MUST be unique.
 	 * 	<br>Ignored if <jk>null</jk>.
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 12c4550c4..d84e1525d 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
@@ -21,7 +21,7 @@ import org.apache.juneau.internal.*;
  * Various useful static methods for creating Swagger elements.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 public class SwaggerBuilder {
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 a018d2191..b54a0cd48 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
@@ -26,7 +26,7 @@ import org.apache.juneau.json.*;
  * Root class for all Swagger beans.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @FluentSetters
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 f6cfa75ed..729ddad68 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
@@ -22,7 +22,7 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * Allows adding meta data to a single tag that is used by the {@doc ext.SwaggerOperationObject Operation Object}.
+ * Allows adding meta data to a single tag that is used by the <a class="doclink" href="https://swagger.io/specification/v2#operationObject">Operation Object</a>.
  *
  * <p>
  * It is not mandatory to have a Tag Object per tag used there.
@@ -49,7 +49,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="name,description,externalDocs,*")
@@ -112,7 +112,7 @@ public class Tag extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc ext.GFM} can be used for rich text representation.
+	 * 	<br><a class="doclink" href="https://help.github.com/articles/github-flavored-markdown">GFM syntax</a> can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object.
 	 */
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 c7261a4ae..88417383a 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
@@ -50,7 +50,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.Swagger}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.jrs.Swagger">Overview &gt; juneau-rest-server &gt; Swagger</a>
  * </ul>
  */
 @Bean(properties="name,namespace,prefix,attribute,wrapped,*")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
index 5ea45a412..f76ed69bc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
@@ -31,7 +31,7 @@ import org.apache.juneau.swap.*;
  * Generates a Swagger-UI interface from a Swagger document.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jd.SwaggerUi}
+ * 	<li class='link'><a class="doclink" href="../../../../../../overview-summary.html#juneau-dto.jd.SwaggerUi">Overview &gt; juneau-dto &gt; Swagger UI</a>
  * </ul>
  */
 public class SwaggerUI extends ObjectSwap<Swagger,Div> {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
index 710bea0da..4459f8689 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/Constants.java
@@ -16,7 +16,7 @@ package org.apache.juneau.jena;
  * Constants used by the {@link RdfSerializer} and {@link RdfParser} classes.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public final class Constants {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
index 9852f75ba..4565d9221 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Parser.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class N3Parser extends RdfParser {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
index 7b220dced..5e7cd940c 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/N3Serializer.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class N3Serializer extends RdfSerializer {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
index 785c584b5..bee357b01 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleParser.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class NTripleParser extends RdfParser {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
index ac37e00f6..31dc35c06 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/NTripleSerializer.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class NTripleSerializer extends RdfSerializer {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanMeta.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanMeta.java
index 562829d41..0001cc51d 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanMeta.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.jena.annotation.*;
  * class.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfBeanMeta extends ExtendedBeanMeta {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java
index 4b31a3c9d..a44984e36 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfBeanPropertyMeta.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.*;
  * on the bean property.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfBeanPropertyMeta extends ExtendedBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
index ffb475e96..75e26b443 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.*;
  * class.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfClassMeta extends ExtendedClassMeta {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java
index 3e4c6c314..d8c3ab5e9 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCollectionFormat.java
@@ -19,7 +19,7 @@ import org.apache.juneau.jena.annotation.*;
  * classes, beans, and bean properties are serialized, particularly collections.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public enum RdfCollectionFormat {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfMetaProvider.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfMetaProvider.java
index 1999328cf..29e56ffbc 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfMetaProvider.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfMetaProvider.java
@@ -19,7 +19,7 @@ import org.apache.juneau.xml.*;
  * Interface for providing access to {@link RdfClassMeta}, {@link RdfBeanMeta}, and {@link RdfBeanPropertyMeta} objects.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public interface RdfMetaProvider extends XmlMetaProvider {
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 584904ba7..bff634df1 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
@@ -50,7 +50,7 @@ import org.apache.juneau.xml.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfParser extends ReaderParser implements RdfMetaProvider {
@@ -184,8 +184,8 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 * 		in IRIs.
 		 * 	<li>
 		 * 		<js>"iri"</js> - Sets the IRI engine to IRI
-		 * 		({@doc http://www.ietf.org/rfc/rfc3986.txt RFC 3986},
-		 * 		{@doc http://www.ietf.org/rfc/rfc3987.txt RFC 3987}).
+		 * 		({doc http://www.ietf.org/rfc/rfc3986.txt RFC 3986},
+		 * 		{doc http://www.ietf.org/rfc/rfc3987.txt RFC 3987}).
 		 *
 		 * </ul>
 		 *
@@ -216,13 +216,13 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 *
 		 * <ul class='seealso'>
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
+		 * 		{doc ext.ARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
+		 * 		{doc ext.ARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
+		 * 		{doc ext.ARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
+		 * 		{doc ext.ARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
 		 * </ul>
 		 *
 		 * @param value
@@ -242,7 +242,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 *
 		 * <ul class='seealso'>
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+		 * 		{doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 		 * </ul>
 		 *
 		 * @return This object.
@@ -260,7 +260,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 *
 		 * <ul class='seealso'>
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+		 * 		{doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 		 * </ul>
 		 *
 		 * @param value
@@ -474,7 +474,7 @@ public class RdfParser extends ReaderParser implements RdfMetaProvider {
 		 *
 		 * <p>
 		 * A list of <c>Resource</c> or a <c>String</c> being a comma separated list of fragment IDs from
-		 * {@doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
+		 * {doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
 		 * rules that will not be used.
 		 *
 		 * @param value
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index e35c906da..196cb3ee7 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -41,7 +41,7 @@ import org.apache.juneau.xml.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 @SuppressWarnings({"unchecked", "rawtypes"})
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 d1ff60c35..35e0b88be 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
@@ -49,7 +49,7 @@ import org.apache.juneau.xml.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
@@ -236,8 +236,8 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 * 		in IRIs.
 		 * 	<li>
 		 * 		<js>"iri"</js> - Sets the IRI engine to IRI
-		 * 		({@doc http://www.ietf.org/rfc/rfc3986.txt RFC 3986},
-		 * 		{@doc http://www.ietf.org/rfc/rfc3987.txt RFC 3987}).
+		 * 		({doc http://www.ietf.org/rfc/rfc3986.txt RFC 3986},
+		 * 		{doc http://www.ietf.org/rfc/rfc3987.txt RFC 3987}).
 		 * </ul>
 		 *
 		 * @param value
@@ -267,13 +267,13 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 *
 		 * <ul class='seealso'>
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
+		 * 		{doc ext.ARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
+		 * 		{doc ext.ARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
+		 * 		{doc ext.ARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
+		 * 		{doc ext.ARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
 		 * </ul>
 		 *
 		 * @param value
@@ -293,7 +293,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 *
 		 * <ul class='seealso'>
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+		 * 		{doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 		 * </ul>
 		 *
 		 * @return This object.
@@ -311,7 +311,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 *
 		 * <ul class='seealso'>
 		 * 	<li>
-		 * 		{@doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+		 * 		{doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 		 * </ul>
 		 *
 		 * @param value
@@ -525,7 +525,7 @@ public class RdfSerializer extends WriterSerializer implements RdfMetaProvider {
 		 *
 		 * <p>
 		 * A list of <c>Resource</c> or a <c>String</c> being a comma separated list of fragment IDs from
-		 * {@doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
+		 * {doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
 		 * rules that will not be used.
 		 *
 		 * @param value
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 40fea11fa..fb2354be6 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -41,7 +41,7 @@ import org.apache.juneau.xml.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java
index 708289dcd..570f2ae21 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfUtils.java
@@ -22,7 +22,7 @@ import org.apache.juneau.xml.*;
  * Utility classes.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfUtils {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
index 700493a24..e1893e42a 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlAbbrevSerializer.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfXmlAbbrevSerializer extends RdfSerializer {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
index 8921debac..c130eab9f 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlParser.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfXmlParser extends RdfParser {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
index fdac16725..d0a6b4afb 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfXmlSerializer.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfXmlSerializer extends RdfSerializer {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
index 21df772c0..d0b716c9e 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleParser.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class TurtleParser extends RdfParser {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
index 91e59dbf7..4f8f99e3e 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/TurtleSerializer.java
@@ -20,7 +20,7 @@ package org.apache.juneau.jena;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class TurtleSerializer extends RdfSerializer {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
index bc9686323..7ea3f2c81 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
@@ -37,7 +37,7 @@ import org.apache.juneau.jena.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 @Documented
@@ -162,7 +162,7 @@ public @interface Rdf {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{doc jm.DynamicallyAppliedAnnotations}
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -176,7 +176,7 @@ public @interface Rdf {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{doc jm.DynamicallyAppliedAnnotations}
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
index f7e8779b6..fcd8f5db1 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
@@ -29,7 +29,7 @@ import org.apache.juneau.svl.*;
  * Utility classes and methods for the {@link Rdf @Rdf} annotation.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfAnnotation {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
index 0641ec5d4..80ce6c2d9 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
@@ -30,7 +30,7 @@ import org.apache.juneau.xml.annotation.*;
  * Used primarily for specifying bean configuration properties on REST classes and methods.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 @Target({TYPE,METHOD})
@@ -89,7 +89,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -106,7 +106,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -123,7 +123,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -150,13 +150,13 @@ public @interface RdfConfig {
 	 * 		in IRIs.
 	 * 	<li>
 	 * 		<js>"iri"</js> - Sets the IRI engine to IRI
-	 * 		({@doc http://www.ietf.org/rfc/rfc3986.txt RFC 3986},
-	 * 		{@doc http://www.ietf.org/rfc/rfc3987.txt RFC 3987}).
+	 * 		({doc http://www.ietf.org/rfc/rfc3986.txt RFC 3986},
+	 * 		{doc http://www.ietf.org/rfc/rfc3987.txt RFC 3987}).
 	 * </ul>
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -181,18 +181,18 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
 	 * 	<li>
-	 * 		{@doc ext.ARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
+	 * 		{doc ext.ARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
 	 * 	<li>
-	 * 		{@doc ext.ARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
+	 * 		{doc ext.ARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
 	 * 	<li>
-	 * 		{@doc ext.ARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
+	 * 		{doc ext.ARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
 	 * 	<li>
-	 * 		{@doc ext.ARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
+	 * 		{doc ext.ARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -207,12 +207,12 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
 	 * 	<li>
-	 * 		{@doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+	 * 		{doc ext.ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -227,7 +227,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -248,7 +248,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -268,7 +268,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -310,7 +310,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -338,7 +338,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -361,7 +361,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -381,7 +381,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -401,7 +401,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -418,12 +418,12 @@ public @interface RdfConfig {
 	 *
 	 * <p>
 	 * A list of <c>Resource</c> or a <c>String</c> being a comma separated list of fragment IDs from
-	 * {@doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
+	 * {doc http://www.w3.org/TR/rdf-syntax-grammar RDF Syntax Grammar} indicating grammar
 	 * rules that will not be used.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -443,7 +443,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -463,7 +463,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -483,7 +483,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -503,7 +503,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -523,7 +523,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -544,7 +544,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -564,7 +564,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -584,7 +584,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -604,7 +604,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -624,7 +624,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -657,7 +657,7 @@ public @interface RdfConfig {
 	 * 		If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>, the order of the elements in the collection will get
 	 * 		lost.
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -687,7 +687,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -711,7 +711,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -738,7 +738,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -754,7 +754,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -779,7 +779,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -802,7 +802,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -821,7 +821,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -846,7 +846,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
index 149defdcd..5d2f2c302 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
@@ -22,7 +22,7 @@ import org.apache.juneau.xml.*;
  * Utility classes and methods for the {@link RdfConfig @RdfConfig} annotation.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 public class RdfConfigAnnotation {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java
index 2ad1402fe..e078aa043 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfNs.java
@@ -23,7 +23,7 @@ import java.lang.annotation.*;
  * Used to identify a namespace/URI pair on a {@link RdfSchema#rdfNs() @RdfSchema(rdfNs)} annotation.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 @Documented
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
index 5645b3d9f..d0601c31b 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java
@@ -21,7 +21,7 @@ import java.lang.annotation.*;
  * Identifies the default RDF namespaces at the package level.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jmr.RdfDetails}
  * </ul>
  */
 @Documented
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/N3.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/N3.java
index 6560fef87..8d2d407b7 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/N3.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/N3.java
@@ -41,8 +41,8 @@ import org.apache.juneau.serializer.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
- * 	<li class='link'>{@doc jm.Marshallers}
+ * 	<li class='link'>{doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jm.Marshallers}
  * </ul>
  */
 public class N3 extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/NTriple.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/NTriple.java
index b0dc160e4..24a94ef0f 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/NTriple.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/NTriple.java
@@ -41,8 +41,8 @@ import org.apache.juneau.serializer.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
- * 	<li class='link'>{@doc jm.Marshallers}
+ * 	<li class='link'>{doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jm.Marshallers}
  * </ul>
  */
 public class NTriple extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXml.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXml.java
index 5fbf7e338..fb75e4bd5 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXml.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXml.java
@@ -41,8 +41,8 @@ import org.apache.juneau.serializer.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
- * 	<li class='link'>{@doc jm.Marshallers}
+ * 	<li class='link'>{doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jm.Marshallers}
  * </ul>
  */
 public class RdfXml extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXmlAbbrev.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXmlAbbrev.java
index c1e1e06b3..367e04793 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXmlAbbrev.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/RdfXmlAbbrev.java
@@ -41,8 +41,8 @@ import org.apache.juneau.serializer.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
- * 	<li class='link'>{@doc jm.Marshallers}
+ * 	<li class='link'>{doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jm.Marshallers}
  * </ul>
  */
 public class RdfXmlAbbrev extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/Turtle.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/Turtle.java
index ef4110379..1620f7ff0 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/Turtle.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/marshaller/Turtle.java
@@ -41,8 +41,8 @@ import org.apache.juneau.serializer.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jmr.RdfDetails}
- * 	<li class='link'>{@doc jm.Marshallers}
+ * 	<li class='link'>{doc jmr.RdfDetails}
+ * 	<li class='link'>{doc jm.Marshallers}
  * </ul>
  */
 public class Turtle extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index e4893632e..90fd1096e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -152,7 +152,7 @@ import org.apache.juneau.utils.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.BeanContexts}
+ * 	<li class='link'><a class="doclink" href="../../../overview-summary.html#juneau-marshall.jm.BeanContexts">Bean Contexts</a>
  * </ul>
  */
 @SuppressWarnings({"unchecked","rawtypes"})
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
index 897c352df..9d36ed0c0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
@@ -26,8 +26,8 @@ import org.apache.http.message.*;
  * Section 14.1 and 14.7 of RFC2616 (the HTTP/1.1 specification).
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-common}
- * 	<li class='extlink'>{@doc ext.RFC2616}
+ * 	<li class='link'><a class="doclink" href="../../../overview-summary.html#juneau-rest-common">juneau-rest-common</a>
+ * 	<li class='extlink'><a class="doclink" href="https://www.w3.org/Protocols/rfc2616/rfc2616.html">Hypertext Transfer Protocol -- HTTP/1.1</a>
  * </ul>
  */
 public class MediaRange extends MediaType {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
index 228ad2891..b1e5951d8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRanges.java
@@ -46,8 +46,8 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-common}
- * 	<li class='extlink'>{@doc ext.RFC2616}
+ * 	<li class='link'><a class="doclink" href="../../../overview-summary.html#juneau-rest-common">juneau-rest-common</a>
+ * 	<li class='extlink'><a class="doclink" href="https://www.w3.org/Protocols/rfc2616/rfc2616.html">Hypertext Transfer Protocol -- HTTP/1.1</a>
  * </ul>
  */
 @BeanIgnore
@@ -143,7 +143,7 @@ public class MediaRanges {
 	 * present in the header.
 	 *
 	 * <p>
-	 * See {@doc https://www.w3.org/TR/activitypub/#retrieving-objects ActivityPub / Retrieving Objects}
+	 * See <a class="doclink" href="https://www.w3.org/TR/activitypub/#retrieving-objects">ActivityPub / Retrieving Objects</a>
 	 *
 	 * @param mediaTypes The media types to match against.
 	 * @return The index into the array of the best match, or <c>-1</c> if no suitable matches could be found.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
index dfe0b4f2b..1e6301446 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
@@ -31,8 +31,8 @@ import org.apache.juneau.json.*;
  * Section 14.1 and 14.7 of RFC2616 (the HTTP/1.1 specification).
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-common}
- * 	<li class='extlink'>{@doc ext.RFC2616}
+ * 	<li class='link'><a class="doclink" href="../../../overview-summary.html#juneau-rest-common">juneau-rest-common</a>
+ * 	<li class='extlink'><a class="doclink" href="https://www.w3.org/Protocols/rfc2616/rfc2616.html">Hypertext Transfer Protocol -- HTTP/1.1</a>
  * </ul>
  */
 @BeanIgnore
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
index cdc62bf3b..ae668caa7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRange.java
@@ -35,8 +35,8 @@ import org.apache.juneau.annotation.*;
  * An example of a type range is a value in an <c>Accept-Encoding</c> header.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-common}
- * 	<li class='extlink'>{@doc ext.RFC2616}
+ * 	<li class='link'><a class="doclink" href="../../../overview-summary.html#juneau-rest-common">juneau-rest-common</a>
+ * 	<li class='extlink'><a class="doclink" href="https://www.w3.org/Protocols/rfc2616/rfc2616.html">Hypertext Transfer Protocol -- HTTP/1.1</a>
  * </ul>
  */
 @BeanIgnore
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
index 4681bcf49..a872862c0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/StringRanges.java
@@ -53,8 +53,8 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-common}
- * 	<li class='extlink'>{@doc ext.RFC2616}
+ * 	<li class='link'><a class="doclink" href="../../../overview-summary.html#juneau-rest-common">juneau-rest-common</a>
+ * 	<li class='extlink'><a class="doclink" href="https://www.w3.org/Protocols/rfc2616/rfc2616.html">Hypertext Transfer Protocol -- HTTP/1.1</a>
  * </ul>
  */
 @BeanIgnore
@@ -166,7 +166,7 @@ public class StringRanges {
 	 * present in the header.
 	 *
 	 * <p>
-	 * See {@doc https://www.w3.org/TR/activitypub/#retrieving-objects ActivityPub / Retrieving Objects}
+	 * See <a class="doclink" href="https://www.w3.org/TR/activitypub/#retrieving-objects">ActivityPub / Retrieving Objects</a>
 	 *
 	 * @param names The names to match against.
 	 * @return The index into the array of the best match, or <c>-1</c> if no suitable matches could be found.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
index e9c9ab10b..651d2f14a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -33,8 +33,7 @@ import org.apache.juneau.swap.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.BeanAnnotation}
- * </ul>
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.JavaBeansSupport.jm.BeanAnnotation">@Bean Annotation</a>
 * </ul>
  */
 @Documented
 @Target({METHOD,TYPE})
@@ -90,7 +89,7 @@ public @interface Bean {
 	 * 			<li>A static method with name <c>example</c> with no arguments or one {@link BeanSession} argument.
 	 * 		</ul>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -259,7 +258,7 @@ public @interface Bean {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -273,7 +272,7 @@ public @interface Bean {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index b14cfe3e4..1133fa35a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -72,7 +72,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -103,7 +103,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -134,7 +134,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -160,7 +160,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -191,7 +191,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -216,7 +216,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * 	<li class='note'>
 	 * 		The {@link Bean @Bean} annotation can be used on a class to override this setting when <js>"true"</js>.
 	 * </ul>
@@ -243,7 +243,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * 	<li class='note'>
 	 * 		The {@link Bean @Bean} annotation can be used on a class to override this setting when <js>"true"</js>.
 	 * </ul>
@@ -270,7 +270,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -295,7 +295,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -317,7 +317,7 @@ public @interface BeanConfig {
 	 * 	<li class='note'>
 	 * 		Default value: <js>"_type"</js>.
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 
 	 * <ul class='seealso'>
@@ -357,7 +357,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -389,7 +389,7 @@ public @interface BeanConfig {
 	 * 	<li class='ja'>{@link Beanp#dictionary()}
 	 * 	<li class='ja'>{@link BeanConfig#dictionary_replace()}
 	 * 	<li class='jm'>{@link org.apache.juneau.BeanContext.Builder#beanDictionary(Class...)}
-	 * 	<li class='link'>{@doc jm.BeanDictionaries}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.BeanDictionaries">Bean Names and Dictionaries</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -435,7 +435,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -461,7 +461,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -486,7 +486,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -511,7 +511,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -535,7 +535,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -560,7 +560,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -584,7 +584,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -609,7 +609,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -666,7 +666,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -686,7 +686,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -707,7 +707,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -759,7 +759,7 @@ public @interface BeanConfig {
 	 * 			<li class='jp'><c>java.util.*</c>
 	 * 		</ul>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -827,7 +827,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -855,12 +855,12 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='jm'>{@link org.apache.juneau.BeanContext.Builder#swaps(Class...)}
-	 * 	<li class='link'>{@doc jm.Swaps}
-	 * 	<li class='link'>{@doc jm.PerMediaTypeSwaps}
-	 * 	<li class='link'>{@doc jm.OneWaySwaps}
-	 * 	<li class='link'>{@doc jm.SwapAnnotation}
-	 * 	<li class='link'>{@doc jm.AutoSwaps}
-	 * 	<li class='link'>{@doc jm.SurrogateClasses}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps">Swaps</a>
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps.jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps.jm.OneWaySwaps">One-way Swaps</a>
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps.jm.SwapAnnotation">@Swap Annotation</a>
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps.jm.AutoSwaps">Auto-detected swaps</a>
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps.jm.SurrogateClasses">Surrogate Classes</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -889,7 +889,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -914,7 +914,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -940,7 +940,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -965,7 +965,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
index c5a6a9abc..41f5e117b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
@@ -30,7 +30,7 @@ import java.lang.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.BeanIgnoreAnnotation}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.JavaBeansSupport.jm.BeanIgnoreAnnotation">@BeanIgnore Annotation</a>
  * </ul>
  */
 @Documented
@@ -141,7 +141,7 @@ public @interface BeanIgnore {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -155,7 +155,7 @@ public @interface BeanIgnore {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
index d1df1f122..78cddd62b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
@@ -50,8 +50,7 @@ import org.apache.juneau.*;
  * Multiple calls to {@link BeanMap#getBean()} will return the same bean instance.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.BeancAnnotation}
- * </ul>
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.JavaBeansSupport.jm.BeancAnnotation">@Beanc Annotation</a>
 * </ul>
  */
 @Documented
 @Target({METHOD,TYPE,CONSTRUCTOR})
@@ -132,7 +131,7 @@ public @interface Beanc {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
index e66a42728..947ac13c7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
@@ -33,7 +33,7 @@ import org.apache.juneau.*;
  * This annotation is applied to public fields and public getter/setter methods of beans.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.BeanpAnnotation}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.JavaBeansSupport.jm.BeanpAnnotation">@Beanp Annotation</a>
  * </ul>
  */
 @Documented
@@ -274,7 +274,7 @@ public @interface Beanp {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
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 9b757f58d..f90a3d69a 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
@@ -52,7 +52,7 @@ import java.lang.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.PojoBuilders}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.JavaBeansSupport.jm.PojoBuilders">POJO Builders</a>
  * </ul>
  */
 @Documented
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
index 37f998f99..a100bb75f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
@@ -147,7 +147,7 @@ public @interface Example {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -161,7 +161,7 @@ public @interface Example {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocs.java
index 3ec57a76f..70795c611 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocs.java
@@ -36,8 +36,8 @@ import java.lang.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jrs.Swagger}
- * 	<li class='extlink'>{@doc ext.SwaggerExternalDocumentationObject}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a>
+ * 	<li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#externalDocumentationObject">Swagger ExternalDocumentation Object</a>
  * </ul>
  */
 @Documented
@@ -45,7 +45,7 @@ import java.lang.annotation.*;
 public @interface ExternalDocs {
 
 	/**
-	 * <mk>description</mk> field of the {@doc ext.SwaggerExternalDocumentationObject}.
+	 * <mk>description</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#externalDocumentationObject">Swagger ExternalDocumentation Object</a>.
 	 *
 	 * <p>
 	 * A short description of the target documentation.
@@ -55,7 +55,7 @@ public @interface ExternalDocs {
 	 * 		The format is a plain-text string.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li class='note'>
-	 * 		Supports {@doc jrs.SvlVariables} (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -63,7 +63,7 @@ public @interface ExternalDocs {
 	String[] description() default {};
 
 	/**
-	 * <mk>url</mk> field of the {@doc ext.SwaggerExternalDocumentationObject}.
+	 * <mk>url</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#externalDocumentationObject">Swagger ExternalDocumentation Object</a>.
 	 *
 	 * <p>
 	 * The URL for the target documentation. Value MUST be in the format of a URL.
@@ -74,7 +74,7 @@ public @interface ExternalDocs {
 	 * 	<li class='note'>
 	 * 		The format is a URL string.
 	 * 	<li class='note'>
-	 * 		Supports {@doc jrs.SvlVariables} (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
index c6b183edf..76657a082 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
@@ -64,8 +64,8 @@ import org.apache.juneau.oapi.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jrs.Swagger}
- * 	<li class='extlink'>{@doc ext.SwaggerItemsObject}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a>
+ * 	<li class='link'><a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>
  * </ul>
  */
 @Documented
@@ -73,7 +73,7 @@ import org.apache.juneau.oapi.*;
 public @interface Items {
 
 	/**
-	 * <mk>default</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>default</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -85,7 +85,7 @@ public @interface Items {
 	String[] _default() default {};
 
 	/**
-	 * <mk>enum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>enum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -97,7 +97,7 @@ public @interface Items {
 	String[] _enum() default {};
 
 	/**
-	 * <mk>$ref</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>$ref</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -116,7 +116,7 @@ public @interface Items {
 	String cf() default "";
 
 	/**
-	 * <mk>collectionFormat</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>collectionFormat</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -156,7 +156,7 @@ public @interface Items {
 	boolean emin() default false;
 
 	/**
-	 * <mk>exclusiveMaximum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>exclusiveMaximum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -168,7 +168,7 @@ public @interface Items {
 	boolean exclusiveMaximum() default false;
 
 	/**
-	 * <mk>exclusiveMinimum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>exclusiveMinimum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -187,7 +187,7 @@ public @interface Items {
 	String f() default "";
 
 	/**
-	 * <mk>format</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>format</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -199,7 +199,7 @@ public @interface Items {
 	String format() default "";
 
 	/**
-	 * <mk>items</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>items</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <p>
 	 * Describes the type of items in the array.
@@ -223,7 +223,7 @@ public @interface Items {
 	long maxi() default -1;
 
 	/**
-	 * <mk>maximum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>maximum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -235,7 +235,7 @@ public @interface Items {
 	String maximum() default "";
 
 	/**
-	 * <mk>maxItems</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>maxItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -254,7 +254,7 @@ public @interface Items {
 	long maxl() default -1;
 
 	/**
-	 * <mk>maxLength</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>maxLength</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -280,7 +280,7 @@ public @interface Items {
 	long mini() default -1;
 
 	/**
-	 * <mk>minimum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>minimum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -292,7 +292,7 @@ public @interface Items {
 	String minimum() default "";
 
 	/**
-	 * <mk>minItems</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>minItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -311,7 +311,7 @@ public @interface Items {
 	long minl() default -1;
 
 	/**
-	 * <mk>minLength</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>minLength</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -330,7 +330,7 @@ public @interface Items {
 	String mo() default "";
 
 	/**
-	 * <mk>multipleOf</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>multipleOf</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -349,7 +349,7 @@ public @interface Items {
 	String p() default "";
 
 	/**
-	 * <mk>pattern</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>pattern</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -368,7 +368,7 @@ public @interface Items {
 	String t() default "";
 
 	/**
-	 * <mk>type</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>type</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -387,7 +387,7 @@ public @interface Items {
 	boolean ui() default false;
 
 	/**
-	 * <mk>uniqueItems</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>uniqueItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
index f9e4a4ad2..a1eef4bb1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
@@ -73,7 +73,7 @@ public @interface Marshalled {
 	 * 			<li>A static method with name <c>example</c> with no arguments or one {@link BeanSession} argument.
 	 * 		</ul>
 	 * 	<li class='note'>
-	 * 		Supports {@doc jm.DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -152,7 +152,7 @@ public @interface Marshalled {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -166,7 +166,7 @@ public @interface Marshalled {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
index 08304954b..1073a991c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
@@ -33,7 +33,7 @@ import java.lang.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.NamePropertyAnnotation}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.JavaBeansSupport.jm.NamePropertyAnnotation">@NameProperty Annotation</a>
  * </ul>
  */
 @Target({METHOD,FIELD,TYPE})
@@ -102,7 +102,7 @@ public @interface NameProperty {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
index d70f599a5..2574d874a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.ParentPropertyAnnotation}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.JavaBeansSupport.jm.ParentPropertyAnnotation">@ParentProperty Annotation</a>
  * </ul>
  */
 @Target({METHOD,FIELD,TYPE})
@@ -105,7 +105,7 @@ public @interface ParentProperty {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
index 8b28400b3..f3f1594eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
@@ -64,8 +64,8 @@ import org.apache.juneau.oapi.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jrs.Swagger}
- * 	<li class='extlink'>{@doc ext.SwaggerSchemaObject}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a>
+ * 	<li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>
  * </ul>
  */
 @Documented
@@ -76,7 +76,7 @@ import org.apache.juneau.oapi.*;
 public @interface Schema {
 
 	/**
-	 * <mk>default</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>default</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * Declares the value of the parameter that the server will use if none is provided, for example a "count" to control the number of results per page might default to 100 if not supplied by the client in the request.
@@ -122,7 +122,7 @@ public @interface Schema {
 	String[] _default() default {};
 
 	/**
-	 * <mk>enum</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>enum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * If specified, the input validates successfully if it is equal to one of the elements in this array.
@@ -161,7 +161,7 @@ public @interface Schema {
 	String[] _enum() default {};
 
 	/**
-	 * <mk>$ref</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>$ref</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * 	A JSON reference to the schema definition.
@@ -176,11 +176,11 @@ public @interface Schema {
 	String $ref() default "";
 
 	/**
-	 * <mk>additionalProperties</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>additionalProperties</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
@@ -189,11 +189,11 @@ public @interface Schema {
 	String[] additionalProperties() default {};
 
 	/**
-	 * <mk>allOf</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>allOf</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
@@ -209,7 +209,7 @@ public @interface Schema {
 	boolean aev() default false;
 
 	/**
-	 * <mk>allowEmptyValue</mk> field of the {@doc ext.SwaggerParameterObject}.
+	 * <mk>allowEmptyValue</mk> field of the <a class='doclink' href='https://swagger.io/specification/v2#parameterObject'>Swagger Parameter Object</a>.
 	 *
 	 * <p>
 	 * Sets the ability to pass empty-valued heaver values.
@@ -289,7 +289,7 @@ public @interface Schema {
 	String[] d() default {};
 
 	/**
-	 * <mk>description</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>description</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * A brief description of the body. This could contain examples of use.
@@ -316,7 +316,7 @@ public @interface Schema {
 	 * 		The format is plain text.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li class='note'>
-	 * 		Supports {@doc jrs.SvlVariables} (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+	 * 		Supports <a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -331,11 +331,11 @@ public @interface Schema {
 	String[] df() default {};
 
 	/**
-	 * <mk>discriminator</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>discriminator</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
@@ -365,7 +365,7 @@ public @interface Schema {
 	boolean emin() default false;
 
 	/**
-	 * <mk>exclusiveMaximum</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>exclusiveMaximum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * Defines whether the maximum is matched exclusively.
@@ -394,7 +394,7 @@ public @interface Schema {
 	boolean exclusiveMaximum() default false;
 
 	/**
-	 * <mk>exclusiveMinimum</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>exclusiveMinimum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * Defines whether the minimum is matched exclusively.
@@ -423,11 +423,11 @@ public @interface Schema {
 	boolean exclusiveMinimum() default false;
 
 	/**
-	 * <mk>externalDocs</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>externalDocs</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
@@ -443,10 +443,10 @@ public @interface Schema {
 	String f() default "";
 
 	/**
-	 * <mk>format</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>format</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
-	 * The extending format for the previously mentioned {@doc ext.SwaggerParameterTypes parameter type}.
+	 * The extending format for the previously mentioned <a class="doclink" href="https://swagger.io/specification/v2#parameterType">parameter type</a>.
 	 *
 	 * <p>
 	 * Static strings are defined in {@link FormatType}.
@@ -512,7 +512,7 @@ public @interface Schema {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc ext.SwaggerDataTypeFormats}
+	 * 	<li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -527,7 +527,7 @@ public @interface Schema {
 	boolean ignore() default false;
 
 	/**
-	 * <mk>items</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>items</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * Describes the type of items in the array.
@@ -565,7 +565,7 @@ public @interface Schema {
 	long maxi() default -1;
 
 	/**
-	 * <mk>maximum</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>maximum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * Defines the maximum value for a parameter of numeric types.
@@ -594,7 +594,7 @@ public @interface Schema {
 	String maximum() default "";
 
 	/**
-	 * <mk>maxItems</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>maxItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * An array or collection is valid if its size is less than, or equal to, the value of this keyword.
@@ -629,7 +629,7 @@ public @interface Schema {
 	long maxl() default -1;
 
 	/**
-	 * <mk>maxLength</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>maxLength</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.
@@ -666,11 +666,11 @@ public @interface Schema {
 	long maxp() default -1;
 
 	/**
-	 * <mk>maxProperties</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>maxProperties</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
@@ -693,7 +693,7 @@ public @interface Schema {
 	long mini() default -1;
 
 	/**
-	 * <mk>minimum</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>minimum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * Defines the minimum value for a parameter of numeric types.
@@ -722,7 +722,7 @@ public @interface Schema {
 	String minimum() default "";
 
 	/**
-	 * <mk>minItems</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>minItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * An array or collection is valid if its size is greater than, or equal to, the value of this keyword.
@@ -757,7 +757,7 @@ public @interface Schema {
 	long minl() default -1;
 
 	/**
-	 * <mk>minLength</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>minLength</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.
@@ -794,11 +794,11 @@ public @interface Schema {
 	long minp() default -1;
 
 	/**
-	 * <mk>minProperties</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>minProperties</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
@@ -814,7 +814,7 @@ public @interface Schema {
 	String mo() default "";
 
 	/**
-	 * <mk>multipleOf</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>multipleOf</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * A numeric instance is valid if the result of the division of the instance by this keyword's value is an integer.
@@ -922,7 +922,7 @@ public @interface Schema {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -936,7 +936,7 @@ public @interface Schema {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -951,7 +951,7 @@ public @interface Schema {
 	String p() default "";
 
 	/**
-	 * <mk>pattern</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>pattern</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * A string input is valid if it matches the specified regular expression pattern.
@@ -985,11 +985,11 @@ public @interface Schema {
 	String pattern() default "";
 
 	/**
-	 * <mk>properties</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>properties</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
@@ -1005,11 +1005,11 @@ public @interface Schema {
 	boolean r() default false;
 
 	/**
-	 * <mk>readOnly</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>readOnly</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
@@ -1018,7 +1018,7 @@ public @interface Schema {
 	boolean readOnly() default false;
 
 	/**
-	 * <mk>required</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>required</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * Determines whether the parameter is mandatory.
@@ -1097,7 +1097,7 @@ public @interface Schema {
 	String t() default "";
 
 	/**
-	 * <mk>title</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>title</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -1109,7 +1109,7 @@ public @interface Schema {
 	String title() default "";
 
 	/**
-	 * <mk>type</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>type</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * The type of the parameter.
@@ -1176,7 +1176,7 @@ public @interface Schema {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc ext.SwaggerDataTypes}
+	 * 	<li class='extlink'><a class="doclink" href="https://swagger.io/specification#dataTypes">Swagger Data Types</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -1191,7 +1191,7 @@ public @interface Schema {
 	boolean ui() default false;
 
 	/**
-	 * <mk>uniqueItems</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>uniqueItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <p>
 	 * If <jk>true</jk> the input validates successfully if all of its elements are unique.
@@ -1223,11 +1223,11 @@ public @interface Schema {
 	boolean uniqueItems() default false;
 
 	/**
-	 * <mk>xml</mk> field of the {@doc ext.SwaggerSchemaObject}.
+	 * <mk>xml</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
-	 * 		The format is a {@doc jd.Swagger} object.
+	 * 		The format is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * </ul>
 	 *
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
index 9cdc7c86a..01dc459f9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
@@ -27,8 +27,8 @@ import java.lang.annotation.*;
  * <br>If you want to nest items further, you have to define them free-form using {@link #items()} as free-form JSON.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jrs.Swagger}
- * 	<li class='extlink'>{@doc ext.SwaggerItemsObject}
+ * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a>
+ * 	<li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>
  * </ul>
  */
 @Documented
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
 public @interface SubItems {
 
 	/**
-	 * <mk>default</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>default</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -48,7 +48,7 @@ public @interface SubItems {
 	String[] _default() default {};
 
 	/**
-	 * <mk>enum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>enum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -60,7 +60,7 @@ public @interface SubItems {
 	String[] _enum() default {};
 
 	/**
-	 * <mk>$ref</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>$ref</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -79,7 +79,7 @@ public @interface SubItems {
 	String cf() default "";
 
 	/**
-	 * <mk>collectionFormat</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>collectionFormat</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -119,7 +119,7 @@ public @interface SubItems {
 	boolean emin() default false;
 
 	/**
-	 * <mk>exclusiveMaximum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>exclusiveMaximum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -131,7 +131,7 @@ public @interface SubItems {
 	boolean exclusiveMaximum() default false;
 
 	/**
-	 * <mk>exclusiveMinimum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>exclusiveMinimum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -150,7 +150,7 @@ public @interface SubItems {
 	String f() default "";
 
 	/**
-	 * <mk>format</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>format</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -162,13 +162,13 @@ public @interface SubItems {
 	String format() default "";
 
 	/**
-	 * <mk>items</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>items</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <p>
 	 * Describes the type of items in the array.
 	 *
 	 * <p>
-	 * This is a {@doc jd.Swagger} object.
+	 * This is a <a class="doclink" href="../../../../overview-summary.html#juneau-dto.jd.Swagger">Swagger</a> object.
 	 * <br>It must be declared free-form because it's not possible to nest annotations in Java.
 	 *
 	 * @return The annotation value.
@@ -190,7 +190,7 @@ public @interface SubItems {
 	long maxi() default -1;
 
 	/**
-	 * <mk>maximum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>maximum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -202,7 +202,7 @@ public @interface SubItems {
 	String maximum() default "";
 
 	/**
-	 * <mk>maxItems</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>maxItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -221,7 +221,7 @@ public @interface SubItems {
 	long maxl() default -1;
 
 	/**
-	 * <mk>maxLength</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>maxLength</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -247,7 +247,7 @@ public @interface SubItems {
 	long mini() default -1;
 
 	/**
-	 * <mk>minimum</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>minimum</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -259,7 +259,7 @@ public @interface SubItems {
 	String minimum() default "";
 
 	/**
-	 * <mk>minItems</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>minItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -278,7 +278,7 @@ public @interface SubItems {
 	long minl() default -1;
 
 	/**
-	 * <mk>minLength</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>minLength</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -297,7 +297,7 @@ public @interface SubItems {
 	String mo() default "";
 
 	/**
-	 * <mk>multipleOf</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>multipleOf</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -316,7 +316,7 @@ public @interface SubItems {
 	String p() default "";
 
 	/**
-	 * <mk>pattern</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>pattern</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -335,7 +335,7 @@ public @interface SubItems {
 	String t() default "";
 
 	/**
-	 * <mk>type</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>type</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
@@ -354,7 +354,7 @@ public @interface SubItems {
 	boolean ui() default false;
 
 	/**
-	 * <mk>uniqueItems</mk> field of the {@doc ext.SwaggerItemsObject}.
+	 * <mk>uniqueItems</mk> field of the <a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>.
 	 *
 	 * <ul class='notes'>
 	 * 	<li class='note'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
index b47cc83d6..2d985a3ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
@@ -31,7 +31,7 @@ import org.apache.juneau.swap.*;
  * </ul>
 
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.SwapAnnotation}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps.jm.SwapAnnotation">@Swap Annotation</a>
  * </ul>
  */
 @Documented
@@ -70,7 +70,7 @@ public @interface Swap {
 	 * </p>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.PerMediaTypeSwaps}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps.jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -157,7 +157,7 @@ public @interface Swap {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -171,7 +171,7 @@ public @interface Swap {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -209,7 +209,7 @@ public @interface Swap {
 	 * </p>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.TemplatedSwaps}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Swaps.jm.TemplatedSwaps">Templated Swaps</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
index 44dafe9af..a789d7362 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
@@ -32,7 +32,7 @@ import java.lang.annotation.*;
  * This annotation allows you to identify other classes that return URIs via <c>toString()</c> as URI objects.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.MarshallingUris}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.MarshallingUris">URIs</a>
  * </ul>
  */
 @Documented
@@ -123,7 +123,7 @@ public @interface Uri {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -137,7 +137,7 @@ public @interface Uri {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
index 6b332210a..a92f5322a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
@@ -121,7 +121,7 @@ public @interface Csv {
 	 * </ul>
 	 *
 \	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
@@ -135,7 +135,7 @@ public @interface Csv {
 	 * Identical to {@link #on()} except allows you to specify class objects instead of a strings.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc jm.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'><a class="doclink" href="../../../../../overview-summary.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
 	 * </ul>
 	 *
 	 * @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
index b1a28b837..537cb7f71 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
@@ -29,7 +29,7 @@ import java.io.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc jm.Encoders}
+ * 	<li class='link'><a class="doclink" href="../../../../overview-summary.html#juneau-marshall.jm.Encoders">Encoders</a>
  * </ul>
  */
 public abstract class Encoder {
... 17959 lines suppressed ...