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 2020/09/26 21:56:48 UTC

[juneau] branch master updated: Javadocs

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

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


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

commit 06d109612ce97146708d53b73ce2af5048034106
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Sat Sep 26 17:56:39 2020 -0400

    Javadocs
---
 .../apache/juneau/config/encode/ConfigEncoder.java |    2 +-
 .../juneau/config/encode/ConfigXorEncoder.java     |    2 +-
 .../org/apache/juneau/config/vars/ConfigVar.java   |    4 +-
 .../org/apache/juneau/dto/atom/AtomBuilder.java    |    2 +-
 .../java/org/apache/juneau/dto/atom/Category.java  |    2 +-
 .../java/org/apache/juneau/dto/atom/Common.java    |    2 +-
 .../org/apache/juneau/dto/atom/CommonEntry.java    |    2 +-
 .../java/org/apache/juneau/dto/atom/Content.java   |    2 +-
 .../java/org/apache/juneau/dto/atom/Entry.java     |    2 +-
 .../main/java/org/apache/juneau/dto/atom/Feed.java |    2 +-
 .../java/org/apache/juneau/dto/atom/Generator.java |    2 +-
 .../main/java/org/apache/juneau/dto/atom/Icon.java |    2 +-
 .../main/java/org/apache/juneau/dto/atom/Id.java   |    2 +-
 .../main/java/org/apache/juneau/dto/atom/Link.java |    2 +-
 .../main/java/org/apache/juneau/dto/atom/Logo.java |    2 +-
 .../java/org/apache/juneau/dto/atom/Person.java    |    2 +-
 .../java/org/apache/juneau/dto/atom/Source.java    |    2 +-
 .../main/java/org/apache/juneau/dto/atom/Text.java |    2 +-
 .../java/org/apache/juneau/dto/atom/Utils.java     |    2 +-
 .../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  |    2 +-
 .../org/apache/juneau/dto/swagger/Contact.java     |    2 +-
 .../juneau/dto/swagger/ExternalDocumentation.java  |    4 +-
 .../org/apache/juneau/dto/swagger/HeaderInfo.java  |   60 +-
 .../java/org/apache/juneau/dto/swagger/Info.java   |    6 +-
 .../java/org/apache/juneau/dto/swagger/Items.java  |   60 +-
 .../org/apache/juneau/dto/swagger/License.java     |    2 +-
 .../org/apache/juneau/dto/swagger/Operation.java   |   30 +-
 .../apache/juneau/dto/swagger/ParameterInfo.java   |   72 +-
 .../apache/juneau/dto/swagger/ResponseInfo.java    |    8 +-
 .../org/apache/juneau/dto/swagger/SchemaInfo.java  |   12 +-
 .../apache/juneau/dto/swagger/SecurityScheme.java  |    2 +-
 .../org/apache/juneau/dto/swagger/Swagger.java     |   24 +-
 .../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 +-
 .../java/org/apache/juneau/jena/RdfCommon.java     |   14 +-
 .../java/org/apache/juneau/jena/RdfSerializer.java |    2 +-
 .../org/apache/juneau/jena/annotation/Rdf.java     |    2 +-
 .../apache/juneau/jena/annotation/RdfConfig.java   |   80 +-
 .../main/java/org/apache/juneau/BeanContext.java   |   18 +-
 .../java/org/apache/juneau/BeanContextBuilder.java |    2 +-
 .../java/org/apache/juneau/annotation/Bean.java    |    4 +-
 .../org/apache/juneau/annotation/BeanConfig.java   |  120 +-
 .../apache/juneau/annotation/BeanConstructor.java  |    2 +-
 .../org/apache/juneau/annotation/BeanIgnore.java   |    4 +-
 .../org/apache/juneau/annotation/BeanProperty.java |    2 +-
 .../java/org/apache/juneau/annotation/Beanc.java   |    4 +-
 .../java/org/apache/juneau/annotation/Beanp.java   |    4 +-
 .../java/org/apache/juneau/annotation/Builder.java |    2 +-
 .../java/org/apache/juneau/annotation/Example.java |    2 +-
 .../org/apache/juneau/annotation/NameProperty.java |    4 +-
 .../apache/juneau/annotation/ParentProperty.java   |    4 +-
 .../java/org/apache/juneau/annotation/Swap.java    |    8 +-
 .../java/org/apache/juneau/annotation/Swaps.java   |    2 +-
 .../java/org/apache/juneau/annotation/URI.java     |    4 +-
 .../java/org/apache/juneau/csv/annotation/Csv.java |    2 +-
 .../apache/juneau/csv/annotation/CsvConfig.java    |    2 +-
 .../org/apache/juneau/html/HtmlDocSerializer.java  |    4 +-
 .../java/org/apache/juneau/html/HtmlRender.java    |    2 +-
 .../juneau/html/HtmlSchemaDocSerializer.java       |    2 +-
 .../org/apache/juneau/html/HtmlSerializer.java     |    2 +-
 .../juneau/html/HtmlStrippedDocSerializer.java     |    2 +-
 .../java/org/apache/juneau/html/HtmlWidget.java    |    2 +-
 .../java/org/apache/juneau/html/HtmlWidgetVar.java |    2 +-
 .../org/apache/juneau/html/annotation/Html.java    |    4 +-
 .../apache/juneau/html/annotation/HtmlConfig.java  |   16 +-
 .../juneau/html/annotation/HtmlDocConfig.java      |   28 +-
 .../apache/juneau/html/annotation/HtmlLink.java    |    2 +-
 .../java/org/apache/juneau/http/Constants.java     |    2 +-
 .../java/org/apache/juneau/http/EntityTag.java     |    2 +-
 .../java/org/apache/juneau/http/HttpMethod.java    |   18 +-
 .../org/apache/juneau/http/HttpMethodName.java     |   18 +-
 .../java/org/apache/juneau/http/MediaRange.java    |    2 +-
 .../java/org/apache/juneau/http/MediaType.java     |    2 +-
 .../java/org/apache/juneau/http/StringRange.java   |    2 +-
 .../org/apache/juneau/http/annotation/Body.java    |   44 +-
 .../org/apache/juneau/http/annotation/Contact.java |   22 +-
 .../apache/juneau/http/annotation/FormData.java    |   74 +-
 .../apache/juneau/http/annotation/HasFormData.java |    2 +-
 .../apache/juneau/http/annotation/HasQuery.java    |    2 +-
 .../org/apache/juneau/http/annotation/Header.java  |   72 +-
 .../org/apache/juneau/http/annotation/License.java |   18 +-
 .../org/apache/juneau/http/annotation/Path.java    |   76 +-
 .../org/apache/juneau/http/annotation/Query.java   |   74 +-
 .../org/apache/juneau/http/annotation/Request.java |    4 +-
 .../apache/juneau/http/annotation/Response.java    |   36 +-
 .../juneau/http/annotation/ResponseBody.java       |    4 +-
 .../juneau/http/annotation/ResponseHeader.java     |   62 +-
 .../juneau/http/annotation/ResponseStatus.java     |    8 +-
 .../org/apache/juneau/http/annotation/Tag.java     |   28 +-
 .../java/org/apache/juneau/http/header/Accept.java |    2 +-
 .../apache/juneau/http/header/AcceptCharset.java   |    2 +-
 .../apache/juneau/http/header/AcceptEncoding.java  |    2 +-
 .../apache/juneau/http/header/AcceptLanguage.java  |    2 +-
 .../apache/juneau/http/header/AcceptRanges.java    |    2 +-
 .../java/org/apache/juneau/http/header/Age.java    |    2 +-
 .../java/org/apache/juneau/http/header/Allow.java  |    2 +-
 .../apache/juneau/http/header/Authorization.java   |    2 +-
 .../juneau/http/header/BasicCsvArrayHeader.java    |    2 +-
 .../apache/juneau/http/header/BasicDateHeader.java |    2 +-
 .../http/header/BasicEntityTagArrayHeader.java     |    2 +-
 .../juneau/http/header/BasicEntityTagHeader.java   |    2 +-
 .../juneau/http/header/BasicIntegerHeader.java     |    2 +-
 .../apache/juneau/http/header/BasicLongHeader.java |    2 +-
 .../http/header/BasicMediaRangeArrayHeader.java    |    2 +-
 .../juneau/http/header/BasicMediaTypeHeader.java   |    2 +-
 .../juneau/http/header/BasicStringHeader.java      |    2 +-
 .../http/header/BasicStringRangeArrayHeader.java   |    2 +-
 .../apache/juneau/http/header/BasicUriHeader.java  |    2 +-
 .../apache/juneau/http/header/CacheControl.java    |    2 +-
 .../org/apache/juneau/http/header/Connection.java  |    2 +-
 .../juneau/http/header/ContentDisposition.java     |    2 +-
 .../apache/juneau/http/header/ContentEncoding.java |    2 +-
 .../apache/juneau/http/header/ContentLanguage.java |    2 +-
 .../apache/juneau/http/header/ContentLength.java   |    2 +-
 .../apache/juneau/http/header/ContentLocation.java |    2 +-
 .../apache/juneau/http/header/ContentRange.java    |    2 +-
 .../org/apache/juneau/http/header/ContentType.java |    2 +-
 .../java/org/apache/juneau/http/header/Date.java   |    2 +-
 .../java/org/apache/juneau/http/header/ETag.java   |    2 +-
 .../java/org/apache/juneau/http/header/Expect.java |    2 +-
 .../org/apache/juneau/http/header/Expires.java     |    2 +-
 .../java/org/apache/juneau/http/header/From.java   |    2 +-
 .../java/org/apache/juneau/http/header/Host.java   |    2 +-
 .../org/apache/juneau/http/header/IfMatch.java     |    2 +-
 .../apache/juneau/http/header/IfModifiedSince.java |    2 +-
 .../org/apache/juneau/http/header/IfNoneMatch.java |    2 +-
 .../org/apache/juneau/http/header/IfRange.java     |    2 +-
 .../juneau/http/header/IfUnmodifiedSince.java      |    2 +-
 .../apache/juneau/http/header/LastModified.java    |    2 +-
 .../org/apache/juneau/http/header/Location.java    |    2 +-
 .../org/apache/juneau/http/header/MaxForwards.java |    2 +-
 .../java/org/apache/juneau/http/header/Pragma.java |    2 +-
 .../juneau/http/header/ProxyAuthenticate.java      |    2 +-
 .../juneau/http/header/ProxyAuthorization.java     |    2 +-
 .../java/org/apache/juneau/http/header/Range.java  |    2 +-
 .../org/apache/juneau/http/header/Referer.java     |    2 +-
 .../org/apache/juneau/http/header/RetryAfter.java  |    2 +-
 .../java/org/apache/juneau/http/header/Server.java |    2 +-
 .../java/org/apache/juneau/http/header/TE.java     |    2 +-
 .../org/apache/juneau/http/header/Trailer.java     |    2 +-
 .../juneau/http/header/TransferEncoding.java       |    2 +-
 .../org/apache/juneau/http/header/Upgrade.java     |    2 +-
 .../org/apache/juneau/http/header/UserAgent.java   |    2 +-
 .../java/org/apache/juneau/http/header/Vary.java   |    2 +-
 .../java/org/apache/juneau/http/header/Via.java    |    2 +-
 .../org/apache/juneau/http/header/Warning.java     |    2 +-
 .../apache/juneau/http/header/WwwAuthenticate.java |    2 +-
 .../java/org/apache/juneau/http/remote/Remote.java |   10 +-
 .../apache/juneau/http/remote/RemoteMethod.java    |    2 +-
 .../apache/juneau/http/remote/RemoteResource.java  |    2 +-
 .../juneau/http/remote/RrpcInterfaceMeta.java      |    2 +-
 .../http/remote/RrpcInterfaceMethodMeta.java       |    2 +-
 .../org/apache/juneau/httppart/HttpPartSchema.java |    2 +-
 .../juneau/httppart/HttpPartSchemaBuilder.java     |  704 +-
 .../java/org/apache/juneau/jso/annotation/Jso.java |    2 +-
 .../apache/juneau/jso/annotation/JsoConfig.java    |    2 +-
 .../org/apache/juneau/json/JsonSerializer.java     |    2 +-
 .../apache/juneau/json/SimpleJsonSerializer.java   |    2 +-
 .../org/apache/juneau/json/annotation/Json.java    |    2 +-
 .../apache/juneau/json/annotation/JsonConfig.java  |   10 +-
 .../juneau/jsonschema/annotation/ExternalDocs.java |   20 +-
 .../apache/juneau/jsonschema/annotation/Items.java |   82 +-
 .../jsonschema/annotation/JsonSchemaConfig.java    |   16 +-
 .../juneau/jsonschema/annotation/Schema.java       |  168 +-
 .../juneau/jsonschema/annotation/SubItems.java     |   84 +-
 .../org/apache/juneau/marshall/CharMarshall.java   |    2 +-
 .../main/java/org/apache/juneau/marshall/Html.java |    2 +-
 .../main/java/org/apache/juneau/marshall/Jso.java  |    2 +-
 .../main/java/org/apache/juneau/marshall/Json.java |    2 +-
 .../java/org/apache/juneau/marshall/Marshall.java  |    2 +-
 .../java/org/apache/juneau/marshall/MsgPack.java   |    2 +-
 .../java/org/apache/juneau/marshall/OpenApi.java   |    2 +-
 .../java/org/apache/juneau/marshall/PlainText.java |    2 +-
 .../org/apache/juneau/marshall/SimpleJson.java     |    2 +-
 .../org/apache/juneau/marshall/StreamMarshall.java |    2 +-
 .../main/java/org/apache/juneau/marshall/Uon.java  |    2 +-
 .../org/apache/juneau/marshall/UrlEncoding.java    |    2 +-
 .../main/java/org/apache/juneau/marshall/Xml.java  |    2 +-
 .../apache/juneau/msgpack/annotation/MsgPack.java  |    2 +-
 .../juneau/msgpack/annotation/MsgPackConfig.java   |    4 +-
 .../java/org/apache/juneau/oapi/OpenApiParser.java |    2 +-
 .../org/apache/juneau/oapi/OpenApiSerializer.java  |    4 +-
 .../org/apache/juneau/oapi/annotation/OpenApi.java |    2 +-
 .../juneau/oapi/annotation/OpenApiConfig.java      |    2 +-
 .../juneau/parser/annotation/ParserConfig.java     |   16 +-
 .../apache/juneau/plaintext/PlainTextParser.java   |    2 +-
 .../juneau/plaintext/PlainTextSerializer.java      |    2 +-
 .../juneau/plaintext/annotation/PlainText.java     |    2 +-
 .../plaintext/annotation/PlainTextConfig.java      |    2 +-
 .../org/apache/juneau/remote/RemoteInterface.java  |    2 +-
 .../juneau/serializer/OutputStreamSerializer.java  |    2 +-
 .../org/apache/juneau/serializer/Serializer.java   |    8 +-
 .../juneau/serializer/SerializerBuilder.java       |    6 +-
 .../apache/juneau/serializer/WriterSerializer.java |    2 +-
 .../serializer/annotation/SerializerConfig.java    |   40 +-
 .../org/apache/juneau/soap/annotation/SoapXml.java |    2 +-
 .../juneau/soap/annotation/SoapXmlConfig.java      |    2 +-
 .../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 +-
 .../java/org/apache/juneau/svl/ResolvingOMap.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 +-
 .../java/org/apache/juneau/svl/VarResolver.java    |    2 +-
 .../org/apache/juneau/svl/VarResolverBuilder.java  |    2 +-
 .../org/apache/juneau/svl/VarResolverContext.java  |    2 +-
 .../org/apache/juneau/svl/VarResolverSession.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 +-
 .../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 +-
 .../org/apache/juneau/transform/BeanFilter.java    |    2 +-
 .../apache/juneau/transform/BeanFilterBuilder.java |    2 +-
 .../java/org/apache/juneau/transform/Builder.java  |    2 +-
 .../org/apache/juneau/transform/BuilderSwap.java   |    2 +-
 .../java/org/apache/juneau/transform/PojoSwap.java |   12 +-
 .../org/apache/juneau/transform/Surrogate.java     |    2 +-
 .../java/org/apache/juneau/uon/UonSerializer.java  |    2 +-
 .../java/org/apache/juneau/uon/annotation/Uon.java |    2 +-
 .../apache/juneau/uon/annotation/UonConfig.java    |   12 +-
 .../juneau/urlencoding/UrlEncodingSerializer.java  |    2 +-
 .../juneau/urlencoding/annotation/UrlEncoding.java |    2 +-
 .../urlencoding/annotation/UrlEncodingConfig.java  |    4 +-
 .../java/org/apache/juneau/xml/XmlSerializer.java  |   14 +-
 .../java/org/apache/juneau/xml/annotation/Xml.java |    2 +-
 .../apache/juneau/xml/annotation/XmlConfig.java    |   32 +-
 juneau-doc/docs/ReleaseNotes/7.1.0.html            |   16 +-
 juneau-doc/docs/ReleaseNotes/7.2.0.html            |    4 +-
 juneau-doc/docs/ReleaseNotes/7.2.1.html            |    2 +-
 juneau-doc/docs/ReleaseNotes/8.1.0.html            |   22 +-
 juneau-doc/docs/ReleaseNotes/8.1.3.html            |    8 +-
 juneau-doc/docs/ReleaseNotes/8.1.4.html            |   37 +-
 .../Topics/02.juneau-marshall/01.Serializers.html  |   26 +-
 .../docs/Topics/02.juneau-marshall/02.Parsers.html |   54 +-
 .../Topics/02.juneau-marshall/03.Marshalls.html    |   12 +-
 .../02.juneau-marshall/04.JavaBeansSupport.html    |  130 +
 .../01.BeanAnnotation.html}                        |   50 +-
 .../02.BeanpAnnotation.html}                       |   22 +-
 .../03.BeancAnnotation.html}                       |   20 +-
 .../04.BeanIgnoreAnnotation.html}                  |    0
 .../05.NamePropertyAnnotation.html}                |    0
 .../06.ParentPropertyAnnotation.html}              |    0
 .../07.PojoBuilders.html}                          |   20 +-
 .../08.BeanFilters.html}                           |    4 +-
 .../09.InterfaceFilters.html}                      |    8 +-
 .../10.StopClasses.html}                           |    2 +-
 .../11.BypassSerialization.html}                   |   13 +-
 ...erializers.html => 05.HttpPartSerializers.html} |   17 +-
 ...ttpPartParsers.html => 06.HttpPartParsers.html} |   20 +-
 ...html => 07.MarshallConfigurableProperties.html} |   10 +-
 ...ations.html => 08.ConfigurableAnnotations.html} |   16 +-
 .../{08.ObjectMap.html => 09.OMap.html}            |   36 +-
 .../{09.Groups.html => 10.Groups.html}             |   12 +-
 ...11.ContextsBuildersSessionsPropertyStores.html} |    8 +-
 .../{11.Transforms.html => 12.Transforms.html}     |    0
 .../01.PojoSwaps.html                              |   66 +-
 .../02.DefaultPojoSwaps.html                       |    0
 .../03.AutoPojoSwaps.html                          |   28 +-
 .../04.PerMediaTypePojoSwaps.html                  |   22 +-
 .../05.OneWayPojoSwaps.html                        |   20 +-
 .../06.SwapAnnotation.html                         |   12 +-
 .../07.TemplatedSwaps.html                         |    4 +-
 .../08.SurrogateClasses.html                       |   14 +-
 ....html => 13.DynamicallyAppliedAnnotations.html} |    8 +-
 ...nDictionaries.html => 14.BeanDictionaries.html} |   12 +-
 .../01.BeanSubTypes.html                           |   16 +-
 .../{14.VirtualBeans.html => 15.VirtualBeans.html} |   16 +-
 .../{15.Recursion.html => 16.Recursion.html}       |   18 +-
 ...odels.html => 17.ParsingIntoGenericModels.html} |   20 +-
 ...reams.html => 18.ReadingContinuousStreams.html} |   18 +-
 .../{18.URIs.html => 19.MarshallingUris.html}      |    4 +-
 ...onComparison.html => 20.JacksonComparison.html} |    4 +-
 ....PojoCategories.html => 21.PojoCategories.html} |    3 +
 .../{21.JsonDetails.html => 22.JsonDetails.html}   |    2 +-
 .../01.JsonMethodology.html}                       |    0
 .../02.JsonSerializers.html}                       |    2 +-
 .../03.SimplifiedJson.html                         |    6 +-
 .../04.JsonParsers.html}                           |    2 +-
 .../05.JsonAnnotation.html                         |    0
 .../06.JsonSchema.html                             |    6 +-
 .../22.XmlDetails/08.XmlSchema.html                |  269 -
 .../{22.XmlDetails.html => 23.XmlDetails.html}     |    2 +-
 .../01.XmlMethodology.html}                        |   23 +-
 .../02.XmlSerializers.html}                        |    2 +-
 .../03.XmlParsers.html}                            |    2 +-
 .../04.XmlBeanTypeNameAnnotation.html}             |   68 +-
 .../05.XmlChildNameAnnotation.html                 |    6 +-
 .../06.XmlFormatAnnotation.html                    |   80 +-
 .../07.XmlNamespaces.html}                         |   10 +-
 .../{23.HtmlDetails.html => 24.HtmlDetails.html}   |    0
 .../01.HtmlMethodology.html}                       |   22 +-
 .../02.HtmlSerializers.html}                       |    2 +-
 .../03.HtmlParsers.html}                           |    2 +-
 .../04.HtmlAnnotation.html                         |    4 +-
 .../05.HtmlRenderAnnotation.html                   |   34 +-
 .../06.HtmlDocSerializer.html                      |   26 +-
 .../07.BasicHtmlDocTemplate.html                   |    0
 .../08.HtmlCustomTemplates.html}                   |    0
 .../09.HtmlSchema.html                             |    6 +-
 .../{24.UonDetails.html => 25.UonDetails.html}     |    2 +-
 .../01.UonMethodology.html}                        |    0
 .../02.UonSerializers.html}                        |    2 +-
 .../03.UonParsers.html}                            |    2 +-
 ...dingDetails.html => 26.UrlEncodingDetails.html} |    2 +-
 .../01.UrlEncMethodology.html}                     |    0
 .../02.UrlEncSerializers.html}                     |    2 +-
 .../03.UrlEncParsers.html}                         |    2 +-
 .../04.UrlEncodingAnnotation.html                  |    0
 ....MsgPackDetails.html => 27.MsgPackDetails.html} |    0
 .../01.MsgPackSerializers.html}                    |    2 +-
 .../02.MsgPackParsers.html}                        |    2 +-
 ....OpenApiDetails.html => 28.OpenApiDetails.html} |    1 +
 .../01.OpenApiMethodology.html}                    |   33 +-
 .../02.OpenApiSerializers.html}                    |  140 +-
 .../03.OpenApiParsers.html}                        |   76 +-
 ...anguage.html => 29.SimpleVariableLanguage.html} |    4 +-
 .../01.SvlVariables.html                           |   10 +-
 .../02.VarResolvers.html                           |    2 +-
 .../03.DefaultVarResolver.html                     |    0
 .../04.SvlOtherNotes.html}                         |    0
 ...29.BestPractices.html => 30.BestPractices.html} |    0
 .../03.juneau-marshall-rdf/01.RdfDetails.html      |   12 +-
 ...{01.Serializers.html => 01.RdfSerializers.html} |    2 +-
 .../{02.Parsers.html => 02.RdfParsers.html}        |    2 +-
 .../{04.Namespaces.html => 04.RdfNamespaces.html}  |    2 +-
 ...UriProperties.html => 05.RdfUriProperties.html} |   18 +-
 ...6.RootProperty.html => 06.RdfRootProperty.html} |    2 +-
 ...TypedLiterals.html => 07.RdfTypedLiterals.html} |    2 +-
 .../{01.HTML5.html => 01.DtoHtml5.html}            |   12 +-
 .../{02.Atom.html => 02.DtoAtom.html}              |    6 +-
 .../{03.Swagger.html => 03.DtoSwagger.html}        |   14 +-
 .../{04.SwaggerUI.html => 04.DtoSwaggerUi.html}    |   22 +-
 .../{01.Overview.html => 01.ConfigOverview.html}   |   12 +-
 ....SyntaxRules.html => 01.ConfigSyntaxRules.html} |    0
 ...02.EntryTypes.html => 02.ConfigEntryTypes.html} |    0
 .../01.ConfigPrimitiveTypes.html}                  |    0
 .../02.ConfigPojos.html}                           |    8 +-
 .../03.ConfigArrays.html}                          |    8 +-
 .../04.ConfigCollections.html}                     |    6 +-
 .../05.ConfigBinaryData.html}                      |    2 +-
 .../{03.Variables.html => 03.ConfigVariables.html} |   10 +-
 .../01.ConfigLogicVariables.html}                  |    0
 ...edEntries.html => 04.ConfigEncodedEntries.html} |    0
 ....SectionMaps.html => 05.ConfigSectionMaps.html} |   12 +-
 ...ectionBeans.html => 06.ConfigSectionBeans.html} |    4 +-
 ...rfaces.html => 07.ConfigSectionInterfaces.html} |   22 +-
 ...tingValues.html => 08.ConfigSettingValues.html} |    6 +-
 .../01.ConfigFileSystemChanges.html}               |    0
 .../02.ConfigCustomEntrySerialization.html}        |    4 +-
 .../03.ConfigBulkSettingValues.html}               |    0
 .../{09.Listeners.html => 09.ConfigListeners.html} |   20 +-
 ....Serializing.html => 10.ConfigSerializing.html} |    0
 .../{11.Imports.html => 11.ConfigImports.html}     |   26 +-
 .../Topics/05.juneau-config/12.ConfigStores.html   |    8 +-
 .../12.ConfigStores/01.ConfigMemoryStore.html      |   20 +-
 .../12.ConfigStores/02.ConfigFileStore.html        |    4 +-
 .../12.ConfigStores/03.CustomConfigStores.html     |   83 +-
 .../05.juneau-config/13.ReadOnlyConfigs.html       |    2 +-
 .../Topics/05.juneau-config/14.ClosingConfigs.html |    4 +-
 ...dExample.html => 01.RestHelloWorldExample.html} |   28 +-
 ...ssHierarchy.html => 02.RestClassHierarchy.html} |    0
 ...nstantiation.html => 03.RestInstantiation.html} |    0
 .../01.RestServlet.html                            |    0
 .../02.BasicRestServlet.html                       |    0
 .../03.BasicRest.html                              |    0
 .../04.RestChildren.html}                          |    0
 .../05.BasicRestServletGroup.html                  |    0
 .../06.BasicRestGroup.html                         |    0
 .../07.RestResourceResolvers.html}                 |    0
 .../08.RestLifecycleHooks.html}                    |    0
 .../{04.Rest.html => 04.RestAnnotation.html}       |    0
 .../01.RestAnnotationInheritance.html}             |    0
 .../02.RestPath.html                               |    0
 ...thodParameters.html => 01.RestmParameters.html} |    0
 ...2.RestRequest.html => 02.RestmRestRequest.html} |    2 +-
 ...RestResponse.html => 03.RestmRestResponse.html} |    0
 ...4.RequestBody.html => 04.RestmRequestBody.html} |    0
 ...estHeaders.html => 05.RestmRequestHeaders.html} |    0
 ...ributes.html => 06.RestmRequestAttributes.html} |    0
 ...RequestQuery.html => 07.RestmRequestQuery.html} |    0
 ...tFormData.html => 08.RestmRequestFormData.html} |    0
 .../{09.RestMethodPath.html => 09.RestmPath.html}  |    0
 ...athMatch.html => 10.RestmRequestPathMatch.html} |    0
 ...odReturnTypes.html => 11.RestmReturnTypes.html} |    0
 ...erResource.html => 12.RestmReaderResource.html} |    0
 ...amResource.html => 13.RestmStreamResource.html} |    0
 ...stMethodMatchers.html => 14.RestmMatchers.html} |    0
 ...onses.html => 15.RestmPredefinedResponses.html} |    0
 ...ions.html => 16.RestmPredefinedExceptions.html} |    0
 ...ans.html => 17.RestmPredefinedHelperBeans.html} |    0
 .../{07.restRPC.html => 07.RestRpc.html}           |    0
 ...g.html => 08.RestOpenApiSchemaPartParsing.html} |    2 +-
 ...ml => 09.RestOpenApiSchemaPartSerializing.html} |    2 +-
 ...ations.html => 10.RestHttpPartAnnotations.html} |    0
 .../01.RestBodyAnnotation.html}                    |    6 +-
 .../02.RestFormDataAnnotation.html}                |    6 +-
 .../03.RestHasFormDataAnnotation.html}             |    0
 .../04.RestQueryAnnotation.html}                   |    6 +-
 .../05.RestHasQueryAnnotation.html}                |    0
 .../06.RestHeaderAnnotation.html}                  |    6 +-
 .../07.RestPathAnnotation.html}                    |    6 +-
 .../08.RestRequestAnnotation.html}                 |    0
 .../09.RestResponseAnnotation.html}                |    2 +-
 .../10.RestResponseHeaderAnnotation.html}          |    0
 .../11.RestResponseStatusAnnotation.html}          |    0
 ...ormPosts.html => 11.RestHandlingFormPosts.html} |    0
 ...html => 12.RestHandlingMultiPartFormPosts.html} |    0
 ...13.Serializers.html => 13.RestSerializers.html} |    0
 .../{14.Parsers.html => 14.RestParsers.html}       |    0
 ...ies.html => 15.RestConfigurableProperties.html} |    2 +-
 ...ns.html => 16.RestConfigurableAnnotations.html} |    0
 .../{17.Transforms.html => 17.RestTransforms.html} |    2 +-
 .../{18.URIs.html => 18.RestHandlingUris.html}     |    2 +-
 .../{19.Guards.html => 19.RestGuards.html}         |    0
 .../{20.RoleGuards.html => 20.RestRoleGuards.html} |    0
 .../{21.Converters.html => 21.RestConverters.html} |    0
 .../{22.Messages.html => 22.RestMessages.html}     |    8 +-
 .../{23.Encoders.html => 23.RestEncoders.html}     |    0
 ....SvlVariables.html => 24.RestSvlVariables.html} |    2 +-
 ...onFiles.html => 25.RestConfigurationFiles.html} |    0
 ...26.StaticFiles.html => 26.RestStaticFiles.html} |    0
 ...ersioning.html => 27.RestClientVersioning.html} |    0
 .../{29.Swagger.html => 29.RestSwagger.html}       |    0
 .../01.RestSwaggerBasicRestServlet.html}           |    0
 .../02.RestSwaggerBasicSwaggerInfo.html}           |    2 +-
 .../03.RestSwaggerTags.html}                       |    0
 .../04.RestSwaggerOperations.html}                 |    0
 .../05.RestSwaggerParameters.html}                 |    0
 .../06.RestSwaggerParameterExamples.html}          |    0
 .../07.RestSwaggerResponses.html}                  |    6 +-
 .../08.RestSwaggerResponseExamples.html}           |    0
 .../09.RestSwaggerModels.html}                     |    0
 .../10.RestSwaggerStylesheet.html}                 |    0
 .../juneau-rest-server.Swagger.Models.1.png        |  Bin
 .../juneau-rest-server.Swagger.Models.2.png        |  Bin
 .../juneau-rest-server.Swagger.Models.3.png        |  Bin
 .../juneau-rest-server.Swagger.Operations.1.png    |  Bin
 .../juneau-rest-server.Swagger.Operations.2.png    |  Bin
 .../juneau-rest-server.Swagger.Operations.3.png    |  Bin
 .../juneau-rest-server.Swagger.Parameters.1.png    |  Bin
 .../juneau-rest-server.Swagger.Parameters.2.png    |  Bin
 .../juneau-rest-server.Swagger.Parameters.3.png    |  Bin
 .../juneau-rest-server.Swagger.Parameters.4.png    |  Bin
 ...neau-rest-server.Swagger.ResponseExamples.1.png |  Bin
 ...neau-rest-server.Swagger.ResponseExamples.2.png |  Bin
 ...neau-rest-server.Swagger.ResponseExamples.3.png |  Bin
 ...neau-rest-server.Swagger.ResponseExamples.4.png |  Bin
 ...istics.html => 30.RestExecutionStatistics.html} |    0
 ...notation.html => 31.RestHtmlDocAnnotation.html} |    0
 .../01.RestHtmlUIvsDI.html}                        |    0
 .../02.RestHtmlWidgets.html}                       |    0
 .../03.RestHtmlPredefinedWidgets.html}             |    0
 .../04.RestHtmlUiCustomization.html}               |    2 +-
 .../05.RestHtmlStylesheets.html}                   |    0
 ...erver.HtmlDocAnnotation.PredefinedWidgets.1.png |  Bin
 ...erver.HtmlDocAnnotation.PredefinedWidgets.2.png |  Bin
 ...erver.HtmlDocAnnotation.PredefinedWidgets.3.png |  Bin
 ...erver.HtmlDocAnnotation.PredefinedWidgets.4.png |  Bin
 ...aultHeaders.html => 32.RestDefaultHeaders.html} |    0
 .../01.RestLoggingAndErrorHandlingLog4j.html}      |    0
 ...ugging.html => 33.RestLoggingAndDebugging.html} |    0
 ...tatusCodes.html => 34.RestHttpStatusCodes.html} |    0
 ...ods.html => 35.RestOverloadingHttpMethods.html} |    0
 ...rameters.html => 36.RestBuiltInParameters.html} |    0
 ...tml => 37.RestCustomSerializersAndParsers.html} |    0
 ...singWithOsgi.html => 38.RestUsingWithOsgi.html} |    0
 .../{39.Injection.html => 39.RestInjection.html}   |    0
 .../{40.HTTP2.html => 40.RestHttp2.html}           |    0
 .../{41.OtherNotes.html => 41.RestOtherNotes.html} |    0
 ...BaseProvider.html => 01.JaxrsBaseProvider.html} |    0
 ...01.Overview.html => 01.SpringBootOverview.html} |    0
 ...urces.html => 02.SpringBootChildResources.html} |    0
 ...rshalling.html => 01.RestcPojoMarshalling.html} |    0
 ...estHeaders.html => 02.RestcRequestHeaders.html} |    0
 ...rs.html => 03.RestcRequestQueryParameters.html} |    0
 ...tFormData.html => 04.RestcRequestFormData.html} |    0
 ...5.RequestBody.html => 05.RestcRequestBody.html} |    0
 ...onseStatus.html => 06.RestcResponseStatus.html} |    0
 ...seHeaders.html => 07.RestcResponseHeaders.html} |    0
 ...ResponseBody.html => 08.RestcResponseBody.html} |    0
 ...ndlers.html => 09.RestcCustomCallHandlers.html} |    0
 ...Interceptors.html => 10.RestcInterceptors.html} |    0
 .../{11.RestProxies.html => 11.RestcProxies.html}  |    0
 .../01.RestcRemote.html}                           |    4 +-
 .../02.RestcRemoteMethod.html}                     |    2 +-
 .../03.RestcBody.html}                             |    4 +-
 .../04.RestcFormData.html}                         |    2 +-
 .../05.RestcQuery.html}                            |    2 +-
 .../06.RestcHeader.html}                           |    2 +-
 .../07.RestcPath.html}                             |    2 +-
 .../08.RestcRequest.html}                          |    0
 .../09.RestcResponse.html}                         |    0
 .../10.RestcDualPurposeInterfaces.html}            |    0
 ...gging.html => 12.RestcLoggingAndDebugging.html} |    0
 ...ent.html => 13.RestcCustomizingHttpClient.html} |    0
 ...lient.html => 14.RestcExtendingRestClient.html} |    0
 ...hentication.html => 15.RestAuthentication.html} |    0
 .../01.RestcAuthenticationBASIC.html}              |    0
 .../02.RestcAuthenticationFormFORM.html}           |    0
 .../03.RestcAuthenticationOIDC.html}               |    0
 ...rview.html => 01.MicroserviceCoreOverview.html} |    0
 ...s.html => 02.MicroserviceLifecycleMethods.html} |    0
 .../{03.Args.html => 03.MicroserviceArgs.html}     |    0
 ....Manifest.html => 04.MicroserviceManifest.html} |    0
 .../{05.Config.html => 05.MicroserviceConfig.html} |    0
 ...s.html => 06.MicroserviceSystemProperties.html} |    0
 ...solver.html => 07.MicroserviceVarResolver.html} |    2 +-
 ...ds.html => 08.MicroserviceConsoleCommands.html} |    0
 ...09.Logging.html => 09.MicroserviceLogging.html} |    4 +-
 ...isteners.html => 10.MicroserviceListeners.html} |    0
 ...view.html => 01.MicroserviceJettyOverview.html} |    0
 ...l => 02.MicroserviceJettyLifecycleMethods.html} |    0
 ...ml => 03.MicroserviceJettyResourceClasses.html} |    0
 ...icroserviceJettyPredefinedResourceClasses.html} |    0
 ...Config.html => 05.MicroserviceJettyConfig.html} |    8 +-
 ....JettyXml.html => 06.MicroserviceJettyXml.html} |    0
 ...ml => 07.MicroserviceJettyUiCustomization.html} |    0
 ...ing.html => 08.MicroserviceJettyExtending.html} |    0
 ....html => 01.MyJettyMicroserviceInstalling.html} |    0
 ...ing.html => 02.MyJettyMicroserviceRunning.html} |    0
 ...ng.html => 03.MyJettyMicroserviceBuilding.html} |    0
 ... => 01.MySpringBootMicroserviceInstalling.html} |    0
 ...tml => 02.MySpringBootMicroserviceRunning.html} |    0
 ...ml => 03.MySpringBootMicroserviceBuilding.html} |    0
 ...talling.html => 01.CoreExamplesInstalling.html} |    0
 .../{02.Examples.html => 02.CoreExamples.html}     |    0
 ...rces.html => 01.RestExamplesRootResources.html} |    0
 ...html => 02.RestExamplesHelloWorldResource.html} |    0
 ...amples.html => 03.RestExamplesDtoExamples.html} |    0
 ...rce.html => 04.RestExamplesConfigResource.html} |    0
 ...ource.html => 05.RestExamplesLogsResource.html} |    0
 ...ng.html => 01.RestJettyExamplesInstalling.html} |    0
 ...nning.html => 02.RestJettyExamplesRunning.html} |    0
 ...ding.html => 03.RestJettyExamplesBuilding.html} |    0
 ...ml => 01.RestSpringBootExamplesInstalling.html} |    0
 ....html => 02.RestSpringBootExamplesRunning.html} |    0
 ...html => 03.RestSpringBootExamplesBuilding.html} |    0
 ...4.RestSpringBootExamplesDeployingToHeroku.html} |    0
 ....Installing.html => 01.PetStoreInstalling.html} |    0
 .../{02.Running.html => 02.PetStoreRunning.html}   |    0
 .../{03.Building.html => 03.PetStoreBuilding.html} |    0
 ...upport.html => 01.GlossaryLanguageSupport.html} |   22 +-
 ...nnotations.html => 02.GlossaryAnnotations.html} |    0
 ...html => 03.GlossaryConfigurableProperties.html} |    0
 ...neau-marshall.html => 01.SecurityMarshall.html} |    0
 .../{02.juneau-svl.html => 02.SecuritySvl.html}    |    0
 ...uneau-rest-server.html => 03.SecurityRest.html} |    0
 juneau-doc/docs/docs.txt                           |  106 +-
 juneau-doc/juneau-doc.jar                          |  Bin 0 -> 32108 bytes
 .../apache/juneau/doc/internal/DocGenerator.java   |    6 +-
 .../org/apache/juneau/doc/internal/DocStore.java   |   10 +-
 juneau-doc/src/main/javadoc/overview.html          | 7687 +++++++++-----------
 juneau-doc/src/main/javadoc/resources/docs.txt     |  873 ++-
 .../src/main/javadoc/resources/fragments/toc.html  |  486 +-
 .../src/main/javadoc/resources/juneau-doc.css      |    8 +-
 .../juneau/rest/client/remote/RemoteMeta.java      |    2 +-
 .../juneau/rest/client/remote/RemoteMethod.java    |    2 +-
 .../juneau/rest/client/remote/RemoteMethodArg.java |    2 +-
 .../rest/client/remote/RemoteMethodBeanArg.java    |    2 +-
 .../rest/client/remote/RemoteMethodMeta.java       |    2 +-
 .../rest/client/remote/RemoteMethodReturn.java     |    2 +-
 .../juneau/rest/client/remote/RemoteResource.java  |    2 +-
 .../org/apache/juneau/rest/client2/RestClient.java |   16 +-
 .../juneau/rest/client2/RestClientBuilder.java     |    6 +-
 .../java/org/apache/juneau/rest/BasicRest.java     |    2 +-
 .../apache/juneau/rest/BasicRestCallLogger.java    |    2 +-
 .../org/apache/juneau/rest/BasicRestGroup.java     |    2 +-
 .../apache/juneau/rest/BasicRestInfoProvider.java  |    2 +-
 .../org/apache/juneau/rest/BasicRestLogger.java    |    2 +-
 .../juneau/rest/BasicRestResourceResolver.java     |    2 +-
 .../org/apache/juneau/rest/BasicRestServlet.java   |    2 +-
 .../apache/juneau/rest/BasicRestServletGroup.java  |    2 +-
 .../apache/juneau/rest/ClientVersionMatcher.java   |    2 +-
 .../org/apache/juneau/rest/HtmlDocBuilder.java     |   30 +-
 .../org/apache/juneau/rest/NoOpRestLogger.java     |    2 +-
 .../org/apache/juneau/rest/RequestAttributes.java  |    2 +-
 .../java/org/apache/juneau/rest/RequestBody.java   |    2 +-
 .../org/apache/juneau/rest/RequestFormData.java    |    2 +-
 .../org/apache/juneau/rest/RequestHeaders.java     |    2 +-
 .../java/org/apache/juneau/rest/RequestPath.java   |    2 +-
 .../org/apache/juneau/rest/RequestProperties.java  |    2 +-
 .../java/org/apache/juneau/rest/RequestQuery.java  |    2 +-
 .../org/apache/juneau/rest/ResponseHandler.java    |    2 +-
 .../org/apache/juneau/rest/RestCallLogger.java     |    2 +-
 .../java/org/apache/juneau/rest/RestChild.java     |    2 +-
 .../java/org/apache/juneau/rest/RestContext.java   |   36 +-
 .../org/apache/juneau/rest/RestContextBuilder.java |   10 +-
 .../apache/juneau/rest/RestContextProperties.java  |    2 +-
 .../java/org/apache/juneau/rest/RestConverter.java |    2 +-
 .../java/org/apache/juneau/rest/RestGuard.java     |    2 +-
 .../org/apache/juneau/rest/RestInfoProvider.java   |    2 +-
 .../java/org/apache/juneau/rest/RestLogger.java    |    2 +-
 .../java/org/apache/juneau/rest/RestMatcher.java   |    2 +-
 .../org/apache/juneau/rest/RestMethodContext.java  |    8 +-
 .../org/apache/juneau/rest/RestMethodParam.java    |    2 +-
 .../apache/juneau/rest/RestMethodProperties.java   |    2 +-
 .../org/apache/juneau/rest/RestParamDefaults.java  |    2 +-
 .../java/org/apache/juneau/rest/RestParamType.java |    2 +-
 .../java/org/apache/juneau/rest/RestRequest.java   |   32 +-
 .../apache/juneau/rest/RestResourceResolver.java   |    2 +-
 .../java/org/apache/juneau/rest/RestResponse.java  |   10 +-
 .../java/org/apache/juneau/rest/RestServlet.java   |    2 +-
 .../org/apache/juneau/rest/StaticFileMapping.java  |    2 +-
 .../org/apache/juneau/rest/SwaggerGenerator.java   |    2 +-
 .../apache/juneau/rest/annotation/HookEvent.java   |    2 +-
 .../org/apache/juneau/rest/annotation/HtmlDoc.java |   26 +-
 .../org/apache/juneau/rest/annotation/Logging.java |   20 +-
 .../apache/juneau/rest/annotation/LoggingRule.java |   32 +-
 .../org/apache/juneau/rest/annotation/Method.java  |    2 +-
 .../juneau/rest/annotation/MethodSwagger.java      |   42 +-
 .../apache/juneau/rest/annotation/Property.java    |    2 +-
 .../juneau/rest/annotation/ResourceSwagger.java    |   34 +-
 .../org/apache/juneau/rest/annotation/Rest.java    |   74 +-
 .../apache/juneau/rest/annotation/RestHook.java    |    2 +-
 .../apache/juneau/rest/annotation/RestMethod.java  |   34 +-
 .../juneau/rest/annotation/RestResource.java       |   78 +-
 .../juneau/rest/converters/Introspectable.java     |    2 +-
 .../apache/juneau/rest/converters/Queryable.java   |    2 +-
 .../apache/juneau/rest/converters/Traversable.java |    2 +-
 .../apache/juneau/rest/helper/BeanDescription.java |    2 +-
 .../rest/helper/ChildResourceDescriptions.java     |    2 +-
 .../juneau/rest/helper/ResourceDescription.java    |    2 +-
 .../rest/matchers/MultipartFormDataMatcher.java    |    2 +-
 .../rest/matchers/UrlEncodedFormMatcher.java       |    2 +-
 .../org/apache/juneau/rest/remote/RrpcServlet.java |    2 +-
 .../juneau/rest/reshandlers/DefaultHandler.java    |    2 +-
 .../rest/reshandlers/InputStreamHandler.java       |    2 +-
 .../juneau/rest/reshandlers/ReaderHandler.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 +-
 .../org/apache/juneau/rest/vars/RequestVar.java    |    2 +-
 .../org/apache/juneau/rest/vars/RestInfoVar.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 +-
 .../org/apache/juneau/rest/vars/WidgetVar.java     |    2 +-
 .../juneau/rest/widget/ContentTypeMenuItem.java    |    2 +-
 .../apache/juneau/rest/widget/MenuItemWidget.java  |    2 +-
 .../apache/juneau/rest/widget/PoweredByApache.java |    2 +-
 .../apache/juneau/rest/widget/PoweredByJuneau.java |    2 +-
 .../apache/juneau/rest/widget/QueryMenuItem.java   |    2 +-
 .../apache/juneau/rest/widget/ThemeMenuItem.java   |    2 +-
 .../org/apache/juneau/rest/widget/Tooltip.java     |    2 +-
 .../java/org/apache/juneau/rest/widget/Widget.java |    8 +-
 launches/juneau-env.sh                             |    1 +
 781 files changed, 8000 insertions(+), 7832 deletions(-)

diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigEncoder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigEncoder.java
index 29a2384..0e4e6c7 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigEncoder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigEncoder.java
@@ -18,7 +18,7 @@ import org.apache.juneau.config.*;
  * API for defining a string encoding/decoding mechanism for entries in {@link Config}.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-config.EncodedEntries}
+ * 	<li class='link'>{@doc ConfigEncodedEntries}
  * </ul>
  */
 public interface ConfigEncoder {
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigXorEncoder.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigXorEncoder.java
index bcd8e16..71fbf58 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigXorEncoder.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/encode/ConfigXorEncoder.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 juneau-config.EncodedEntries}
+ * 	<li class='link'>{@doc ConfigEncodedEntries}
  * </ul>
  */
 public final class ConfigXorEncoder implements ConfigEncoder {
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 cc7c8c0..0e14b01 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
@@ -44,8 +44,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 juneau-marshall.SimpleVariableLanguage.VarResolvers}
- * 	<li class='link'>{@doc juneau-config.Variables}
+ * 	<li class='link'>{@doc VarResolvers}
+ * 	<li class='link'>{@doc ConfigVariables}
  * </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 c26958e..39935e0 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,7 +38,7 @@ import org.apache.juneau.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 fc39182..880620f 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
@@ -38,7 +38,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 3b824ab..9bc9d4b 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
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 80aadcc..0c6179d 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,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
  * Parent class of {@link Entry}, {@link Feed}, and {@link Source}.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 8a392d9..b5f569b 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
@@ -63,7 +63,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 c017555..8f6ea84 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
@@ -43,7 +43,7 @@ import org.apache.juneau.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 4051462..c71c847 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
@@ -48,7 +48,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 33925b6..6e2baa4 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
@@ -36,7 +36,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 e00217b..c86e3f0 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,7 +34,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 9739bf7..8ac5884 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
@@ -29,7 +29,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 c3ec92e..951667a 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
@@ -36,7 +36,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 b362408..de69fff 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,7 +34,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 3a19f1d..7275b40 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
@@ -35,7 +35,7 @@ import org.apache.juneau.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 d7fd4b6..30144e9 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,7 +41,7 @@ import org.apache.juneau.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 07c79f5..44bf5ce 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,7 +42,7 @@ import org.apache.juneau.xml.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 7cae209..95ae370 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,7 +20,7 @@ import javax.xml.bind.*;
  * Static utility methods for ATOM marshalling code.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Atom}
+ * 	<li class='link'>{@doc DtoAtom}
  * 	<li class='jp'>{@doc package-summary.html#TOC}
  * </ul>
  */
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 3b67e06..e0888d0 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-a-element <a>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-a-element <a>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="a")
@@ -46,7 +46,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-download download} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-download download} attribute.
 	 *
 	 * <p>
 	 * Whether to download the resource instead of navigating to it, and its file name if so.
@@ -62,7 +62,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-href href} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-href href} attribute.
 	 *
 	 * <p>
 	 * Address of the hyperlink.
@@ -85,7 +85,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-hreflang hreflang} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-hreflang hreflang} attribute.
 	 *
 	 * <p>
 	 * Language of the linked resource.
@@ -99,7 +99,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-rel rel} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-rel rel} attribute.
 	 *
 	 * <p>
 	 * Relationship between the document containing the hyperlink and the destination resource.
@@ -113,7 +113,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-target target} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-target target} attribute.
 	 *
 	 * <p>
 	 * Default browsing context for hyperlink navigation and form submission.
@@ -127,7 +127,7 @@ public class A extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-type type} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-type type} 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 a5a927b..eab352c 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-abbr-element <abbr>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-abbr-element <abbr>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 b93aed8..267b28f 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-address-element <address>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-address-element <address>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 468f354..08d92e3 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-area-element <area>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-area-element <area>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="area")
@@ -47,7 +47,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-area-alt alt} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-area-alt alt} attribute.
 	 *
 	 * <p>
 	 * Replacement text for use when images are not available.
@@ -61,7 +61,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-area-coords coords}
+	 * {@doc ExtHTML5.embedded-content-0#attr-area-coords coords}
 	 * attribute.
 	 *
 	 * <p>
@@ -76,7 +76,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-download download} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-download download} attribute.
 	 *
 	 * <p>
 	 * Whether to download the resource instead of navigating to it, and its file name if so.
@@ -92,7 +92,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-href href} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-href href} attribute.
 	 *
 	 * <p>
 	 * Address of the hyperlink.
@@ -115,7 +115,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-hreflang hreflang} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-hreflang hreflang} attribute.
 	 *
 	 * <p>
 	 * Language of the linked resource.
@@ -129,7 +129,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-rel rel} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-rel rel} attribute.
 	 *
 	 * <p>
 	 * Relationship between the document containing the hyperlink and the destination resource.
@@ -143,7 +143,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-area-shape shape} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-area-shape shape} attribute.
 	 *
 	 * <p>
 	 * The kind of shape to be created in an image map.
@@ -157,7 +157,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-target target} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-target target} attribute.
 	 *
 	 * <p>
 	 * Browsing context for hyperlink navigation.
@@ -171,7 +171,7 @@ public class Area extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-hyperlink-type type} attribute.
+	 * {@doc ExtHTML5.links#attr-hyperlink-type type} 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 a0414ae..c97f829 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-article-element <article>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-article-element <article>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 70c88b3..c790a9a 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-aside-element <aside>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-aside-element <aside>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 b271b2f..64e7ac8 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-audio-element <audio>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-audio-element <audio>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="audio")
@@ -44,7 +44,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-autoplay autoplay}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-autoplay autoplay}
 	 * attribute.
 	 *
 	 * <p>
@@ -61,7 +61,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-controls controls}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-controls controls}
 	 * attribute.
 	 *
 	 * <p>
@@ -78,7 +78,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-crossorigin crossorigin}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-crossorigin crossorigin}
 	 * attribute.
 	 *
 	 * <p>
@@ -93,7 +93,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-loop loop} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-loop loop} attribute.
 	 *
 	 * <p>
 	 * Whether to loop the media resource.
@@ -109,7 +109,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-mediagroup mediagroup}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-mediagroup mediagroup}
 	 * attribute.
 	 *
 	 * <p>
@@ -124,7 +124,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-muted muted}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-muted muted}
 	 * attribute.
 	 *
 	 * <p>
@@ -141,7 +141,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-preload preload}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-preload preload}
 	 * attribute.
 	 *
 	 * <p>
@@ -156,7 +156,7 @@ public class Audio extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-src src} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-src src} 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 f24fbd9..1e1b62b 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-b-element <b>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-b-element <b>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 0ef2f7a..e197c88 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.document-metadata#the-base-element <base>}
+ * DTO for an HTML {@doc ExtHTML5.document-metadata#the-base-element <base>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="base")
@@ -44,7 +44,7 @@ public class Base extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-base-href href} attribute.
+	 * {@doc ExtHTML5.document-metadata#attr-base-href href} attribute.
 	 *
 	 * <p>
 	 * Document base URL.
@@ -67,7 +67,7 @@ public class Base extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-base-target target}
+	 * {@doc ExtHTML5.document-metadata#attr-base-target target}
 	 * 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 abe9bb0..f141f8b 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-bdi-element <bdi>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-bdi-element <bdi>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 cc17f28..db4ffb5 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-bdo-element <bdo>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-bdo-element <bdo>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 86dbf8b..03035b3 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-blockquote-element <blockquote>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-blockquote-element <blockquote>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="blockquote")
@@ -40,7 +40,7 @@ public class Blockquote extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.grouping-content#attr-blockquote-cite cite}
+	 * {@doc ExtHTML5.grouping-content#attr-blockquote-cite cite}
 	 * 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 aa2ec19..0154220 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-body-element <body>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-body-element <body>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="body")
@@ -40,7 +40,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-window-onafterprint onafterprint}
+	 * {@doc ExtHTML5.webappapis#handler-window-onafterprint onafterprint}
 	 * attribute.
 	 *
 	 * @param onafterprint The new value for this attribute.
@@ -52,7 +52,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-window-onbeforeunload onbeforeunload}
+	 * {@doc ExtHTML5.webappapis#handler-window-onbeforeunload onbeforeunload}
 	 * attribute.
 	 *
 	 * @param onbeforeunload The new value for this attribute.
@@ -64,7 +64,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-window-onmessage onmessage}
+	 * {@doc ExtHTML5.webappapis#handler-window-onmessage onmessage}
 	 * attribute.
 	 *
 	 * @param onmessage The new value for this attribute.
@@ -76,7 +76,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-window-ononline ononline}
+	 * {@doc ExtHTML5.webappapis#handler-window-ononline ononline}
 	 * attribute.
 	 *
 	 * @param ononline The new value for this attribute.
@@ -88,7 +88,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-window-onpageshow onpageshow}
+	 * {@doc ExtHTML5.webappapis#handler-window-onpageshow onpageshow}
 	 * attribute.
 	 *
 	 * @param onpageshow The new value for this attribute.
@@ -100,7 +100,7 @@ public class Body extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-window-onstorage onstorage}
+	 * {@doc ExtHTML5.webappapis#handler-window-onstorage onstorage}
 	 * 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 090f7da..91b69a5 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-br-element <br>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-br-element <br>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 30f2803..cfd1218 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-button-element <button>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-button-element <button>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="button")
@@ -55,7 +55,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-autofocus autofocus} attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -71,7 +71,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-disabled disabled} attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -87,7 +87,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -101,7 +101,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formaction formaction} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-formaction formaction} attribute.
 	 *
 	 * <p>
 	 * URL to use for form submission.
@@ -122,7 +122,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formenctype formenctype} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-formenctype formenctype} attribute.
 	 *
 	 * <p>
 	 * Form data set encoding type to use for form submission.
@@ -136,7 +136,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formmethod formmethod} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-formmethod formmethod} attribute.
 	 *
 	 * <p>
 	 * HTTP method to use for form submission.
@@ -150,7 +150,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formnovalidate formnovalidate}
+	 * {@doc ExtHTML5.forms#attr-fs-formnovalidate formnovalidate}
 	 * attribute.
 	 *
 	 * <p>
@@ -165,7 +165,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formtarget formtarget} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-formtarget formtarget} attribute.
 	 *
 	 * <p>
 	 * Browsing context for form submission.
@@ -179,7 +179,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-menu menu} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-menu menu} attribute.
 	 *
 	 * <p>
 	 * Specifies the element's designated pop-up menu.
@@ -193,7 +193,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-name name} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-name name} attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
@@ -207,7 +207,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-button-type type} attribute.
+	 * {@doc ExtHTML5.forms#attr-button-type type} attribute.
 	 *
 	 * <p>
 	 * Type of button.
@@ -221,7 +221,7 @@ public class Button extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-button-value value} attribute.
+	 * {@doc ExtHTML5.forms#attr-button-value value} 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 6ddaee1..1d1b5c6 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.scripting-1#the-canvas-element <canvas>}
+ * DTO for an HTML {@doc ExtHTML5.scripting-1#the-canvas-element <canvas>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="canvas")
@@ -42,7 +42,7 @@ public class Canvas extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.scripting-1#attr-canvas-height height} attribute.
+	 * {@doc ExtHTML5.scripting-1#attr-canvas-height height} attribute.
 	 *
 	 * <p>
 	 * Vertical dimension.
@@ -58,7 +58,7 @@ public class Canvas extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.scripting-1#attr-canvas-width width} attribute.
+	 * {@doc ExtHTML5.scripting-1#attr-canvas-width width} 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 de259c4..69c073b 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-caption-element <caption>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-caption-element <caption>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 71a5b72..1e5ddd4 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-cite-element <cite>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-cite-element <cite>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 bba7b8c..2ad68a0 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-code-element <code>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-code-element <code>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 17bd11f..242ab17 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-col-element <col>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-col-element <col>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="col")
@@ -40,7 +40,7 @@ public class Col extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-col-span span} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-col-span span} 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 b975454..a631c88 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-colgroup-element <colgroup>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-colgroup-element <colgroup>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="colgroup")
@@ -40,7 +40,7 @@ public class Colgroup extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-colgroup-span span} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-colgroup-span span} 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 4007326..d369de3 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-data-element <data>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-data-element <data>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="data")
@@ -41,7 +41,7 @@ public class Data extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.text-level-semantics#attr-data-value value}
+	 * {@doc ExtHTML5.text-level-semantics#attr-data-value value}
 	 * 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 b85b888..222fb5a 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-datalist-element <datalist>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-datalist-element <datalist>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 d4d16ce..af0e805 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-dd-element <dd>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-dd-element <dd>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 68e6fe8..b52413c 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.edits#the-del-element <del>}
+ * DTO for an HTML {@doc ExtHTML5.edits#the-del-element <del>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="del")
@@ -40,7 +40,7 @@ public class Del extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.edits#attr-mod-cite cite} attribute.
+	 * {@doc ExtHTML5.edits#attr-mod-cite cite} attribute.
 	 *
 	 * <p>
 	 * Link to the source of the quotation or more information about the edit.
@@ -54,7 +54,7 @@ public class Del extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.edits#attr-mod-datetime datetime} attribute.
+	 * {@doc ExtHTML5.edits#attr-mod-datetime datetime} 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 7249eb8..6054809 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-dfn-element <dfn>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-dfn-element <dfn>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 94ff397..f70b49b 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-div-element <div>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-div-element <div>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 f6b3098..20f9fdc 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-dl-element <dl>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-dl-element <dl>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 4299426..8b603ed 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-dt-element <dt>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-dt-element <dt>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 1393048..b32f1f6 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-em-element <em>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-em-element <em>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 4ae2203..36b351a 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-embed-element <embed>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-embed-element <embed>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="embed")
@@ -44,7 +44,7 @@ public class Embed extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-height height}
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-height height}
 	 * attribute.
 	 *
 	 * <p>
@@ -61,7 +61,7 @@ public class Embed extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-embed-src src} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-embed-src src} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -84,7 +84,7 @@ public class Embed extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-embed-type type} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-embed-type type} attribute.
 	 *
 	 * <p>
 	 * Type of embedded resource.
@@ -98,7 +98,7 @@ public class Embed extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-width width} 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 4a5c70c..bbb2e52 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-fieldset-element <fieldset>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-fieldset-element <fieldset>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
 */
 @Bean(typeName="fieldset")
@@ -40,7 +40,7 @@ public class Fieldset extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fieldset-disabled disabled} attribute.
+	 * {@doc ExtHTML5.forms#attr-fieldset-disabled disabled} attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -56,7 +56,7 @@ public class Fieldset extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -70,7 +70,7 @@ public class Fieldset extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-name name} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-name name} 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 4d205a7..cd88caa 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-figcaption-element <figcaption>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-figcaption-element <figcaption>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 1249dbc..c7f75c2 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-figure-element <figure>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-figure-element <figure>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 54fe791..3378462 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-footer-element <footer>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-footer-element <footer>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 a3c5779..6cbcbe2 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-form-element <form>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-form-element <form>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="form")
@@ -54,7 +54,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-form-accept-charset accept-charset}
+	 * {@doc ExtHTML5.forms#attr-form-accept-charset accept-charset}
 	 * attribute.
 	 *
 	 * <p>
@@ -69,7 +69,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-action action} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-action action} attribute.
 	 *
 	 * <p>
 	 * URL to use for form submission.
@@ -90,7 +90,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-form-autocomplete autocomplete}
+	 * {@doc ExtHTML5.forms#attr-form-autocomplete autocomplete}
 	 * attribute.
 	 *
 	 * <p>
@@ -105,7 +105,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-enctype enctype} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-enctype enctype} attribute.
 	 *
 	 * <p>
 	 * Form data set encoding type to use for form submission.
@@ -119,7 +119,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-method method} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-method method} attribute.
 	 *
 	 * <p>
 	 * HTTP method to use for form submission.
@@ -133,7 +133,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-form-name name} attribute.
+	 * {@doc ExtHTML5.forms#attr-form-name name} attribute.
 	 *
 	 * <p>
 	 * Name of form to use in the document.forms API.
@@ -147,7 +147,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-novalidate novalidate} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-novalidate novalidate} attribute.
 	 *
 	 * <p>
 	 * Bypass form control validation for form submission.
@@ -162,7 +162,7 @@ public class Form extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-target target} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-target target} 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 9d23a60..f91ff8b 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h1>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h1>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 e233562..58bce34 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h2>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h2>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 ff5b7a7..f680f08 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h3>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h3>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 4e983a0..9fadbea 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h4>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h4>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 6bb2bc9..0b7a6b5 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h5>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h5>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 346966c..6f6709f 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h6>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements <h6>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 e5d839d..3730127 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.document-metadata#the-head-element <head>}
+ * DTO for an HTML {@doc ExtHTML5.document-metadata#the-head-element <head>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 e97ff41..4fd437f 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-header-element <header>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-header-element <header>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 857a345..e8727b7 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-hr-element <hr>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-hr-element <hr>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 da13ce7..7bcdc60 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.semantics#the-html-element <html>}
+ * DTO for an HTML {@doc ExtHTML5.semantics#the-html-element <html>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="html")
@@ -40,7 +40,7 @@ public class Html extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.semantics#attr-html-manifest manifest} attribute.
+	 * {@doc ExtHTML5.semantics#attr-html-manifest manifest} 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 b7b32eb..da56b08 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 juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 public class HtmlBeanDictionary extends BeanDictionaryList {
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 7f7beb2..054850d 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 juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 6ec8e33..a1a5955 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
@@ -33,7 +33,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 juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @org.apache.juneau.html.annotation.Html(format=XML)
@@ -140,7 +140,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.editing#the-accesskey-attribute accesskey}
+	 * {@doc ExtHTML5.editing#the-accesskey-attribute accesskey}
 	 * attribute.
 	 *
 	 * @param accesskey The new value for this attribute.
@@ -152,7 +152,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.dom#classes class} attribute.
+	 * {@doc ExtHTML5.dom#classes class} attribute.
 	 *
 	 * @param _class The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -163,7 +163,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.editing#attr-contenteditable contenteditable}
+	 * {@doc ExtHTML5.editing#attr-contenteditable contenteditable}
 	 * attribute.
 	 *
 	 * @param contenteditable The new value for this attribute.
@@ -176,7 +176,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.dom#the-dir-attribute dir} attribute.
+	 * {@doc ExtHTML5.dom#the-dir-attribute dir} attribute.
 	 *
 	 * @param dir The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -187,7 +187,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.editing#the-hidden-attribute hidden} attribute.
+	 * {@doc ExtHTML5.editing#the-hidden-attribute hidden} attribute.
 	 *
 	 * @param hidden
 	 * 	The new value for this attribute.
@@ -200,7 +200,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.dom#the-id-attribute id} attribute.
+	 * {@doc ExtHTML5.dom#the-id-attribute id} attribute.
 	 *
 	 * @param id The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -211,7 +211,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.dom#attr-lang lang} attribute.
+	 * {@doc ExtHTML5.dom#attr-lang lang} attribute.
 	 *
 	 * @param lang The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -222,7 +222,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onabort onabort} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onabort onabort} attribute.
 	 *
 	 * @param onabort The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -233,7 +233,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onblur onblur} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onblur onblur} attribute.
 	 *
 	 * @param onblur The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -244,7 +244,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-oncancel oncancel} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-oncancel oncancel} attribute.
 	 *
 	 * @param oncancel The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -255,7 +255,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-oncanplay oncanplay} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-oncanplay oncanplay} attribute.
 	 *
 	 * @param oncanplay The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -266,7 +266,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-oncanplaythrough oncanplaythrough}
+	 * {@doc ExtHTML5.webappapis#handler-oncanplaythrough oncanplaythrough}
 	 * attribute.
 	 *
 	 * @param oncanplaythrough The new value for this attribute.
@@ -278,7 +278,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onchange onchange} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onchange onchange} attribute.
 	 *
 	 * @param onchange The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -289,7 +289,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onclick onclick} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onclick onclick} attribute.
 	 *
 	 * @param onclick The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -300,7 +300,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-oncuechange oncuechange}
+	 * {@doc ExtHTML5.webappapis#handler-oncuechange oncuechange}
 	 * attribute.
 	 *
 	 * @param oncuechange The new value for this attribute.
@@ -312,7 +312,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-ondblclick ondblclick} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-ondblclick ondblclick} attribute.
 	 *
 	 * @param ondblclick The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -323,7 +323,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-ondurationchange ondurationchange}
+	 * {@doc ExtHTML5.webappapis#handler-ondurationchange ondurationchange}
 	 * attribute.
 	 *
 	 * @param ondurationchange The new value for this attribute.
@@ -335,7 +335,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onemptied onemptied} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onemptied onemptied} attribute.
 	 *
 	 * @param onemptied The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -346,7 +346,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onended onended} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onended onended} attribute.
 	 *
 	 * @param onended The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -357,7 +357,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onerror onerror} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onerror onerror} attribute.
 	 *
 	 * @param onerror The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -368,7 +368,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onfocus onfocus} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onfocus onfocus} attribute.
 	 *
 	 * @param onfocus The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -379,7 +379,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-oninput oninput} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-oninput oninput} attribute.
 	 *
 	 * @param oninput The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -390,7 +390,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-oninvalid oninvalid} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-oninvalid oninvalid} attribute.
 	 *
 	 * @param oninvalid The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -401,7 +401,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onkeydown onkeydown} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onkeydown onkeydown} attribute.
 	 *
 	 * @param onkeydown The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -412,7 +412,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onkeypress onkeypress} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onkeypress onkeypress} attribute.
 	 *
 	 * @param onkeypress The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -423,7 +423,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onkeyup onkeyup} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onkeyup onkeyup} attribute.
 	 *
 	 * @param onkeyup The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -434,7 +434,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onload onload} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onload onload} attribute.
 	 *
 	 * @param onload The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -445,7 +445,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onloadeddata onloadeddata}
+	 * {@doc ExtHTML5.webappapis#handler-onloadeddata onloadeddata}
 	 * attribute.
 	 *
 	 * @param onloadeddata The new value for this attribute.
@@ -457,7 +457,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onloadedmetadata onloadedmetadata}
+	 * {@doc ExtHTML5.webappapis#handler-onloadedmetadata onloadedmetadata}
 	 * attribute.
 	 *
 	 * @param onloadedmetadata The new value for this attribute.
@@ -469,7 +469,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onloadstart onloadstart}
+	 * {@doc ExtHTML5.webappapis#handler-onloadstart onloadstart}
 	 * attribute.
 	 *
 	 * @param onloadstart The new value for this attribute.
@@ -481,7 +481,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onmousedown onmousedown}
+	 * {@doc ExtHTML5.webappapis#handler-onmousedown onmousedown}
 	 * attribute.
 	 *
 	 * @param onmousedown The new value for this attribute.
@@ -493,7 +493,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onmouseenter onmouseenter} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onmouseenter onmouseenter} attribute.
 	 *
 	 * @param onmouseenter The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -504,7 +504,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onmouseleave onmouseleave}
+	 * {@doc ExtHTML5.webappapis#handler-onmouseleave onmouseleave}
 	 * attribute.
 	 *
 	 * @param onmouseleave The new value for this attribute.
@@ -516,7 +516,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onmousemove onmousemove}
+	 * {@doc ExtHTML5.webappapis#handler-onmousemove onmousemove}
 	 * attribute.
 	 *
 	 * @param onmousemove The new value for this attribute.
@@ -528,7 +528,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onmouseout onmouseout} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onmouseout onmouseout} attribute.
 	 *
 	 * @param onmouseout The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -539,7 +539,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onmouseover onmouseover}
+	 * {@doc ExtHTML5.webappapis#handler-onmouseover onmouseover}
 	 * attribute.
 	 *
 	 * @param onmouseover The new value for this attribute.
@@ -551,7 +551,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onmouseup onmouseup} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onmouseup onmouseup} attribute.
 	 *
 	 * @param onmouseup The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -562,7 +562,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onmousewheel onmousewheel}
+	 * {@doc ExtHTML5.webappapis#handler-onmousewheel onmousewheel}
 	 * attribute.
 	 *
 	 * @param onmousewheel The new value for this attribute.
@@ -574,7 +574,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onpause onpause} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onpause onpause} attribute.
 	 *
 	 * @param onpause The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -585,7 +585,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onplay onplay} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onplay onplay} attribute.
 	 *
 	 * @param onplay The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -596,7 +596,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onplaying onplaying} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onplaying onplaying} attribute.
 	 *
 	 * @param onplaying The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -607,7 +607,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onprogress onprogress} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onprogress onprogress} attribute.
 	 *
 	 * @param onprogress The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -618,7 +618,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onratechange onratechange}
+	 * {@doc ExtHTML5.webappapis#handler-onratechange onratechange}
 	 * attribute.
 	 *
 	 * @param onratechange The new value for this attribute.
@@ -630,7 +630,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onreset onreset} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onreset onreset} attribute.
 	 *
 	 * @param onreset The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -641,7 +641,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onresize onresize} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onresize onresize} attribute.
 	 *
 	 * @param onresize The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -652,7 +652,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onscroll onscroll} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onscroll onscroll} attribute.
 	 *
 	 * @param onscroll The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -663,7 +663,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onseeked onseeked} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onseeked onseeked} attribute.
 	 *
 	 * @param onseeked The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -674,7 +674,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onseeking onseeking} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onseeking onseeking} attribute.
 	 *
 	 * @param onseeking The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -685,7 +685,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onselect onselect} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onselect onselect} attribute.
 	 *
 	 * @param onselect The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -696,7 +696,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onshow onshow} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onshow onshow} attribute.
 	 *
 	 * @param onshow The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -707,7 +707,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onstalled onstalled} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onstalled onstalled} attribute.
 	 *
 	 * @param onstalled The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -718,7 +718,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onsubmit onsubmit} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onsubmit onsubmit} attribute.
 	 *
 	 * @param onsubmit The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -729,7 +729,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onsuspend onsuspend} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onsuspend onsuspend} attribute.
 	 *
 	 * @param onsuspend The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -740,7 +740,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-ontimeupdate ontimeupdate}
+	 * {@doc ExtHTML5.webappapis#handler-ontimeupdate ontimeupdate}
 	 * attribute.
 	 *
 	 * @param ontimeupdate The new value for this attribute.
@@ -752,7 +752,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-ontoggle ontoggle} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-ontoggle ontoggle} attribute.
 	 *
 	 * @param ontoggle The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -763,7 +763,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onvolumechange onvolumechange}
+	 * {@doc ExtHTML5.webappapis#handler-onvolumechange onvolumechange}
 	 * attribute.
 	 *
 	 * @param onvolumechange The new value for this attribute.
@@ -775,7 +775,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.webappapis#handler-onwaiting onwaiting} attribute.
+	 * {@doc ExtHTML5.webappapis#handler-onwaiting onwaiting} attribute.
 	 *
 	 * @param onwaiting The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -786,7 +786,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.editing#attr-spellcheck spellcheck} attribute.
+	 * {@doc ExtHTML5.editing#attr-spellcheck spellcheck} attribute.
 	 *
 	 * @param spellcheck
 	 * 	The new value for this attribute.
@@ -799,7 +799,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.dom#the-style-attribute style} attribute.
+	 * {@doc ExtHTML5.dom#the-style-attribute style} attribute.
 	 *
 	 * @param style The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -810,7 +810,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.editing#attr-tabindex tabindex} attribute.
+	 * {@doc ExtHTML5.editing#attr-tabindex tabindex} attribute.
 	 *
 	 * @param tabindex
 	 * 	The new value for this attribute.
@@ -823,7 +823,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.dom#attr-title title} attribute.
+	 * {@doc ExtHTML5.dom#attr-title title} attribute.
 	 *
 	 * @param title The new value for this attribute.
 	 * @return This object (for method chaining).
@@ -834,7 +834,7 @@ public abstract class HtmlElement {
 	}
 
 	/**
-	 * {@doc HTML5.dom#attr-translate translate} attribute.
+	 * {@doc ExtHTML5.dom#attr-translate translate} 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 895879a..28aae34 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 juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 public class HtmlElementContainer extends HtmlElement {
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 622b7f9..5d5abaf 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 juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 public class HtmlElementMixed extends HtmlElement {
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 d3a33b5..8c0b1e3 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
@@ -20,7 +20,7 @@ import org.apache.juneau.xml.annotation.*;
  * only.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 public class HtmlElementRawText extends HtmlElement {
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 1b4475d..de6b302 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
@@ -19,7 +19,7 @@ import org.apache.juneau.xml.annotation.*;
  * A subclass of HTML elements that contain text only.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 public class HtmlElementText extends HtmlElement {
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 d25187c..a66f373 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
@@ -23,7 +23,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 juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 ef71ba9..3f8ee50 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-i-element <i>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-i-element <i>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 0c403ba..437870a 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-iframe-element <iframe>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-iframe-element <iframe>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="iframe")
@@ -44,7 +44,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-height height}
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-height height}
 	 * attribute.
 	 *
 	 * <p>
@@ -61,7 +61,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-iframe-name name} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-iframe-name name} attribute.
 	 *
 	 * <p>
 	 * Name of nested browsing context.
@@ -75,7 +75,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-iframe-sandbox sandbox}
+	 * {@doc ExtHTML5.embedded-content-0#attr-iframe-sandbox sandbox}
 	 * attribute.
 	 *
 	 * <p>
@@ -90,7 +90,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-iframe-src src} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-iframe-src src} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -113,7 +113,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-iframe-srcdoc srcdoc}
+	 * {@doc ExtHTML5.embedded-content-0#attr-iframe-srcdoc srcdoc}
 	 * attribute.
 	 *
 	 * <p>
@@ -128,7 +128,7 @@ public class Iframe extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-width width} 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 37f58f9..9b0f72e 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-img-element <img>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-img-element <img>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="img")
@@ -44,7 +44,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-img-alt alt} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-img-alt alt} attribute.
 	 *
 	 * <p>
 	 * Replacement text for use when images are not available.
@@ -58,7 +58,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-img-crossorigin crossorigin}
+	 * {@doc ExtHTML5.embedded-content-0#attr-img-crossorigin crossorigin}
 	 * attribute.
 	 *
 	 * <p>
@@ -73,7 +73,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-height height}
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-height height}
 	 * attribute.
 	 *
 	 * <p>
@@ -90,7 +90,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-img-ismap ismap} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-img-ismap ismap} attribute.
 	 *
 	 * <p>
 	 * Whether the image is a server-side image map.
@@ -106,7 +106,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-img-src src} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-img-src src} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -129,7 +129,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-hyperlink-usemap usemap}
+	 * {@doc ExtHTML5.embedded-content-0#attr-hyperlink-usemap usemap}
 	 * attribute.
 	 *
 	 * <p>
@@ -144,7 +144,7 @@ public class Img extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-width width} 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 bb35236..610916b 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
@@ -17,11 +17,11 @@ import java.net.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-input-element <input>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-input-element <input>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="input")
@@ -42,7 +42,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-accept accept} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-accept accept} attribute.
 	 *
 	 * <p>
 	 * Hint for expected file type in file upload controls.
@@ -56,7 +56,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-alt alt} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-alt alt} attribute.
 	 *
 	 * <p>
 	 * Replacement text for use when images are not available.
@@ -70,7 +70,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-autocomplete autocomplete} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-autocomplete autocomplete} attribute.
 	 *
 	 * <p>
 	 * Hint for form auto-fill feature.
@@ -84,7 +84,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-autofocus autofocus} attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -98,7 +98,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-checked checked} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-checked checked} attribute.
 	 *
 	 * <p>
 	 * Whether the command or control is checked.
@@ -114,7 +114,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-dirname dirname} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-dirname dirname} attribute.
 	 *
 	 * <p>
 	 * Name of form field to use for sending the element's directionality in form submission.
@@ -128,7 +128,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-disabled disabled} attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -144,7 +144,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -158,7 +158,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formaction formaction} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-formaction formaction} attribute.
 	 *
 	 * <p>
 	 * URL to use for form submission.
@@ -172,7 +172,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formenctype formenctype} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-formenctype formenctype} attribute.
 	 *
 	 * <p>
 	 * Form data set encoding type to use for form submission.
@@ -186,7 +186,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formmethod formmethod} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-formmethod formmethod} attribute.
 	 *
 	 * <p>
 	 * HTTP method to use for form submission.
@@ -200,7 +200,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formnovalidate formnovalidate}
+	 * {@doc ExtHTML5.forms#attr-fs-formnovalidate formnovalidate}
 	 * attribute.
 	 *
 	 * <p>
@@ -215,7 +215,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fs-formtarget formtarget} attribute.
+	 * {@doc ExtHTML5.forms#attr-fs-formtarget formtarget} attribute.
 	 *
 	 * <p>
 	 * Browsing context for form submission.
@@ -229,7 +229,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-height height}
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-height height}
 	 * attribute.
 	 *
 	 * <p>
@@ -246,7 +246,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-input-inputmode inputmode}
+	 * {@doc ExtHTML5.embedded-content-0#attr-input-inputmode inputmode}
 	 * attribute.
 	 * Hint for selecting an input modality.
 	 *
@@ -259,7 +259,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-list list} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-list list} attribute.
 	 *
 	 * <p>
 	 * List of auto-complete options.
@@ -273,7 +273,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-max max} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-max max} attribute.
 	 *
 	 * <p>
 	 * Maximum value.
@@ -289,7 +289,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-maxlength maxlength} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-maxlength maxlength} attribute.
 	 * Maximum length of value.
 	 *
 	 * @param maxlength The new value for this attribute.
@@ -302,7 +302,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-min min} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-min min} attribute.
 	 *
 	 * <p>
 	 * Minimum value.
@@ -318,7 +318,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-minlength minlength} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-minlength minlength} attribute.
 	 *
 	 * <p>
 	 * Minimum length of value.
@@ -334,7 +334,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-multiple multiple} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-multiple multiple} attribute.
 	 *
 	 * <p>
 	 * Whether to allow multiple values.
@@ -350,7 +350,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-name name} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-name name} attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
@@ -364,7 +364,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-pattern pattern} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-pattern pattern} attribute.
 	 *
 	 * <p>
 	 * Pattern to be matched by the form control's value.
@@ -378,7 +378,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-placeholder placeholder} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-placeholder placeholder} attribute.
 	 *
 	 * <p>
 	 * User-visible label to be placed within the form control.
@@ -392,7 +392,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-readonly readonly} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-readonly readonly} attribute.
 	 *
 	 * <p>
 	 * Whether to allow the value to be edited by the user.
@@ -409,7 +409,7 @@ public class Input extends HtmlElementVoid {
 
 
 	/**
-	 * {@doc HTML5.forms#attr-input-readonly readonly} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-readonly readonly} attribute.
 	 *
 	 * <p>
 	 * Whether to allow the value to be edited by the user.
@@ -424,7 +424,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-readonly required} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-readonly required} attribute.
 	 *
 	 * <p>
 	 * Whether the control is required for form submission.
@@ -440,7 +440,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-size size} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-size size} attribute.
 	 *
 	 * <p>
 	 * Size of the control.
@@ -456,7 +456,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-src src} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-src src} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -472,7 +472,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-step step} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-step step} attribute.
 	 *
 	 * <p>
 	 * Granularity to be matched by the form control's value.
@@ -486,7 +486,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-type type} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-type type} attribute.
 	 *
 	 * <p>
 	 * Type of form control.
@@ -500,7 +500,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-input-value value} attribute.
+	 * {@doc ExtHTML5.forms#attr-input-value value} attribute.
 	 *
 	 * <p>
 	 * Value of the form control.
@@ -516,7 +516,7 @@ public class Input extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-width width} 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 29ac9fa..8f584e5 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.edits#the-ins-element <ins>}
+ * DTO for an HTML {@doc ExtHTML5.edits#the-ins-element <ins>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="ins")
@@ -40,7 +40,7 @@ public class Ins extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.edits#attr-mod-cite cite} attribute.
+	 * {@doc ExtHTML5.edits#attr-mod-cite cite} attribute.
 	 *
 	 * <p>
 	 * Link to the source of the quotation or more information about the edit.
@@ -54,7 +54,7 @@ public class Ins extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.edits#attr-mod-datetime datetime} attribute.
+	 * {@doc ExtHTML5.edits#attr-mod-datetime datetime} 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 5b3376a..5e31d31 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-kbd-element <kbd>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-kbd-element <kbd>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 17bc0d6..6338e65 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-keygen-element <keygen>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-keygen-element <keygen>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="keygen")
@@ -31,7 +31,7 @@ public class Keygen extends HtmlElementVoid {
 	public Keygen() {}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-autofocus autofocus} attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -47,7 +47,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-keygen-challenge challenge} attribute.
+	 * {@doc ExtHTML5.forms#attr-keygen-challenge challenge} attribute.
 	 *
 	 * <p>
 	 * String to package with the generated and signed public key.
@@ -61,7 +61,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-disabled disabled} attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -77,7 +77,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -91,7 +91,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-keygen-keytype keytype} attribute.
+	 * {@doc ExtHTML5.forms#attr-keygen-keytype keytype} attribute.
 	 *
 	 * <p>
 	 * The type of cryptographic key to generate.
@@ -105,7 +105,7 @@ public class Keygen extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-name name} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-name name} 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 6cdf2f0..f8635b1 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-label-element <label>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-label-element <label>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="label")
@@ -40,7 +40,7 @@ public class Label extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-label-for for} attribute.
+	 * {@doc ExtHTML5.forms#attr-label-for for} attribute.
 	 *
 	 * <p>
 	 * Associate the label with form control.
@@ -54,7 +54,7 @@ public class Label extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} 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 07a725f..150e25f 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-legend-element <legend>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-legend-element <legend>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 3f036d1..c85c1cd 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-li-element <li>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-li-element <li>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 301a359..f580d32 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.document-metadata#the-link-element <link>}
+ * DTO for an HTML {@doc ExtHTML5.document-metadata#the-link-element <link>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="link")
@@ -44,7 +44,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-link-crossorigin crossorigin}
+	 * {@doc ExtHTML5.document-metadata#attr-link-crossorigin crossorigin}
 	 * attribute.
 	 *
 	 * <p>
@@ -59,7 +59,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-link-href href} attribute.
+	 * {@doc ExtHTML5.document-metadata#attr-link-href href} attribute.
 	 *
 	 * <p>
 	 * Address of the hyperlink.
@@ -82,7 +82,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-link-hreflang hreflang}
+	 * {@doc ExtHTML5.document-metadata#attr-link-hreflang hreflang}
 	 * attribute.
 	 *
 	 * <p>
@@ -97,7 +97,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-link-media media} attribute.
+	 * {@doc ExtHTML5.document-metadata#attr-link-media media} attribute.
 	 *
 	 * <p>
 	 * Applicable media.
@@ -111,7 +111,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-link-rel rel} attribute.
+	 * {@doc ExtHTML5.document-metadata#attr-link-rel rel} attribute.
 	 *
 	 * <p>
 	 * Relationship between the document containing the hyperlink and the destination resource.
@@ -125,7 +125,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.links#attr-link-sizes sizes} attribute.
+	 * {@doc ExtHTML5.links#attr-link-sizes sizes} attribute.
 	 *
 	 * <p>
 	 * Sizes of the icons (for rel="icon").
@@ -139,7 +139,7 @@ public class Link extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-link-type type} attribute.
+	 * {@doc ExtHTML5.document-metadata#attr-link-type type} 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 f3cf08f..b31f89e 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-main-element <main>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-main-element <main>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 4167889..1b31653 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-map-element <map>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-map-element <map>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="map")
@@ -40,7 +40,7 @@ public class Map extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-map-name name} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-map-name name} 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 8ef7147..4de7711 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-mark-element <mark>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-mark-element <mark>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 caf7168..5ea1320 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.document-metadata#the-meta-element <meta>}
+ * DTO for an HTML {@doc ExtHTML5.document-metadata#the-meta-element <meta>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="meta")
@@ -31,7 +31,7 @@ public class Meta extends HtmlElementVoid {
 	public Meta() {}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-meta-charset charset}
+	 * {@doc ExtHTML5.document-metadata#attr-meta-charset charset}
 	 * attribute.
 	 *
 	 * <p>
@@ -46,7 +46,7 @@ public class Meta extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-meta-content content}
+	 * {@doc ExtHTML5.document-metadata#attr-meta-content content}
 	 * attribute.
 	 *
 	 * <p>
@@ -61,7 +61,7 @@ public class Meta extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-meta-http-equiv http-equiv}
+	 * {@doc ExtHTML5.document-metadata#attr-meta-http-equiv http-equiv}
 	 * attribute.
 	 *
 	 * <p>
@@ -76,7 +76,7 @@ public class Meta extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-meta-name name} attribute.
+	 * {@doc ExtHTML5.document-metadata#attr-meta-name name} 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 bf77197..ed3db84 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-meter-element <meter>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-meter-element <meter>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="meter")
@@ -40,7 +40,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-meter-high high} attribute.
+	 * {@doc ExtHTML5.forms#attr-meter-high high} attribute.
 	 *
 	 * <p>
 	 * Low limit of high range.
@@ -56,7 +56,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-meter-low low} attribute.
+	 * {@doc ExtHTML5.forms#attr-meter-low low} attribute.
 	 *
 	 * <p>
 	 * High limit of low range.
@@ -72,7 +72,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-meter-max max} attribute.
+	 * {@doc ExtHTML5.forms#attr-meter-max max} attribute.
 	 *
 	 * <p>
 	 * Upper bound of range.
@@ -88,7 +88,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-meter-min min} attribute.
+	 * {@doc ExtHTML5.forms#attr-meter-min min} attribute.
 	 *
 	 * <p>
 	 * Lower bound of range.
@@ -104,7 +104,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-meter-optimum optimum} attribute.
+	 * {@doc ExtHTML5.forms#attr-meter-optimum optimum} attribute.
 	 *
 	 * <p>
 	 * Optimum value in gauge.
@@ -120,7 +120,7 @@ public class Meter extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-meter-value value} attribute.
+	 * {@doc ExtHTML5.forms#attr-meter-value value} 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 7f4642a..1091af8 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-nav-element <nav>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-nav-element <nav>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 bc78d2d..9e9e0d3 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.scripting-1#the-noscript-element <noscript>}
+ * DTO for an HTML {@doc ExtHTML5.scripting-1#the-noscript-element <noscript>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 6bec000..7009414 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-object-element <object>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-object-element <object>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="object")
@@ -40,7 +40,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-object-data data} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-object-data data} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -54,7 +54,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -68,7 +68,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-height height}
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-height height}
 	 * attribute.
 	 *
 	 * <p>
@@ -85,7 +85,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-object-name name} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-object-name name} attribute.
 	 *
 	 * <p>
 	 * Name of nested browsing context.
@@ -99,7 +99,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-object-type type} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-object-type type} attribute.
 	 *
 	 * <p>
 	 * Type of embedded resource.
@@ -113,7 +113,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-object-typemustmatch typemustmatch}
+	 * {@doc ExtHTML5.embedded-content-0#attr-object-typemustmatch typemustmatch}
 	 * attribute.
 	 *
 	 * <p>
@@ -130,7 +130,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-hyperlink-usemap usemap}
+	 * {@doc ExtHTML5.embedded-content-0#attr-hyperlink-usemap usemap}
 	 * attribute.
 	 *
 	 * <p>
@@ -145,7 +145,7 @@ public class Object_ extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-width width} 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 09f78d9..35b8274 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-ol-element <ol>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-ol-element <ol>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="ol")
@@ -40,7 +40,7 @@ public class Ol extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.grouping-content#attr-ol-reversed reversed}
+	 * {@doc ExtHTML5.grouping-content#attr-ol-reversed reversed}
 	 * attribute.
 	 *
 	 * <p>
@@ -57,7 +57,7 @@ public class Ol extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.grouping-content#attr-ol-start start} attribute.
+	 * {@doc ExtHTML5.grouping-content#attr-ol-start start} attribute.
 	 *
 	 * <p>
 	 * Ordinal value of the first item.
@@ -73,7 +73,7 @@ public class Ol extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.grouping-content#attr-ol-type type} attribute.
+	 * {@doc ExtHTML5.grouping-content#attr-ol-type type} 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 e1e68c1..2216232 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-optgroup-element <optgroup>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-optgroup-element <optgroup>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="optgroup")
@@ -40,7 +40,7 @@ public class Optgroup extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-optgroup-disabled disabled} attribute.
+	 * {@doc ExtHTML5.forms#attr-optgroup-disabled disabled} attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -56,7 +56,7 @@ public class Optgroup extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-optgroup-label label} attribute.
+	 * {@doc ExtHTML5.forms#attr-optgroup-label label} 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 9fdff9e..1a14b06 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-option-element <option>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-option-element <option>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="option")
@@ -51,7 +51,7 @@ public class Option extends HtmlElementText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-option-disabled disabled} attribute.
+	 * {@doc ExtHTML5.forms#attr-option-disabled disabled} attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -67,7 +67,7 @@ public class Option extends HtmlElementText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-option-label label} attribute.
+	 * {@doc ExtHTML5.forms#attr-option-label label} attribute.
 	 *
 	 * <p>
 	 * User-visible label.
@@ -81,7 +81,7 @@ public class Option extends HtmlElementText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-option-selected selected} attribute.
+	 * {@doc ExtHTML5.forms#attr-option-selected selected} attribute.
 	 *
 	 * <p>
 	 * Whether the option is selected by default.
@@ -97,7 +97,7 @@ public class Option extends HtmlElementText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-option-value value} attribute.
+	 * {@doc ExtHTML5.forms#attr-option-value value} 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 c01f0f5..ac8d8a3 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-output-element <output>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-output-element <output>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="output")
@@ -40,7 +40,7 @@ public class Output extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-output-for for} attribute.
+	 * {@doc ExtHTML5.forms#attr-output-for for} attribute.
 	 *
 	 * <p>
 	 * Specifies controls from which the output was calculated.
@@ -54,7 +54,7 @@ public class Output extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -68,7 +68,7 @@ public class Output extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-name name} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-name name} 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 56d7941..b808bcd 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-p-element <p>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-p-element <p>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 fc5dd0c..bc7b28e 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-param-element <param>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-param-element <param>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="param")
@@ -42,7 +42,7 @@ public class Param extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-param-name name} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-param-name name} attribute.
 	 *
 	 * <p>
 	 * Name of parameter.
@@ -56,7 +56,7 @@ public class Param extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-param-value value}
+	 * {@doc ExtHTML5.embedded-content-0#attr-param-value value}
 	 * 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 063076b..2919c4a 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
@@ -20,11 +20,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.xml.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-pre-element <pre>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-pre-element <pre>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 44999e3..a68d90d 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-progress-element <progress>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-progress-element <progress>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="progress")
@@ -40,7 +40,7 @@ public class Progress extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-progress-max max} attribute.
+	 * {@doc ExtHTML5.forms#attr-progress-max max} attribute.
 	 *
 	 * <p>
 	 * Upper bound of range.
@@ -56,7 +56,7 @@ public class Progress extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-progress-value value} attribute.
+	 * {@doc ExtHTML5.forms#attr-progress-value value} 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 02aae81..04cbd18 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-q-element <q>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-q-element <q>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="q")
@@ -40,7 +40,7 @@ public class Q extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.text-level-semantics#attr-q-cite cite} attribute.
+	 * {@doc ExtHTML5.text-level-semantics#attr-q-cite cite} 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 3dcf0e7..5501be0 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-rb-element <rb>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-rb-element <rb>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 c68446e..749e826 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-rp-element <rp>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-rp-element <rp>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 4778ff4..9edcec8 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-rt-element <rt>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-rt-element <rt>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 89147aa..efe337a 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-rtc-element <rtc>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-rtc-element <rtc>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 b1a586c..6398868 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-ruby-element <ruby>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-ruby-element <ruby>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 596ebca..f54307f 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-s-element <s>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-s-element <s>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 42c6e03..b3d8323 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-samp-element <samp>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-samp-element <samp>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 a4422e5..b3a98a7 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.scripting-1#the-script-element <script>}
+ * DTO for an HTML {@doc ExtHTML5.scripting-1#the-script-element <script>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="script")
@@ -48,7 +48,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.scripting-1#attr-script-async async} attribute.
+	 * {@doc ExtHTML5.scripting-1#attr-script-async async} attribute.
 	 *
 	 * <p>
 	 * Execute script asynchronously.
@@ -64,7 +64,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.scripting-1#attr-script-charset charset} attribute.
+	 * {@doc ExtHTML5.scripting-1#attr-script-charset charset} attribute.
 	 *
 	 * <p>
 	 * Character encoding of the external script resource.
@@ -78,7 +78,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.scripting-1#attr-script-crossorigin crossorigin}
+	 * {@doc ExtHTML5.scripting-1#attr-script-crossorigin crossorigin}
 	 * attribute.
 	 *
 	 * <p>
@@ -93,7 +93,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.scripting-1#attr-script-defer defer} attribute.
+	 * {@doc ExtHTML5.scripting-1#attr-script-defer defer} attribute.
 	 *
 	 * <p>
 	 * Defer script execution.
@@ -109,7 +109,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.scripting-1#attr-script-src src} attribute.
+	 * {@doc ExtHTML5.scripting-1#attr-script-src src} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -132,7 +132,7 @@ public class Script extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.scripting-1#attr-script-type type} attribute.
+	 * {@doc ExtHTML5.scripting-1#attr-script-type type} 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 be79068..b34e296 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.sections#the-section-element <section>}
+ * DTO for an HTML {@doc ExtHTML5.sections#the-section-element <section>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 e16a0cd..975d1fe 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
@@ -16,11 +16,11 @@ import org.apache.juneau.annotation.*;
 import org.apache.juneau.internal.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-select-element <select>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-select-element <select>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="select")
@@ -42,7 +42,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-autofocus autofocus} attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -58,7 +58,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-disabled disabled} attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -74,7 +74,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -88,7 +88,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-select-multiple multiple} attribute.
+	 * {@doc ExtHTML5.forms#attr-select-multiple multiple} attribute.
 	 *
 	 * <p>
 	 * Whether to allow multiple values.
@@ -104,7 +104,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-name name} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-name name} attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
@@ -118,7 +118,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-select-required required} attribute.
+	 * {@doc ExtHTML5.forms#attr-select-required required} attribute.
 	 *
 	 * <p>
 	 * Whether the control is required for form submission.
@@ -134,7 +134,7 @@ public class Select extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-select-size size} attribute.
+	 * {@doc ExtHTML5.forms#attr-select-size size} 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 940ec03..6a525b6 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-small-element <small>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-small-element <small>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 8e7ad2d..a6cb2b1 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-source-element <source>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-source-element <source>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="source")
@@ -46,7 +46,7 @@ public class Source extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-source-src src} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-source-src src} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -69,7 +69,7 @@ public class Source extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-source-type type} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-source-type type} 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 fa32506..97189ca 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-span-element <span>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-span-element <span>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 eb8b008..5129c57 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-strong-element <strong>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-strong-element <strong>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 e8e85f2..12bcb63 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
@@ -17,11 +17,11 @@ import static org.apache.juneau.internal.StringUtils.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.document-metadata#the-style-element <style>}
+ * DTO for an HTML {@doc ExtHTML5.document-metadata#the-style-element <style>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="style")
@@ -53,7 +53,7 @@ public class Style extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-style-media media} attribute.
+	 * {@doc ExtHTML5.document-metadata#attr-style-media media} attribute.
 	 *
 	 * <p>
 	 * Applicable media.
@@ -67,7 +67,7 @@ public class Style extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.document-metadata#attr-style-type type} attribute.
+	 * {@doc ExtHTML5.document-metadata#attr-style-type type} 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 c07e930..32dd326 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-sub-and-sup-elements <sub>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-sub-and-sup-elements <sub>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 76598ab..5e73fbe 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-sub-and-sup-elements <sup>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-sub-and-sup-elements <sup>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 fecf58c..a5e7ad4 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-table-element <table>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-table-element <table>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="table")
@@ -40,7 +40,7 @@ public class Table extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-table-border border} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-table-border border} 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 cad1cc4..d770a1c 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-tbody-element <tbody>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-tbody-element <tbody>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 ab451fc..40fd7c3 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-td-element <td>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-td-element <td>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="td")
@@ -40,7 +40,7 @@ public class Td extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-tdth-colspan colspan} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-tdth-colspan colspan} attribute.
 	 *
 	 * <p>
 	 * Number of columns that the cell is to span.
@@ -56,7 +56,7 @@ public class Td extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-tdth-headers headers} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-tdth-headers headers} attribute.
 	 *
 	 * <p>
 	 * The header cells for this cell.
@@ -70,7 +70,7 @@ public class Td extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-tdth-rowspan rowspan} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-tdth-rowspan rowspan} 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 61f9c03..8608879 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.scripting-1#the-template-element <template>}
+ * DTO for an HTML {@doc ExtHTML5.scripting-1#the-template-element <template>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 11efeb8..b9683ee 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.forms#the-textarea-element <textarea>}
+ * DTO for an HTML {@doc ExtHTML5.forms#the-textarea-element <textarea>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="textarea")
@@ -42,7 +42,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-autocomplete autocomplete} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-autocomplete autocomplete} attribute.
 	 *
 	 * <p>
 	 * Hint for form auto-fill feature.
@@ -56,7 +56,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-autofocus autofocus} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-autofocus autofocus} attribute.
 	 *
 	 * <p>
 	 * Automatically focus the form control when the page is loaded.
@@ -72,7 +72,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-textarea-cols cols} attribute.
+	 * {@doc ExtHTML5.forms#attr-textarea-cols cols} attribute.
 	 *
 	 * <p>
 	 * Maximum number of characters per line.
@@ -88,7 +88,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-dirname dirname} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-dirname dirname} attribute.
 	 *
 	 * <p>
 	 * Name of form field to use for sending the element's directionality in form submission.
@@ -102,7 +102,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-disabled disabled} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-disabled disabled} attribute.
 	 *
 	 * <p>
 	 * Whether the form control is disabled.
@@ -118,7 +118,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fae-form form} attribute.
+	 * {@doc ExtHTML5.forms#attr-fae-form form} attribute.
 	 *
 	 * <p>
 	 * Associates the control with a form element.
@@ -132,7 +132,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#inputmode inputmode} attribute.
+	 * {@doc ExtHTML5.forms#inputmode inputmode} attribute.
 	 *
 	 * <p>
 	 * Hint for selecting an input modality.
@@ -146,7 +146,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-textarea-maxlength maxlength} attribute.
+	 * {@doc ExtHTML5.forms#attr-textarea-maxlength maxlength} attribute.
 	 *
 	 * <p>
 	 * Maximum length of value.
@@ -162,7 +162,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-textarea-minlength minlength} attribute.
+	 * {@doc ExtHTML5.forms#attr-textarea-minlength minlength} attribute.
 	 *
 	 * <p>
 	 * Minimum length of value.
@@ -178,7 +178,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-fe-name name} attribute.
+	 * {@doc ExtHTML5.forms#attr-fe-name name} attribute.
 	 *
 	 * <p>
 	 * Name of form control to use for form submission and in the form.elements API.
@@ -192,7 +192,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-textarea-placeholder placeholder}
+	 * {@doc ExtHTML5.forms#attr-textarea-placeholder placeholder}
 	 * attribute.
 	 *
 	 * <p>
@@ -207,7 +207,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-textarea-readonly readonly} attribute.
+	 * {@doc ExtHTML5.forms#attr-textarea-readonly readonly} attribute.
 	 *
 	 * <p>
 	 * Whether to allow the value to be edited by the user.
@@ -223,7 +223,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-textarea-required required} attribute.
+	 * {@doc ExtHTML5.forms#attr-textarea-required required} attribute.
 	 *
 	 * <p>
 	 * Whether the control is required for form submission.
@@ -239,7 +239,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-textarea-rows rows} attribute.
+	 * {@doc ExtHTML5.forms#attr-textarea-rows rows} attribute.
 	 *
 	 * <p>
 	 * Number of lines to show.
@@ -255,7 +255,7 @@ public class Textarea extends HtmlElementRawText {
 	}
 
 	/**
-	 * {@doc HTML5.forms#attr-textarea-wrap wrap} attribute.
+	 * {@doc ExtHTML5.forms#attr-textarea-wrap wrap} 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 2c3859b..729f37e 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-tfoot-element <tfoot>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-tfoot-element <tfoot>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 649a713..3ddd0a8 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-th-element <th>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-th-element <th>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="th")
@@ -40,7 +40,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-th-abbr abbr} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-th-abbr abbr} attribute.
 	 *
 	 * <p>
 	 * Alternative label to use for the header cell when referencing the cell in other contexts.
@@ -54,7 +54,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-tdth-colspan colspan} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-tdth-colspan colspan} attribute.
 	 *
 	 * <p>
 	 * Number of columns that the cell is to span.
@@ -70,7 +70,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-tdth-headers headers} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-tdth-headers headers} attribute.
 	 *
 	 * <p>
 	 * The headers for this cell.
@@ -84,7 +84,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-tdth-rowspan rowspan} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-tdth-rowspan rowspan} attribute.
 	 *
 	 * <p>
 	 * Number of rows that the cell is to span.
@@ -100,7 +100,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-th-scope scope} attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-th-scope scope} attribute.
 	 *
 	 * <p>
 	 * Specifies which cells the header cell applies to.
@@ -114,7 +114,7 @@ public class Th extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.tabular-data#attr-th-sorted sorted}  attribute.
+	 * {@doc ExtHTML5.tabular-data#attr-th-sorted sorted}  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 3d4ec55..427f22f 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-thead-element <thead>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-thead-element <thead>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 347f36a..d4e5b0e 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-time-element <time>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-time-element <time>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="time")
@@ -40,7 +40,7 @@ public class Time extends HtmlElementMixed {
 	}
 
 	/**
-	 * {@doc HTML5.text-level-semantics#attr-time-datetime datetime}
+	 * {@doc ExtHTML5.text-level-semantics#attr-time-datetime datetime}
 	 * 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 c4b80e3..5048d20 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.document-metadata#the-title-element <title>}
+ * DTO for an HTML {@doc ExtHTML5.document-metadata#the-title-element <title>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 84e571d..cbe3ba7 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.tabular-data#the-tr-element <tr>}
+ * DTO for an HTML {@doc ExtHTML5.tabular-data#the-tr-element <tr>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 082ffaf..e9f4e74 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-track-element <track>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-track-element <track>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="track")
@@ -46,7 +46,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-track-default default}
+	 * {@doc ExtHTML5.embedded-content-0#attr-track-default default}
 	 * attribute.
 	 *
 	 * <p>
@@ -61,7 +61,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-track-kind kind} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-track-kind kind} attribute.
 	 *
 	 * <p>
 	 * The type of text track.
@@ -75,7 +75,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-track-label label} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-track-label label} attribute.
 	 *
 	 * <p>
 	 * User-visible label.
@@ -89,7 +89,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-track-src src} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-track-src src} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -112,7 +112,7 @@ public class Track extends HtmlElementVoid {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-track-srclang srclang}
+	 * {@doc ExtHTML5.embedded-content-0#attr-track-srclang srclang}
 	 * 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 4887596..6d5a067 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-u-element <u>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-u-element <u>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 5b5131c..7ced5dc 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.grouping-content#the-ul-element <ul>}
+ * DTO for an HTML {@doc ExtHTML5.grouping-content#the-ul-element <ul>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 2b44f2a..5ad8c20 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-var-element <var>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-var-element <var>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 605f230..ac0fa5c 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.*;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.embedded-content-0#the-video-element <video>}
+ * DTO for an HTML {@doc ExtHTML5.embedded-content-0#the-video-element <video>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </ul>
  */
 @Bean(typeName="video")
@@ -44,7 +44,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-autoplay autoplay}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-autoplay autoplay}
 	 * attribute.
 	 *
 	 * <p>
@@ -61,7 +61,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-controls controls}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-controls controls}
 	 * attribute.
 	 *
 	 * <p>
@@ -78,7 +78,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-crossorigin crossorigin}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-crossorigin crossorigin}
 	 * attribute.
 	 *
 	 * <p>
@@ -93,7 +93,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-height height}
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-height height}
 	 * attribute.
 	 *
 	 * <p>
@@ -110,7 +110,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-loop loop} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-loop loop} attribute.
 	 *
 	 * <p>
 	 * Whether to loop the media resource.
@@ -126,7 +126,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-mediagroup mediagroup}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-mediagroup mediagroup}
 	 * attribute.
 	 *
 	 * <p>
@@ -141,7 +141,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-muted muted}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-muted muted}
 	 * attribute.
 	 *
 	 * <p>
@@ -158,7 +158,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-video-poster poster}
+	 * {@doc ExtHTML5.embedded-content-0#attr-video-poster poster}
 	 * attribute.
 	 *
 	 * <p>
@@ -173,7 +173,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-preload preload}
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-preload preload}
 	 * attribute.
 	 *
 	 * <p>
@@ -188,7 +188,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-media-src src} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-media-src src} attribute.
 	 *
 	 * <p>
 	 * Address of the resource.
@@ -211,7 +211,7 @@ public class Video extends HtmlElementContainer {
 	}
 
 	/**
-	 * {@doc HTML5.embedded-content-0#attr-dim-width width} attribute.
+	 * {@doc ExtHTML5.embedded-content-0#attr-dim-width width} 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 6412fd5..18e805d 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
@@ -15,11 +15,11 @@ package org.apache.juneau.dto.html5;
 import org.apache.juneau.annotation.*;
 
 /**
- * DTO for an HTML {@doc HTML5.text-level-semantics#the-wbr-element <wbr>}
+ * DTO for an HTML {@doc ExtHTML5.text-level-semantics#the-wbr-element <wbr>}
  * element.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.HTML5}
+ * 	<li class='link'>{@doc DtoHtml5}
  * </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 1191096..23b2ed6 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
@@ -337,7 +337,7 @@
 	}
 		</p>
 		<p>
-			Refer to {@doc juneau-marshall.Transforms.AutoPojoSwaps} 
+			Refer to {@doc AutoPojoSwaps} 
 			for information about defining swap methods on classes.
 		</p>
 	</div>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
index 0b6a02c..befaad3 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
@@ -48,7 +48,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="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 5c1f3cf..25b4fdc 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
@@ -47,7 +47,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="description,url,*")
@@ -102,7 +102,7 @@ public class ExternalDocumentation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index e185b50..4f1edbe 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
@@ -47,7 +47,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="description,type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,$ref,x-example,*")
@@ -191,7 +191,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * The type of the object.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 *
 	 * @param value
@@ -237,7 +237,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * The extending format for the previously mentioned <c>type</c>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypeFormats}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypeFormats}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -253,7 +253,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * The extending format for the previously mentioned <c>type</c>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 *
 	 * @param value
@@ -395,7 +395,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -418,7 +418,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -445,7 +445,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>maximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -458,7 +458,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>maximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -488,7 +488,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>exclusiveMaximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -501,7 +501,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>exclusiveMaximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -531,7 +531,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>minimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -544,7 +544,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>minimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -574,7 +574,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>exclusiveMinimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -587,7 +587,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>exclusiveMinimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -617,7 +617,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>maxLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -630,7 +630,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>maxLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -660,7 +660,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>minLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -673,7 +673,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>minLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -703,7 +703,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>pattern</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -719,7 +719,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * This string SHOULD be a valid regular expression.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -749,7 +749,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>maxItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -762,7 +762,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>maxItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -792,7 +792,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>minItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -805,7 +805,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>minItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -835,7 +835,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>uniqueItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -848,7 +848,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>uniqueItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -878,7 +878,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>enum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -891,7 +891,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>enum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -949,7 +949,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property getter:  <property>multipleOf</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -962,7 +962,7 @@ public class HeaderInfo extends SwaggerElement {
 	 * Bean property setter:  <property>multipleOf</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
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 1ac3efb..918dd2e 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 juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="title,description,version,contact,license,termsOfService,*")
@@ -172,7 +172,7 @@ public class Info extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -187,7 +187,7 @@ public class Info extends SwaggerElement {
 	 * @param value
 	 * 	The new value for this property.
 	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
index 74e46a3..94b5b76 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
@@ -51,7 +51,7 @@ import org.apache.juneau.json.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,$ref,*")
@@ -151,7 +151,7 @@ public class Items extends SwaggerElement {
 	 * The internal type of the array.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 *
 	 * @param value
@@ -204,7 +204,7 @@ public class Items extends SwaggerElement {
 	 * The extending format for the previously mentioned <c>type</c>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypeFormats}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypeFormats}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -220,7 +220,7 @@ public class Items extends SwaggerElement {
 	 * The extending format for the previously mentioned <c>type</c>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypeFormats}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypeFormats}
 	 * </ul>
 	 *
 	 * @param value
@@ -371,7 +371,7 @@ public class Items extends SwaggerElement {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -394,7 +394,7 @@ public class Items extends SwaggerElement {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -423,7 +423,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>maximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -436,7 +436,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>maximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -466,7 +466,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>exclusiveMaximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -479,7 +479,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>exclusiveMaximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -509,7 +509,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>minimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -522,7 +522,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>minimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -552,7 +552,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>exclusiveMinimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -565,7 +565,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>exclusiveMinimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -595,7 +595,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>maxLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -608,7 +608,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>maxLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -638,7 +638,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>minLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -651,7 +651,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>minLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -681,7 +681,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>pattern</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -697,7 +697,7 @@ public class Items extends SwaggerElement {
 	 * This string SHOULD be a valid regular expression.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -727,7 +727,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>maxItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -740,7 +740,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>maxItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -770,7 +770,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>minItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -783,7 +783,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>minItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -813,7 +813,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>uniqueItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -826,7 +826,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>uniqueItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -856,7 +856,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>enum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -869,7 +869,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>enum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -927,7 +927,7 @@ public class Items extends SwaggerElement {
 	 * Bean property getter:  <property>multipleOf</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -940,7 +940,7 @@ public class Items extends SwaggerElement {
 	 * Bean property setter:  <property>multipleOf</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
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 82e2909..e8e9f13 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
@@ -47,7 +47,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="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 1fe35b4..9bdae5f 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
@@ -125,7 +125,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="operationId,summary,description,tags,externalDocs,consumes,produces,parameters,responses,schemes,deprecated,security,*")
@@ -342,7 +342,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -357,7 +357,7 @@ public class Operation extends SwaggerElement {
 	 * @param value
 	 * 	The new value for this property.
 	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -489,7 +489,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Values MUST be as described under {@doc SwaggerMimeTypes}.
+	 * 	<br>Values MUST be as described under {@doc ExtSwaggerMimeTypes}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -510,7 +510,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The values to add to this property.
-	 * 	<br>Values MUST be as described under {@doc SwaggerMimeTypes}.
+	 * 	<br>Values MUST be as described under {@doc ExtSwaggerMimeTypes}.
 	 * 	<br>Ignored if <jk>null</jk>.
 	 * @return This object (for method chaining).
 	 */
@@ -576,7 +576,7 @@ public class Operation extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The values to add to this property.
-	 * 	<br>Value MUST be as described under {@doc SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under {@doc ExtSwaggerMimeTypes}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -642,15 +642,15 @@ public class Operation extends SwaggerElement {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		If a parameter is already defined at the {@doc SwaggerPathItemObject Path Item},
+	 * 		If a parameter is already defined at the {@doc ExtSwaggerPathItemObject Path Item},
 	 * 		the new definition will override it, but can never remove it.
 	 * 	<li>
 	 * 		The list MUST NOT include duplicated parameters.
 	 * 	<li>
 	 * 		A unique parameter is defined by a combination of a <c>name</c> and <c>location</c>.
 	 * 	<li>
-	 * 		The list can use the {@doc SwaggerReferenceObject}
-	 * 		to link to parameters that are defined at the {@doc SwaggerParameterObject Swagger Object's parameters}.
+	 * 		The list can use the {@doc ExtSwaggerReferenceObject}
+	 * 		to link to parameters that are defined at the {@doc ExtSwaggerParameterObject Swagger Object's parameters}.
 	 * 	<li>
 	 * 		There can be one <js>"body"</js> parameter at most.
 	 * </ul>
@@ -685,15 +685,15 @@ public class Operation extends SwaggerElement {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		If a parameter is already defined at the {@doc SwaggerPathItemObject Path Item},
+	 * 		If a parameter is already defined at the {@doc ExtSwaggerPathItemObject Path Item},
 	 * 		the new definition will override it, but can never remove it.
 	 * 	<li>
 	 * 		The list MUST NOT include duplicated parameters.
 	 * 	<li>
 	 * 		A unique parameter is defined by a combination of a <c>name</c> and <c>location</c>.
 	 * 	<li>
-	 * 		The list can use the {@doc SwaggerReferenceObject}
-	 * 		to link to parameters that are defined at the {@doc SwaggerParameterObject Swagger Object's parameters}.
+	 * 		The list can use the {@doc ExtSwaggerReferenceObject}
+	 * 		to link to parameters that are defined at the {@doc ExtSwaggerParameterObject Swagger Object's parameters}.
 	 * 	<li>
 	 * 		There can be one <js>"body"</js> parameter at most.
 	 * </ul>
@@ -716,15 +716,15 @@ public class Operation extends SwaggerElement {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		If a parameter is already defined at the {@doc SwaggerPathItemObject Path Item},
+	 * 		If a parameter is already defined at the {@doc ExtSwaggerPathItemObject Path Item},
 	 * 		the new definition will override it, but can never remove it.
 	 * 	<li>
 	 * 		The list MUST NOT include duplicated parameters.
 	 * 	<li>
 	 * 		A unique parameter is defined by a combination of a <c>name</c> and <c>location</c>.
 	 * 	<li>
-	 * 		The list can use the {@doc SwaggerReferenceObject}
-	 * 		to link to parameters that are defined at the {@doc SwaggerParameterObject Swagger Object's parameters}.
+	 * 		The list can use the {@doc ExtSwaggerReferenceObject}
+	 * 		to link to parameters that are defined at the {@doc ExtSwaggerParameterObject Swagger Object's parameters}.
 	 * 	<li>
 	 * 		There can be one <js>"body"</js> parameter at most.
 	 * </ul>
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 423b094..e38922b 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
@@ -88,7 +88,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="in,name,type,description,required,schema,format,allowEmptyValue,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,x-example,x-examples,*")
@@ -262,13 +262,13 @@ public class ParameterInfo extends SwaggerElement {
 	 * 		Parameter names are case sensitive.
 	 * 	<li>
 	 * 		If <c>in</c> is <js>"path"</js>, the <c>name</c> field MUST correspond to the associated path segment
-	 * 		from the <c>path</c> field in the {@doc SwaggerPathsObject Paths Object}.
+	 * 		from the <c>path</c> field in the {@doc ExtSwaggerPathsObject Paths Object}.
 	 * 	<li>
 	 * 		For all other cases, the name corresponds to the parameter name used based on the <c>in</c> property.
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerPathTemplating Path Templating}
+	 * 	<li class='extlink'>{@doc ExtSwaggerPathTemplating Path Templating}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -288,13 +288,13 @@ public class ParameterInfo extends SwaggerElement {
 	 * 		Parameter names are case sensitive.
 	 * 	<li>
 	 * 		If <c>in</c> is <js>"path"</js>, the <c>name</c> field MUST correspond to the associated path segment
-	 * 		from the <c>path</c> field in the {@doc SwaggerPathsObject Paths Object}.
+	 * 		from the <c>path</c> field in the {@doc ExtSwaggerPathsObject Paths Object}.
 	 * 	<li>
 	 * 		For all other cases, the name corresponds to the parameter name used based on the <c>in</c> property.
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerPathTemplating Path Templating}
+	 * 	<li class='extlink'>{@doc ExtSwaggerPathTemplating Path Templating}
 	 * </ul>
 	 *
 	 * @param value
@@ -407,7 +407,7 @@ public class ParameterInfo extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -421,7 +421,7 @@ public class ParameterInfo extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
@@ -545,7 +545,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * The type of the parameter.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 *
 	 * @param value
@@ -605,7 +605,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * The extending format for the previously mentioned type.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypeFormats}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypeFormats}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -621,7 +621,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * The extending format for the previously mentioned type.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -824,7 +824,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Unlike JSON Schema this value MUST conform to the defined <c>type</c> for this parameter.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -843,7 +843,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Unlike JSON Schema this value MUST conform to the defined <c>type</c> for this parameter.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -868,7 +868,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>maximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -881,7 +881,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>maximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -909,7 +909,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>exclusiveMaximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -922,7 +922,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>exclusiveMaximum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -950,7 +950,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>minimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -963,7 +963,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>minimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -991,7 +991,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>exclusiveMinimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1004,7 +1004,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>exclusiveMinimum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -1032,7 +1032,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>maxLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1045,7 +1045,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>maxLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -1073,7 +1073,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>minLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1086,7 +1086,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>minLength</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -1114,7 +1114,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>pattern</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1130,7 +1130,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * This string SHOULD be a valid regular expression.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -1158,7 +1158,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>maxItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1171,7 +1171,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>maxItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -1199,7 +1199,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>minItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1212,7 +1212,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>minItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -1240,7 +1240,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>uniqueItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1253,7 +1253,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>uniqueItems</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value The new value for this property.
@@ -1281,7 +1281,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>enum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1294,7 +1294,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>enum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -1352,7 +1352,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property getter:  <property>multipleOf</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -1365,7 +1365,7 @@ public class ParameterInfo extends SwaggerElement {
 	 * Bean property setter:  <property>multipleOf</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
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 1078d3e..a98cae0 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
@@ -58,7 +58,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="description,schema,headers,x-example,examples,*")
@@ -155,7 +155,7 @@ public class ResponseInfo extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Property value is required.
 	 * @return This object (for method chaining).
 	 */
@@ -187,7 +187,7 @@ public class ResponseInfo extends SwaggerElement {
 	 * 	<li>
 	 * 		If this field does not exist, it means no content is returned as part of the response.
 	 * 	<li>
-	 * 		As an extension to the {@doc SwaggerSchemaObject Schema Object},
+	 * 		As an extension to the {@doc ExtSwaggerSchemaObject Schema Object},
 	 * 		its root type value may also be <js>"file"</js>.
 	 * 	<li>
 	 * 		This SHOULD be accompanied by a relevant produces mime-type.
@@ -209,7 +209,7 @@ public class ResponseInfo extends SwaggerElement {
 	 * 	<li>
 	 * 		If this field does not exist, it means no content is returned as part of the response.
 	 * 	<li>
-	 * 		As an extension to the {@doc SwaggerSchemaObject Schema Object},
+	 * 		As an extension to the {@doc ExtSwaggerSchemaObject Schema Object},
 	 * 		its root type value may also be <js>"file"</js>.
 	 * 	<li>
 	 * 		This SHOULD be accompanied by a relevant produces mime-type.
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 806c23c..1fd694d 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
@@ -56,7 +56,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="format,title,description,default,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,maxProperties,minProperties,required,enum,type,items,allOf,properties,additionalProperties,discriminator,readOnly,xml,externalDocs,example,$ref,*")
@@ -166,7 +166,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * Bean property getter:  <property>format</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypeFormats}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypeFormats}
 	 * </ul>
 	 *
 	 * @return The property value, or <jk>null</jk> if it is not set.
@@ -179,7 +179,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * Bean property setter:  <property>format</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 *
 	 * @param value
@@ -266,7 +266,7 @@ public class SchemaInfo extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -873,7 +873,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * Bean property setter:  <property>enum</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc JsonSchemaValidation}
+	 * 	<li class='extlink'>{@doc ExtJsonSchemaValidation}
 	 * </ul>
 	 *
 	 * @param value
@@ -940,7 +940,7 @@ public class SchemaInfo extends SwaggerElement {
 	 * Bean property setter:  <property>type</property>.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 *
 	 * @param value
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 9c428bb..354460f 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
@@ -58,7 +58,7 @@ import org.apache.juneau.internal.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="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 6c408df..6630d07 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
@@ -30,7 +30,7 @@ import org.apache.juneau.utils.*;
  * This is the root document object for the API specification.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="swagger,info,tags,externalDocs,basePath,schemes,consumes,produces,paths,definitions,parameters,responses,securityDefinitions,security,*")
@@ -286,7 +286,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 SwaggerPathTemplating path templating}
+	 * 	<br>The host does not support {@doc ExtSwaggerPathTemplating path templating}
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -304,7 +304,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 SwaggerPathTemplating path templating}
+	 * 	<br>The host does not support {@doc ExtSwaggerPathTemplating path templating}
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -334,7 +334,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 SwaggerPathTemplating path templating}.
+	 * 	<br>The <c>basePath</c> does not support {@doc ExtSwaggerPathTemplating path templating}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -351,7 +351,7 @@ public class Swagger extends SwaggerElement {
 	 * 	<br>Non-String values will be converted to String using <c>toString()</c>.
 	 * 	<br>If it is not included, the API is served directly under the <c>host</c>.
 	 * 	<br>The value MUST start with a leading slash (/).
-	 * 	<br>The <c>basePath</c> does not support {@doc SwaggerPathTemplating path templating}.
+	 * 	<br>The <c>basePath</c> does not support {@doc ExtSwaggerPathTemplating path templating}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -482,7 +482,7 @@ public class Swagger extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Value MUST be as described under {@doc SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under {@doc ExtSwaggerMimeTypes}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -498,11 +498,11 @@ public class Swagger extends SwaggerElement {
 	 * A list of MIME types the operation can consume.
 	 * This overrides the <c>consumes</c> definition at the Swagger Object.
 	 * An empty value MAY be used to clear the global definition.
-	 * Value MUST be as described under {@doc SwaggerMimeTypes}.
+	 * Value MUST be as described under {@doc ExtSwaggerMimeTypes}.
 	 *
 	 * @param values
 	 * 	The values to add to this property.
-	 * 	<br>Values MUST be as described under {@doc SwaggerMimeTypes}.
+	 * 	<br>Values MUST be as described under {@doc ExtSwaggerMimeTypes}.
 	 * 	<br>Ignored if <jk>null</jk>.
 	 * @return This object (for method chaining).
 	 */
@@ -565,7 +565,7 @@ public class Swagger extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>Value MUST be as described under {@doc SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under {@doc ExtSwaggerMimeTypes}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -585,7 +585,7 @@ public class Swagger extends SwaggerElement {
 	 *
 	 * @param values
 	 * 	The values to add to this property.
-	 * 	<br>Value MUST be as described under {@doc SwaggerMimeTypes}.
+	 * 	<br>Value MUST be as described under {@doc ExtSwaggerMimeTypes}.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
@@ -1238,7 +1238,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 SwaggerOperationObject Operation Object} must be declared.
+	 * 	<br>Not all tags that are used by the {@doc ExtSwaggerOperationObject Operation Object} 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.
@@ -1258,7 +1258,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 SwaggerOperationObject Operation Object} must be declared.
+	 * 	<br>Not all tags that are used by the {@doc ExtSwaggerOperationObject Operation Object} 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 0810150..8bec541 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
@@ -20,7 +20,7 @@ import org.apache.juneau.*;
  * Various useful static methods for creating Swagger elements.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </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 a6e36c9..798bce7 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
@@ -24,7 +24,7 @@ import org.apache.juneau.json.*;
  * Root class for all Swagger beans.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 public abstract class SwaggerElement {
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 8685f18..78fdd47 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.collections.*;
 import org.apache.juneau.internal.*;
 
 /**
- * Allows adding meta data to a single tag that is used by the {@doc SwaggerOperationObject Operation Object}.
+ * Allows adding meta data to a single tag that is used by the {@doc ExtSwaggerOperationObject Operation Object}.
  *
  * <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 juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="name,description,externalDocs,*")
@@ -148,7 +148,7 @@ public class Tag extends SwaggerElement {
 	 *
 	 * @param value
 	 * 	The new value for this property.
-	 * 	<br>{@doc GFM} can be used for rich text representation.
+	 * 	<br>{@doc ExtGFM} can be used for rich text representation.
 	 * 	<br>Can be <jk>null</jk> to unset the property.
 	 * @return This object (for method chaining).
 	 */
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Xml.java
index 5d69dd3..edaa565 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 juneau-dto.Swagger}
+ * 	<li class='link'>{@doc DtoSwagger}
  * </ul>
  */
 @Bean(bpi="name,namespace,prefix,attribute,wrapped,*")
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
index 544c2b4..449659f 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfCommon.java
@@ -220,13 +220,13 @@ public interface RdfCommon {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
+	 * 		{@doc ExtARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
+	 * 		{@doc ExtARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
+	 * 		{@doc ExtARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
+	 * 		{@doc ExtARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
 	 * </ul>
 	 */
 	public static final String RDF_arp_errorMode = PREFIX + ".jena.rdfXml.error-mode.s";
@@ -254,7 +254,7 @@ public interface RdfCommon {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+	 * 		{@doc ExtARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 	 * </ul>
 	 */
 	public static final String RDF_arp_embedding = PREFIX + ".jena.rdfXml.embedding.b";
@@ -286,9 +286,9 @@ public interface RdfCommon {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li>
-	 * 		{@doc ARP/ARPErrorNumbers.html ARPErrorNumbers}
+	 * 		{@doc ExtARP/ARPErrorNumbers.html ARPErrorNumbers}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setErrorMode(int,%20int) ARPOptions.setErrorMode(int, int)}
+	 * 		{@doc ExtARP/ARPOptions.html#setErrorMode(int,%20int) ARPOptions.setErrorMode(int, int)}
 	 * </ul>
 	 */
 	public static final String RDF_arp_err_ = PREFIX + ".jena.rdfXml.ERR_";
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 0bec5c1..9352503 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
@@ -274,7 +274,7 @@ public class RdfSerializer extends WriterSerializer implements RdfCommon, RdfMet
 	 * @param accept
 	 * 	The accept media types that the serializer can handle.
 	 * 	<p>
-	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc RFC2616.section14.1}
+	 * 	Can contain meta-characters per the <c>media-type</c> specification of {@doc ExtRFC2616.section14.1}
 	 * 	<p>
 	 * 	If empty, then assumes the only media type supported is <c>produces</c>.
 	 * 	<p>
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 e4141dc..ca7854a 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
@@ -146,7 +146,7 @@ public @interface Rdf {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
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 2e59938..ea2b7c6 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
@@ -56,7 +56,7 @@ public @interface RdfConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	Rdf[] applyRdf() default {};
@@ -98,7 +98,7 @@ public @interface RdfConfig {
 	 * 				http://www.dajobe.org/2004/01/turtle/
 	 *		 </ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -112,7 +112,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -126,7 +126,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -157,7 +157,7 @@ public @interface RdfConfig {
 	 * 				{@doc http://www.ietf.org/rfc/rfc3987.txt RFC 3987}).
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -185,19 +185,19 @@ public @interface RdfConfig {
 	 * 			<li><js>"strict-fatal"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='jf'>{@link RdfCommon#RDF_arp_errorMode}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
+	 * 		{@doc ExtARP/ARPOptions.html#setDefaultErrorMode() ARPOptions.setDefaultErrorMode()}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
+	 * 		{@doc ExtARP/ARPOptions.html#setLaxErrorMode() ARPOptions.setLaxErrorMode()}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
+	 * 		{@doc ExtARP/ARPOptions.html#setStrictErrorMode() ARPOptions.setStrictErrorMode()}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
+	 * 		{@doc ExtARP/ARPOptions.html#setStrictErrorMode(int) ARPOptions.setStrictErrorMode(int)}
 	 * </ul>
 	 */
 	String arp_errorMode() default "";
@@ -210,13 +210,13 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='jf'>{@link RdfCommon#RDF_arp_embedding}
 	 * 	<li>
-	 * 		{@doc ARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
+	 * 		{@doc ExtARP/ARPOptions.html#setEmbedding(boolean) ARPOptions.setEmbedding(boolean)}
 	 * </ul>
 	 */
 	String arp_embedding() default "";
@@ -229,7 +229,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -247,7 +247,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -264,7 +264,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -303,7 +303,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -329,7 +329,7 @@ public @interface RdfConfig {
 	 * 				In this case the encoding is shown in the XML declaration.
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -349,7 +349,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -366,7 +366,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -383,7 +383,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -402,7 +402,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -419,7 +419,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -436,7 +436,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -453,7 +453,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -470,7 +470,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -487,7 +487,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -505,7 +505,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -522,7 +522,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -539,7 +539,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -556,7 +556,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -573,7 +573,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -604,7 +604,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>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -631,7 +631,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -652,7 +652,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -677,7 +677,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -691,7 +691,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -714,7 +714,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -735,7 +735,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -752,7 +752,7 @@ public @interface RdfConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -776,7 +776,7 @@ public @interface RdfConfig {
 	 * 			<li><js>"false"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
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 ac11782..49ad117 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
@@ -142,7 +142,7 @@ import org.apache.juneau.utils.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.ContextsBuildersSessionsPropertyStores}
+ * 	<li class='link'>{@doc ContextsBuildersSessionsPropertyStores}
  * </ul>
  */
 @SuppressWarnings({"unchecked","rawtypes"})
@@ -570,7 +570,7 @@ public class BeanContext extends Context implements MetaProvider {
 	 * </p>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.BeanDictionaries}
+	 * 	<li class='link'>{@doc BeanDictionaries}
 	 * </ul>
 	 */
 	public static final String BEAN_beanDictionary = PREFIX + ".beanDictionary.lc";
@@ -1121,7 +1121,7 @@ public class BeanContext extends Context implements MetaProvider {
 	 * </p>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.BeanDictionaries}
+	 * 	<li class='link'>{@doc BeanDictionaries}
 	 * </ul>
 	 */
 	public static final String BEAN_typePropertyName = PREFIX + ".typePropertyName.s";
@@ -2112,12 +2112,12 @@ public class BeanContext extends Context implements MetaProvider {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.PojoSwaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.PerMediaTypePojoSwaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.OneWayPojoSwaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.SwapAnnotation}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.AutoPojoSwaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.SurrogateClasses}
+	 * 	<li class='link'>{@doc PojoSwaps}
+	 * 	<li class='link'>{@doc PerMediaTypePojoSwaps}
+	 * 	<li class='link'>{@doc OneWayPojoSwaps}
+	 * 	<li class='link'>{@doc SwapAnnotation}
+	 * 	<li class='link'>{@doc AutoPojoSwaps}
+	 * 	<li class='link'>{@doc SurrogateClasses}
 	 * </ul>
 	 */
 	public static final String BEAN_swaps = PREFIX + ".swaps.lo";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
index e1e6767..5331adf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextBuilder.java
@@ -61,7 +61,7 @@ import org.apache.juneau.transform.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.ConfigurableProperties}
+ * 	<li class='link'>{@doc GlossaryConfigurableProperties}
  * </ul>
  */
 public class BeanContextBuilder extends ContextBuilder {
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 bfd007a..90ab007 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
@@ -29,7 +29,7 @@ import org.apache.juneau.transform.*;
  * This annotation can be applied to classes and interfaces.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.Transforms.BeanAnnotation}
+ * 	<li class='link'>{@doc BeanAnnotation}
  * </ul>
  */
 @Documented
@@ -302,7 +302,7 @@ public @interface Bean {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
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 44a1b34..6d0b999 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
@@ -58,7 +58,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	Bean[] applyBean() default {};
@@ -71,7 +71,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	Beanc[] applyBeanc() default {};
@@ -84,7 +84,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	Beanp[] applyBeanp() default {};
@@ -97,7 +97,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	BeanIgnore[] applyBeanIgnore() default {};
@@ -110,7 +110,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	Example[] applyExample() default {};
@@ -123,7 +123,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	NameProperty[] applyNameProperty() default {};
@@ -136,7 +136,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	ParentProperty[] applyParentProperty() default {};
@@ -149,7 +149,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	Swap[] applySwap() default {};
@@ -162,7 +162,7 @@ public @interface BeanConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	URI[] applyURI() default {};
@@ -188,7 +188,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"PRIVATE"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -218,7 +218,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"PRIVATE"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -245,7 +245,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='jf'>{@link BeanContext#BEAN_beanDictionary}
-	 * 	<li class='link'>{@doc juneau-marshall.BeanDictionaries}
+	 * 	<li class='link'>{@doc BeanDictionaries}
 	 * </ul>
 	 *
 	 * <div class='warn'>
@@ -304,7 +304,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"PRIVATE"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -336,8 +336,8 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='jf'>{@link BeanContext#BEAN_beanFilters}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.BeanFilters}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.InterfaceFilters}
+	 * 	<li class='link'>{@doc BeanFilters}
+	 * 	<li class='link'>{@doc InterfaceFilters}
 	 * </ul>
 	 *
 	 * <div class='warn'>
@@ -383,7 +383,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default because it introduces a slight performance penalty during serialization)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -413,7 +413,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"PRIVATE"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -437,7 +437,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * 	<li>
 	 * 		The {@link Bean @Bean} annotation can be used on a class to override this setting when <js>"true"</js>.
 	 * </ul>
@@ -463,7 +463,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * 	<li>
 	 * 		The {@link Bean @Bean} annotation can be used on a class to override this setting when <js>"true"</js>.
 	 * </ul>
@@ -489,7 +489,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -513,7 +513,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -533,7 +533,7 @@ public @interface BeanConfig {
 	 * 	<li>
 	 * 		Default value: <js>"_type"</js>.
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 
 	 * <ul class='seealso'>
@@ -594,7 +594,7 @@ public @interface BeanConfig {
 	 * 	bpi=<js>"Bean1: foo; Bean2: bar,baz"</js>
 	 * 		</p>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -627,7 +627,7 @@ public @interface BeanConfig {
 	 * 	<li>
 	 * 		Setting applies to specified class and all subclasses.
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -693,7 +693,7 @@ public @interface BeanConfig {
 	 * 	bpx=<js>"Bean1: foo; Bean2: bar,baz"</js>
 	 * 		</p>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -726,7 +726,7 @@ public @interface BeanConfig {
 	 *	<li>
 	 * 		Setting applies to specified class and all subclasses.
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -776,7 +776,7 @@ public @interface BeanConfig {
 	 * 	bpro=<js>"Bean1: foo; Bean2: bar,baz"</js>
 	 * 		</p>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -810,7 +810,7 @@ public @interface BeanConfig {
 	 * 	<li>
 	 * 		Properties apply to specified class and all subclasses.
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -860,7 +860,7 @@ public @interface BeanConfig {
 	 * 	bpwo=<js>"Bean1: foo; Bean2: bar,baz"</js>
 	 * 		</p>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -894,7 +894,7 @@ public @interface BeanConfig {
 	 * 	<li>
 	 * 		Properties apply to specified class and all subclasses.
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -939,7 +939,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -966,7 +966,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='jf'>{@link BeanContext#BEAN_beanDictionary}
-	 * 	<li class='link'>{@doc juneau-marshall.BeanDictionaries}
+	 * 	<li class='link'>{@doc BeanDictionaries}
 	 * </ul>
 	 */
 	Class<?>[] dictionary() default {};
@@ -1021,7 +1021,7 @@ public @interface BeanConfig {
 	 * 			<li>A static method with name <c>example</c> with no arguments or one {@link BeanSession} argument.
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1053,7 +1053,7 @@ public @interface BeanConfig {
 	 * 		The individual strings are concatenated together and the whole string is treated as a JSON Object.
 	 * 		<br>The leading and trailing <js>'{'</js> and <js>'}'</js> characters are optional.
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1094,7 +1094,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1118,7 +1118,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1142,7 +1142,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1166,7 +1166,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1189,7 +1189,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1213,7 +1213,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1237,7 +1237,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1322,7 +1322,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1339,7 +1339,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1357,7 +1357,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1410,7 +1410,7 @@ public @interface BeanConfig {
 	 * 			<li><c>java.util.*</c>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1511,7 +1511,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1537,12 +1537,12 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='seealso'>
 	 * 	<li class='jf'>{@link BeanContext#BEAN_swaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.PojoSwaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.PerMediaTypePojoSwaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.OneWayPojoSwaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.SwapAnnotation}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.AutoPojoSwaps}
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.SurrogateClasses}
+	 * 	<li class='link'>{@doc PojoSwaps}
+	 * 	<li class='link'>{@doc PerMediaTypePojoSwaps}
+	 * 	<li class='link'>{@doc OneWayPojoSwaps}
+	 * 	<li class='link'>{@doc SwapAnnotation}
+	 * 	<li class='link'>{@doc AutoPojoSwaps}
+	 * 	<li class='link'>{@doc SurrogateClasses}
 	 * </ul>
 	 */
 	Class<?>[] swaps() default {};
@@ -1573,7 +1573,7 @@ public @interface BeanConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1596,7 +1596,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1621,7 +1621,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1645,7 +1645,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1690,7 +1690,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1718,7 +1718,7 @@ public @interface BeanConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1740,7 +1740,7 @@ public @interface BeanConfig {
 	 *	<li>
 	 * 		Default value: <js>"0"</js>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -1762,7 +1762,7 @@ public @interface BeanConfig {
 	 * 	<li>
 	 * 		Default value: <js>"100"</js>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConstructor.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
index 93305e8..85c5269 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConstructor.java
@@ -43,7 +43,7 @@ import org.apache.juneau.*;
  * Multiple calls to {@link BeanMap#getBean()} will return the same bean instance.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.Transforms.BeancAnnotation}
+ * 	<li class='link'>{@doc BeancAnnotation}
  * </ul>
  *
  * <div class='warn'>
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 f4a0b65..6ca9845 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
@@ -32,7 +32,7 @@ import java.lang.annotation.*;
  * Applies to getters or setters that should not be interpreted as bean property getters or setters.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.Transforms.BeanIgnoreAnnotation}
+ * 	<li class='link'>{@doc BeanIgnoreAnnotation}
  * </ul>
  */
 @Documented
@@ -141,7 +141,7 @@ public @interface BeanIgnore {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
index b5ac4ea..e29de36 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanProperty.java
@@ -26,7 +26,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 juneau-marshall.Transforms.BeanpAnnotation}
+ * 	<li class='link'>{@doc BeanpAnnotation}
  * </ul>
  *
  * <div class='warn'>
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 da45a5a..194e874 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
@@ -43,7 +43,7 @@ import org.apache.juneau.*;
  * Multiple calls to {@link BeanMap#getBean()} will return the same bean instance.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.Transforms.BeancAnnotation}
+ * 	<li class='link'>{@doc BeancAnnotation}
  * </ul>
  */
 @Documented
@@ -122,7 +122,7 @@ public @interface Beanc {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
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 4601507..bdd404b 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
@@ -27,7 +27,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 juneau-marshall.Transforms.BeanpAnnotation}
+ * 	<li class='link'>{@doc BeanpAnnotation}
  * </ul>
  */
 @Documented
@@ -262,7 +262,7 @@ public @interface Beanp {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
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 2759089..95a5e5a 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 juneau-marshall.Transforms.PojoBuilders}
+ * 	<li class='link'>{@doc PojoBuilders}
  * </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 4505e82..d77f699 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
@@ -141,7 +141,7 @@ public @interface Example {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
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 56af737..14c6806 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
@@ -26,7 +26,7 @@ import java.lang.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.Transforms.NamePropertyAnnotation}
+ * 	<li class='link'>{@doc NamePropertyAnnotation}
  * </ul>
  */
 @Target({METHOD,FIELD})
@@ -93,7 +93,7 @@ public @interface NameProperty {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
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 808a1c5..e2dbed7 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
@@ -29,7 +29,7 @@ import java.lang.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.Transforms.NamePropertyAnnotation}
+ * 	<li class='link'>{@doc NamePropertyAnnotation}
  * </ul>
  */
 @Target({METHOD,FIELD})
@@ -96,7 +96,7 @@ public @interface ParentProperty {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
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 b8ef0a6..15d9183 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.transform.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.Transforms.SwapAnnotation}
+ * 	<li class='link'>{@doc SwapAnnotation}
  * </ul>
  */
 @Documented
@@ -66,7 +66,7 @@ public @interface Swap {
 	 * </p>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.PerMediaTypePojoSwaps}
+	 * 	<li class='link'>{@doc PerMediaTypePojoSwaps}
 	 * </ul>
 	 */
 	String[] mediaTypes() default {};
@@ -151,7 +151,7 @@ public @interface Swap {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
@@ -187,7 +187,7 @@ public @interface Swap {
 	 * </p>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.Transforms.TemplatedSwaps}
+	 * 	<li class='link'>{@doc TemplatedSwaps}
 	 * </ul>
 	 */
 	String template() default "";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swaps.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swaps.java
index cd0e48f..dc2cb70 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swaps.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swaps.java
@@ -32,7 +32,7 @@ import java.lang.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.Transforms.SwapAnnotation}
+ * 	<li class='link'>{@doc SwapAnnotation}
  * </ul>
  */
 @Documented
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 1b22e2c..6b6825d 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
@@ -24,7 +24,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 juneau-marshall.URIs}
+ * 	<li class='link'>{@doc MarshallingUris}
  * </ul>
  */
 @Documented
@@ -113,7 +113,7 @@ public @interface URI {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
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 e7cbc54..2c212aa 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
@@ -111,7 +111,7 @@ public @interface Csv {
 	 * </ul>
 	 *
 \	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
index 83ceb7b..848a637 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
@@ -53,7 +53,7 @@ public @interface CsvConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	Csv[] applyCsv() default {};
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 8fc87f4..2904f86 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -729,7 +729,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-rest-server.HtmlDocAnnotation.Widgets}
+	 * 	<li class='link'>{@doc RestHtmlWidgets}
 	 * </ul>
 	 */
 	public static final String HTMLDOC_widgets = PREFIX + ".widgets.lo";
@@ -775,7 +775,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
 	 * 	The accept media types that the serializer can handle.
 	 * 	<p>
 	 * 	Can contain meta-characters per the <c>media-type</c> specification of
-	 * 	{@doc RFC2616.section14.1}
+	 * 	{@doc ExtRFC2616.section14.1}
 	 * 	<p>
 	 * 	If empty, then assumes the only media type supported is <c>produces</c>.
 	 * 	<p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlRender.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlRender.java
index bee3980..d2572c5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlRender.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlRender.java
@@ -25,7 +25,7 @@ import org.apache.juneau.serializer.*;
  * Using this class, you can alter the CSS style and HTML content of the bean property.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.HtmlDetails.HtmlRenderAnnotation}
+ * 	<li class='link'>{@doc HtmlRenderAnnotation}
  * </ul>
  *
  * @param <T> The bean property type.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index 63371c3..f220ae4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -62,7 +62,7 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
 	 * 	The accept media types that the serializer can handle.
 	 * 	<p>
 	 * 	Can contain meta-characters per the <c>media-type</c> specification of
-	 * 	{@doc RFC2616.section14.1}
+	 * 	{@doc ExtRFC2616.section14.1}
 	 * 	<p>
 	 * 	If empty, then assumes the only media type supported is <c>produces</c>.
 	 * 	<p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 2cff8e8..996661e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -697,7 +697,7 @@ public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider, H
 	 * 	The accept media types that the serializer can handle.
 	 * 	<p>
 	 * 	Can contain meta-characters per the <c>media-type</c> specification of
-	 * 	{@doc RFC2616.section14.1}
+	 * 	{@doc ExtRFC2616.section14.1}
 	 * 	<p>
 	 * 	If empty, then assumes the only media type supported is <c>produces</c>.
 	 * 	<p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index f9c50b8..16e8a0a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -68,7 +68,7 @@ public class HtmlStrippedDocSerializer extends HtmlSerializer {
 	 * 	The accept media types that the serializer can handle.
 	 * 	<p>
 	 * 	Can contain meta-characters per the <c>media-type</c> specification of
-	 * 	{@doc RFC2616.section14.1}
+	 * 	{@doc ExtRFC2616.section14.1}
 	 * 	<p>
 	 * 	If empty, then assumes the only media type supported is <c>produces</c>.
 	 * 	<p>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
index 95fbb59..76294cd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidget.java
@@ -27,7 +27,7 @@ import org.apache.juneau.svl.*;
  * Widgets can be defined as inner classes of REST resource classes.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HtmlDocAnnotation.Widgets}
+ * 	<li class='link'>{@doc RestHtmlWidgets}
  * </ul>
  */
 public interface HtmlWidget {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidgetVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidgetVar.java
index a1a6b3e..3f4ed9b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidgetVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidgetVar.java
@@ -33,7 +33,7 @@ import org.apache.juneau.svl.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.SvlVariables}
+ * 	<li class='link'>{@doc RestSvlVariables}
  * </ul>
  */
 public class HtmlWidgetVar extends SimpleVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
index 6cf1de9..d8505e1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
@@ -23,7 +23,7 @@ import org.apache.juneau.html.*;
  * Annotation that can be applied to classes, fields, and methods to tweak how they are handled by {@link HtmlSerializer}.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-marshall.HtmlDetails.HtmlAnnotation}
+ * 	<li class='link'>{@doc HtmlAnnotation}
  * </ul>
  */
 @Documented
@@ -182,7 +182,7 @@ public @interface Html {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
index b29eaa7..d3327b6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
@@ -54,7 +54,7 @@ public @interface HtmlConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	Html[] applyHtml() default {};
@@ -67,7 +67,7 @@ public @interface HtmlConfig {
 	 * to apply the annotation to.
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	HtmlLink[] applyHtmlLink() default {};
@@ -95,7 +95,7 @@ public @interface HtmlConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -143,7 +143,7 @@ public @interface HtmlConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -191,7 +191,7 @@ public @interface HtmlConfig {
 	 * 			<li><js>"false"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -210,7 +210,7 @@ public @interface HtmlConfig {
 	 * 	<li>
 	 * 		Default value: <js>"label"</js>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -261,7 +261,7 @@ public @interface HtmlConfig {
 	 * 			<li><js>"false"</js>
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
@@ -291,7 +291,7 @@ public @interface HtmlConfig {
 	 * 			<li><js>"PATH_RELATIVE"</js> - Same as <js>"TO_STRING"</js> but assumes it's a path-relative path.
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultSvlVariables} (e.g. <js>"$C{myConfigVar}"</js>).
+	 * 		Supports {@doc DefaultVarResolver} (e.g. <js>"$C{myConfigVar}"</js>).
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
index ae16b9b..4ccbf32 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
@@ -72,7 +72,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		Format: HTML
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		A value of <js>"NONE"</js> can be used to force no value.
@@ -127,7 +127,7 @@ public @interface HtmlDocConfig {
 	 * 			<li><js>"DEFAULT"</js> (defaults to <js>"RIGHT"</js>)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		On methods, this value is inherited from the <ja>@HtmlDocConfig</ja> annotation on the servlet/resource class.
@@ -161,7 +161,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		Format: HTML
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		A value of <js>"NONE"</js> can be used to force no value.
@@ -201,7 +201,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		Format: HTML
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		A value of <js>"NONE"</js> can be used to force no value.
@@ -244,7 +244,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		The parent value can be included by adding the literal <js>"INHERIT"</js> as a value.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		Multiple values are combined with newlines into a single string.
@@ -283,7 +283,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		When {@link #navlinks()} is also specified, this content is placed AFTER the navigation links.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		A value of <js>"NONE"</js> can be used to force no value.
@@ -343,7 +343,7 @@ public @interface HtmlDocConfig {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		A value of <js>"NONE"</js> can be used to force no value.
@@ -352,7 +352,7 @@ public @interface HtmlDocConfig {
 	 * 		<br>Use the syntax <js>"key[index]: value"</js> or <js>"[index]: value"</js> to specify an index location
 	 * 		to place a link inside the list of parent links.
 	 * 	<li>
-	 * 		Supports {@doc juneau-marshall.URIs} (e.g. <js>"servlet:/..."</js>, <js>"request:/..."</js>).
+	 * 		Supports {@doc MarshallingUris} (e.g. <js>"servlet:/..."</js>, <js>"request:/..."</js>).
 	 * 	<li>
 	 * 		On methods, this value is inherited from the <ja>@HtmlDocConfig</ja> annotation on the servlet/resource class.
 	 * 	<li>
@@ -385,7 +385,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		A value of <js>"NONE"</js> can be used to represent no value to differentiate it from an empty string.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 *
@@ -409,7 +409,7 @@ public @interface HtmlDocConfig {
 	 * 			<li><js>"false"</js> (default)
 	 * 		</ul>
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 *
@@ -438,7 +438,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		Format: Javascript
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		A value of <js>"NONE"</js> can be used to force no value.
@@ -479,7 +479,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		Format: CSS
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		A value of <js>"NONE"</js> can be used to force no value.
@@ -513,7 +513,7 @@ public @interface HtmlDocConfig {
 	 * 	<li>
 	 * 		Format: URL
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		On methods, this value is inherited from the <ja>@HtmlDocConfig</ja> annotation on the servlet/resource class.
@@ -600,7 +600,7 @@ public @interface HtmlDocConfig {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-rest-server.HtmlDocAnnotation.Widgets}
+	 * 	<li class='link'>{@doc RestHtmlWidgets}
 	 * </ul>
 	 */
 	Class<? extends HtmlWidget>[] widgets() default {};
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLink.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLink.java
index c3e9708..1548be3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLink.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLink.java
@@ -66,7 +66,7 @@ public @interface HtmlLink {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='link'>{@doc juneau-marshall.DynamicallyAppliedAnnotations}
+	 * 	<li class='link'>{@doc DynamicallyAppliedAnnotations}
 	 * </ul>
 	 */
 	String on() default "";
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
index ae31e09..63eac25 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/Constants.java
@@ -16,7 +16,7 @@ package org.apache.juneau.http;
  * Constants used by classes in this package.
  *
  * <ul class='seealso'>
- * 	<li class='extlink'>{@doc RFC2616}
+ * 	<li class='extlink'>{@doc ExtRFC2616}
  * </ul>
  */
 public class Constants {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityTag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityTag.java
index 81dbe78..ccb5a21 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityTag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/EntityTag.java
@@ -28,7 +28,7 @@ import org.apache.juneau.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='extlink'>{@doc RFC2616}
+ * 	<li class='extlink'>{@doc ExtRFC2616}
  * </ul>
  */
 public class EntityTag {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
index 91698ab..b16e53e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
@@ -22,33 +22,33 @@ import org.apache.juneau.collections.*;
  * Represents valid HTTP 1.1 method name static strings per the RFC 2616 spec.
  *
  * <ul class='seealso'>
- * 	<li class='extlink'>{@doc RFC2616}
+ * 	<li class='extlink'>{@doc ExtRFC2616}
  * </ul>
  */
 public class HttpMethod {
 
-	/** {@doc RFC2616.section9#sec9.2 OPTIONS} */
+	/** {@doc ExtRFC2616.section9#sec9.2 OPTIONS} */
 	public static final String OPTIONS = "OPTIONS";
 
-	/** {@doc RFC2616.section9#sec9.3 GET} */
+	/** {@doc ExtRFC2616.section9#sec9.3 GET} */
 	public static final String GET = "GET";
 
-	/** {@doc RFC2616.section9#sec9.4 HEAD} */
+	/** {@doc ExtRFC2616.section9#sec9.4 HEAD} */
 	public static final String HEAD = "HEAD";
 
-	/** {@doc RFC2616.section9#sec9.5 POST} */
+	/** {@doc ExtRFC2616.section9#sec9.5 POST} */
 	public static final String POST = "POST";
 
-	/** {@doc RFC2616.section9#sec9.6 PUT} */
+	/** {@doc ExtRFC2616.section9#sec9.6 PUT} */
 	public static final String PUT = "PUT";
 
-	/** {@doc RFC2616.section9#sec9.7 DELETE} */
+	/** {@doc ExtRFC2616.section9#sec9.7 DELETE} */
 	public static final String DELETE = "DELETE";
 
-	/** {@doc RFC2616.section9#sec9.8 TRACE} */
+	/** {@doc ExtRFC2616.section9#sec9.8 TRACE} */
 	public static final String TRACE = "TRACE";
 
-	/** {@doc RFC2616.section9#sec9.9 CONNECT} */
+	/** {@doc ExtRFC2616.section9#sec9.9 CONNECT} */
 	public static final String CONNECT = "CONNECT";
 
 	/** {@doc https://tools.ietf.org/html/rfc5789 PATCH} */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
index f563e5a..9981ba5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
@@ -16,7 +16,7 @@ package org.apache.juneau.http;
  * Represents valid HTTP 1.1 method name static strings per the RFC 2616 spec.
  *
  * <ul class='seealso'>
- * 	<li class='extlink'>{@doc RFC2616}
+ * 	<li class='extlink'>{@doc ExtRFC2616}
  * </ul>
  *
  * @deprecated Use {@link HttpMethod}.
@@ -24,28 +24,28 @@ package org.apache.juneau.http;
 @Deprecated
 public class HttpMethodName {
 
-	/** {@doc RFC2616.section9#sec9.2 OPTIONS} */
+	/** {@doc ExtRFC2616.section9#sec9.2 OPTIONS} */
 	public static final String OPTIONS = "OPTIONS";
 
-	/** {@doc RFC2616.section9#sec9.3 GET} */
+	/** {@doc ExtRFC2616.section9#sec9.3 GET} */
 	public static final String GET = "GET";
 
-	/** {@doc RFC2616.section9#sec9.4 HEAD} */
+	/** {@doc ExtRFC2616.section9#sec9.4 HEAD} */
 	public static final String HEAD = "HEAD";
 
-	/** {@doc RFC2616.section9#sec9.5 POST} */
+	/** {@doc ExtRFC2616.section9#sec9.5 POST} */
 	public static final String POST = "POST";
 
-	/** {@doc RFC2616.section9#sec9.6 PUT} */
+	/** {@doc ExtRFC2616.section9#sec9.6 PUT} */
 	public static final String PUT = "PUT";
 
-	/** {@doc RFC2616.section9#sec9.7 DELETE} */
+	/** {@doc ExtRFC2616.section9#sec9.7 DELETE} */
 	public static final String DELETE = "DELETE";
 
-	/** {@doc RFC2616.section9#sec9.8 TRACE} */
+	/** {@doc ExtRFC2616.section9#sec9.8 TRACE} */
 	public static final String TRACE = "TRACE";
 
-	/** {@doc RFC2616.section9#sec9.9 CONNECT} */
+	/** {@doc ExtRFC2616.section9#sec9.9 CONNECT} */
 	public static final String CONNECT = "CONNECT";
 
 	/** {@doc https://tools.ietf.org/html/rfc5789 PATCH} */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaRange.java
index aa13a85..d24137f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaRange.java
@@ -24,7 +24,7 @@ import org.apache.juneau.collections.*;
  * Section 14.1 and 14.7 of RFC2616 (the HTTP/1.1 specification).
  *
  * <ul class='seealso'>
- * 	<li class='extlink'>{@doc RFC2616}
+ * 	<li class='extlink'>{@doc ExtRFC2616}
  * </ul>
  */
 @BeanIgnore
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
index a9be56b..598ef0e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
@@ -31,7 +31,7 @@ import org.apache.juneau.json.*;
  * Section 14.1 and 14.7 of RFC2616 (the HTTP/1.1 specification).
  *
  * <ul class='seealso'>
- * 	<li class='extlink'>{@doc RFC2616}
+ * 	<li class='extlink'>{@doc ExtRFC2616}
  * </ul>
  */
 @BeanIgnore
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
index 76b5490..c51c72b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/StringRange.java
@@ -34,7 +34,7 @@ import org.apache.juneau.collections.*;
  * An example of a type range is a value in an <c>Accept-Encoding</c> header.
  *
  * <ul class='seealso'>
- * 	<li class='extlink'>{@doc RFC2616}
+ * 	<li class='extlink'>{@doc ExtRFC2616}
  * </ul>
  */
 @BeanIgnore
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index 19b0d6b..06a82e8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -100,22 +100,22 @@ import org.apache.juneau.jsonschema.*;
  * </ol>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.Body}
- * 	<li class='link'>{@doc juneau-rest-server.Swagger}
- * 	<li class='extlink'>{@doc SwaggerParameterObject}
+ * 	<li class='link'>{@doc RestBodyAnnotation}
+ * 	<li class='link'>{@doc RestSwagger}
+ * 	<li class='extlink'>{@doc ExtSwaggerParameterObject}
  * </ul>
  *
  * <h5 class='topic'>Arguments and argument-types of client-side @RemoteResource-annotated interfaces</h5>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.Body}
+ * 	<li class='link'>{@doc RestcBody}
  * </ul>
  *
  * <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.Request}
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.Request}
+ * 	<li class='link'>{@doc RestRequestAnnotation}
+ * 	<li class='link'>{@doc RestcRequest}
  * </ul>
  *
  * <div class='warn'>
@@ -140,7 +140,7 @@ public @interface Body {
 	//=================================================================================================================
 
 	/**
-	 * <mk>description</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>description</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A brief description of the body. This could contain examples of use.
@@ -173,7 +173,7 @@ public @interface Body {
 	 * 		The format is plain text.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -185,7 +185,7 @@ public @interface Body {
 	String[] d() default {};
 
 	/**
-	 * <mk>required</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>required</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Determines whether the body is mandatory.
@@ -224,7 +224,7 @@ public @interface Body {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -240,7 +240,7 @@ public @interface Body {
 	//=================================================================================================================
 
 	/**
-	 * <mk>schema</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>schema</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * The schema defining the type used for the body parameter.
@@ -261,7 +261,7 @@ public @interface Body {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -275,7 +275,7 @@ public @interface Body {
 	 * A serialized example of the body of a request.
 	 *
 	 * <p>
-	 * This is the {@doc SimpleJson} of an example of the body.
+	 * This is the {@doc SimplifiedJson} of an example of the body.
 	 *
 	 * <p>
 	 * This value is converted to a POJO and then serialized to all the registered serializers on the REST method to produce examples for all
@@ -380,13 +380,13 @@ public @interface Body {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		The format is any {@doc SimpleJson} if the object can be converted to a POJO using {@link JsonParser#DEFAULT} or a simple String if the object
+	 * 		The format is any {@doc SimplifiedJson} if the object can be converted to a POJO using {@link JsonParser#DEFAULT} or a simple String if the object
 	 * 		has a schema associated with it meancan be converted from a String.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li>
 	 * 		The format of this object can also be a simple String if the body has a schema associated with it, meaning it's meant to be treated as an HTTP part.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -401,7 +401,7 @@ public @interface Body {
 	 * Serialized examples of the body of a request.
 	 *
 	 * <p>
-	 * This is a {@doc SimpleJson} object whose keys are media types and values are string representations of that value.
+	 * This is a {@doc SimplifiedJson} object whose keys are media types and values are string representations of that value.
 	 *
 	 * <p>
 	 * In general you won't need to populate this value directly since it will automatically be calculated based on the value provided in the {@link #example()} field.
@@ -425,13 +425,13 @@ public @interface Body {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		The format is a {@doc SimpleJson} object with string keys (media type) and string values (example for that media type) .
+	 * 		The format is a {@doc SimplifiedJson} object with string keys (media type) and string values (example for that media type) .
 	 * 	<li>
 	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 	<li>
 	 * 		Multiple lines are concatenated with newlines so that you can format the value to be readable:
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		Resolution of variables is delayed until request time and occurs before parsing.
@@ -446,10 +446,10 @@ public @interface Body {
 	String[] exs() default {};
 
 	/**
-	 * Free-form value for the {@doc SwaggerParameterObject}.
+	 * Free-form value for the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
-	 * This is a {@doc SimpleJson} object that makes up the swagger information for this parameter-info.
+	 * This is a {@doc SimplifiedJson} object that makes up the swagger information for this parameter-info.
 	 *
 	 * <p>
 	 * The following are completely equivalent ways of defining the swagger description of the body:
@@ -502,7 +502,7 @@ public @interface Body {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		The format is a {@doc SimpleJson} object.
+	 * 		The format is a {@doc SimplifiedJson} object.
 	 * 	<li>
 	 * 		Schema-based serialization is NOT affected by values defined in this annotation.
 	 * 		<br>It only affects the generated Swagger documentation.
@@ -518,7 +518,7 @@ public @interface Body {
 	 * 	<li>
 	 * 		Multiple lines are concatenated with newlines so that you can format the value to be readable.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		Values defined in this field supersede values pulled from the Swagger JSON file and are superseded by individual values defined on this annotation.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
index 5ebc38b..9b3b484 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
@@ -53,8 +53,8 @@ import java.lang.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.Swagger}
- * 	<li class='extlink'>{@doc SwaggerContactObject}
+ * 	<li class='link'>{@doc RestSwagger}
+ * 	<li class='extlink'>{@doc ExtSwaggerContactObject}
  * </ul>
  */
 @Documented
@@ -62,7 +62,7 @@ import java.lang.annotation.*;
 public @interface Contact {
 
 	/**
-	 * <mk>name</mk> field of the {@doc SwaggerContactObject}.
+	 * <mk>name</mk> field of the {@doc ExtSwaggerContactObject}.
 	 *
 	 * <p>
 	 * The identifying name of the contact person/organization.
@@ -71,14 +71,14 @@ public @interface Contact {
 	 * 	<li>
 	 * 		The format is a plain-text string.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
 	String name() default "";
 
 	/**
-	 * <mk>url</mk> field of the {@doc SwaggerContactObject}.
+	 * <mk>url</mk> field of the {@doc ExtSwaggerContactObject}.
 	 *
 	 * <p>
 	 * The URL pointing to the contact information. MUST be in the format of a URL.
@@ -87,14 +87,14 @@ public @interface Contact {
 	 * 	<li>
 	 * 		The format is a URL string.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
 	String url() default "";
 
 	/**
-	 * <mk>email</mk> field of the {@doc SwaggerContactObject}.
+	 * <mk>email</mk> field of the {@doc ExtSwaggerContactObject}.
 	 *
 	 * <p>
 	 * The email address of the contact person/organization. MUST be in the format of an email address.
@@ -103,14 +103,14 @@ public @interface Contact {
 	 * 	<li>
 	 * 		The format is an email string.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
 	String email() default "";
 
 	/**
-	 * Free-form value for the {@doc SwaggerContactObject}.
+	 * Free-form value for the {@doc ExtSwaggerContactObject}.
 	 *
 	 * <p>
 	 * This is a JSON object that makes up the swagger information for this field.
@@ -162,7 +162,7 @@ public @interface Contact {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		The format is a {@doc SimpleJson} object.
+	 * 		The format is a {@doc SimplifiedJson} object.
 	 * 	<li>
 	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 		<br>The following two example are considered equivalent:
@@ -175,7 +175,7 @@ public @interface Contact {
 	 * 	<li>
 	 * 		Multiple lines are concatenated with newlines so that you can format the value to be readable.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		Values defined in this field supersede values pulled from the Swagger JSON file and are superseded by individual values defined on this annotation.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
index ed0dda8..bdb4ea8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
@@ -68,9 +68,9 @@ import org.apache.juneau.oapi.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.FormData}
- * 	<li class='link'>{@doc juneau-rest-server.Swagger}
- * 	<li class='extlink'>{@doc SwaggerParameterObject}
+ * 	<li class='link'>{@doc RestFormDataAnnotation}
+ * 	<li class='link'>{@doc RestSwagger}
+ * 	<li class='extlink'>{@doc ExtSwaggerParameterObject}
  * </ul>
  *
  * <h5 class='topic'>Important note concerning FORM posts</h5>
@@ -89,15 +89,15 @@ import org.apache.juneau.oapi.*;
  * request.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.FormData}
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.Request}
+ * 	<li class='link'>{@doc RestcFormData}
+ * 	<li class='link'>{@doc RestcRequest}
  * </ul>
  *
  * <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.Request}
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.Request}
+ * 	<li class='link'>{@doc RestRequestAnnotation}
+ * 	<li class='link'>{@doc RestcRequest}
  * </ul>
  *
  * <div class='warn'>
@@ -260,7 +260,7 @@ public @interface FormData {
 	String value() default "";
 
 	/**
-	 * <mk>description</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>description</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A brief description of the parameter. This could contain examples of use.
@@ -276,7 +276,7 @@ public @interface FormData {
 	 * 		The format is plain text.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -288,7 +288,7 @@ public @interface FormData {
 	String[] d() default {};
 
 	/**
-	 * <mk>required</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>required</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Determines whether the parameter is mandatory.
@@ -320,7 +320,7 @@ public @interface FormData {
 	//=================================================================================================================
 
 	/**
-	 * <mk>type</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>type</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * The type of the parameter.
@@ -374,7 +374,7 @@ public @interface FormData {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 */
 	String type() default "";
@@ -385,10 +385,10 @@ public @interface FormData {
 	String t() default "";
 
 	/**
-	 * <mk>format</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>format</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
-	 * The extending format for the previously mentioned {@doc SwaggerParameterTypes parameter type}.
+	 * The extending format for the previously mentioned {@doc ExtSwaggerParameterTypes parameter type}.
 	 *
 	 * <p>
 	 * The possible values are:
@@ -442,7 +442,7 @@ public @interface FormData {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypeFormats}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypeFormats}
 	 * </ul>
 	 */
 	String format() default "";
@@ -453,7 +453,7 @@ public @interface FormData {
 	String f() default "";
 
 	/**
-	 * <mk>allowEmptyValue</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>allowEmptyValue</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Sets the ability to pass empty-valued parameters.
@@ -478,7 +478,7 @@ public @interface FormData {
 	boolean aev() default false;
 
 	/**
-	 * <mk>items</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>items</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Describes the type of items in the array.
@@ -500,7 +500,7 @@ public @interface FormData {
 	Items items() default @Items;
 
 	/**
-	 * <mk>collectionFormat</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>collectionFormat</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.
@@ -547,7 +547,7 @@ public @interface FormData {
 	String cf() default "";
 
 	/**
-	 * <mk>default</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>default</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <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.
@@ -588,7 +588,7 @@ public @interface FormData {
 	String[] df() default {};
 
 	/**
-	 * <mk>maximum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maximum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines the maximum value for a parameter of numeric types.
@@ -620,7 +620,7 @@ public @interface FormData {
 	String max() default "";
 
 	/**
-	 * <mk>exclusiveMaximum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>exclusiveMaximum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines whether the maximum is matched exclusively.
@@ -652,7 +652,7 @@ public @interface FormData {
 	boolean emax() default false;
 
 	/**
-	 * <mk>minimum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minimum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines the minimum value for a parameter of numeric types.
@@ -684,7 +684,7 @@ public @interface FormData {
 	String min() default "";
 
 	/**
-	 * <mk>exclusiveMinimum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>exclusiveMinimum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines whether the minimum is matched exclusively.
@@ -716,7 +716,7 @@ public @interface FormData {
 	boolean emin() default false;
 
 	/**
-	 * <mk>maxLength</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maxLength</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.
@@ -749,7 +749,7 @@ public @interface FormData {
 	long maxl() default -1;
 
 	/**
-	 * <mk>minLength</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minLength</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.
@@ -782,7 +782,7 @@ public @interface FormData {
 	long minl() default -1;
 
 	/**
-	 * <mk>pattern</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>pattern</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string input is valid if it matches the specified regular expression pattern.
@@ -813,7 +813,7 @@ public @interface FormData {
 	String p() default "";
 
 	/**
-	 * <mk>maxItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maxItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * An array or collection is valid if its size is less than, or equal to, the value of this keyword.
@@ -844,7 +844,7 @@ public @interface FormData {
 	long maxi() default -1;
 
 	/**
-	 * <mk>minItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * An array or collection is valid if its size is greater than, or equal to, the value of this keyword.
@@ -875,7 +875,7 @@ public @interface FormData {
 	long mini() default -1;
 
 	/**
-	 * <mk>uniqueItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>uniqueItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * If <jk>true</jk>, the input validates successfully if all of its elements are unique.
@@ -910,7 +910,7 @@ public @interface FormData {
 	boolean ui() default false;
 
 	/**
-	 * <mk>enum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>enum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * If specified, the input validates successfully if it is equal to one of the elements in this array.
@@ -921,7 +921,7 @@ public @interface FormData {
 	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).
 	 *
 	 * <p>
-	 * The format is a {@doc SimpleJson} array or comma-delimited list.
+	 * The format is a {@doc SimplifiedJson} array or comma-delimited list.
 	 * <br>Multiple lines are concatenated with newlines.
 	 *
 	 * <h5 class='section'>Examples:</h5>
@@ -962,7 +962,7 @@ public @interface FormData {
 	String[] e() default {};
 
 	/**
-	 * <mk>multipleOf</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>multipleOf</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A numeric instance is valid if the result of the division of the instance by this keyword's value is an integer.
@@ -1040,10 +1040,10 @@ public @interface FormData {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		The format is a {@doc SimpleJson} object or plain text string.
+	 * 		The format is a {@doc SimplifiedJson} object or plain text string.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -1055,7 +1055,7 @@ public @interface FormData {
 	String[] ex() default {};
 
 	/**
-	 * Free-form value for the {@doc SwaggerParameterObject}.
+	 * Free-form value for the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * This is a JSON object that makes up the swagger information for this field.
@@ -1111,7 +1111,7 @@ public @interface FormData {
 	 * 	<li>
 	 * 		Automatic validation is NOT performed on input based on attributes in this value.
 	 * 	<li>
-	 * 		The format is a {@doc SimpleJson} object.
+	 * 		The format is a {@doc SimplifiedJson} object.
 	 * 	<li>
 	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 		<br>The following two example are considered equivalent:
@@ -1124,7 +1124,7 @@ public @interface FormData {
 	 * 	<li>
 	 * 		Multiple lines are concatenated with newlines so that you can format the value to be readable.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		Values defined in this field supersede values pulled from the Swagger JSON file and are superseded by individual values defined on this annotation.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
index 6d086df..13ea106 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasFormData.java
@@ -29,7 +29,7 @@ import java.lang.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.HasFormData}
+ * 	<li class='link'>{@doc RestHasFormDataAnnotation}
  * </ul>
  */
 @Documented
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
index 14017b1..a1bd9d4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HasQuery.java
@@ -30,7 +30,7 @@ import java.lang.annotation.*;
  * </ul>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.HasQuery}
+ * 	<li class='link'>{@doc RestHasQueryAnnotation}
  * </ul>
  */
 @Documented
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
index bef8d32..06b8790 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
@@ -63,9 +63,9 @@ import org.apache.juneau.oapi.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.Header}
- * 	<li class='link'>{@doc juneau-rest-server.Swagger}
- * 	<li class='extlink'>{@doc SwaggerParameterObject}
+ * 	<li class='link'>{@doc RestHeaderAnnotation}
+ * 	<li class='link'>{@doc RestSwagger}
+ * 	<li class='extlink'>{@doc ExtSwaggerParameterObject}
  * </ul>
  *
  * <h5 class='topic'>Arguments and argument-types of client-side @RemoteResource-annotated interfaces</h5>
@@ -74,14 +74,14 @@ import org.apache.juneau.oapi.*;
  * header value.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.Header}
+ * 	<li class='link'>{@doc RestcHeader}
  * </ul>
  *
  * <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.Request}
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.Request}
+ * 	<li class='link'>{@doc RestRequestAnnotation}
+ * 	<li class='link'>{@doc RestcRequest}
  * </ul>
  */
 @Documented
@@ -228,7 +228,7 @@ public @interface Header {
 	String value() default "";
 
 	/**
-	 * <mk>description</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>description</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A brief description of the parameter. This could contain examples of use.
@@ -244,7 +244,7 @@ public @interface Header {
 	 * 		The format is plain text.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -256,7 +256,7 @@ public @interface Header {
 	String[] d() default {};
 
 	/**
-	 * <mk>required</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>required</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Determines whether the parameter is mandatory.
@@ -288,7 +288,7 @@ public @interface Header {
 	//=================================================================================================================
 
 	/**
-	 * <mk>type</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>type</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * The type of the parameter.
@@ -339,7 +339,7 @@ public @interface Header {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 */
 	String type() default "";
@@ -350,10 +350,10 @@ public @interface Header {
 	String t() default "";
 
 	/**
-	 * <mk>format</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>format</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
-	 * The extending format for the previously mentioned {@doc SwaggerParameterTypes parameter type}.
+	 * The extending format for the previously mentioned {@doc ExtSwaggerParameterTypes parameter type}.
 	 *
 	 * <p>
 	 * The possible values are:
@@ -407,7 +407,7 @@ public @interface Header {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypeFormats}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypeFormats}
 	 * </ul>
 	 */
 	String format() default "";
@@ -418,7 +418,7 @@ public @interface Header {
 	String f() default "";
 
 	/**
-	 * <mk>allowEmptyValue</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>allowEmptyValue</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Sets the ability to pass empty-valued heaver values.
@@ -444,7 +444,7 @@ public @interface Header {
 	boolean aev() default false;
 
 	/**
-	 * <mk>items</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>items</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Describes the type of items in the array.
@@ -466,7 +466,7 @@ public @interface Header {
 	Items items() default @Items;
 
 	/**
-	 * <mk>collectionFormat</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>collectionFormat</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.
@@ -511,7 +511,7 @@ public @interface Header {
 	String cf() default "";
 
 	/**
-	 * <mk>default</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>default</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <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.
@@ -552,7 +552,7 @@ public @interface Header {
 	String[] df() default {};
 
 	/**
-	 * <mk>maximum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maximum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines the maximum value for a parameter of numeric types.
@@ -584,7 +584,7 @@ public @interface Header {
 	String max() default "";
 
 	/**
-	 * <mk>exclusiveMaximum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>exclusiveMaximum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines whether the maximum is matched exclusively.
@@ -616,7 +616,7 @@ public @interface Header {
 	boolean emax() default false;
 
 	/**
-	 * <mk>minimum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minimum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines the minimum value for a parameter of numeric types.
@@ -648,7 +648,7 @@ public @interface Header {
 	String min() default "";
 
 	/**
-	 * <mk>exclusiveMinimum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>exclusiveMinimum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines whether the minimum is matched exclusively.
@@ -680,7 +680,7 @@ public @interface Header {
 	boolean emin() default false;
 
 	/**
-	 * <mk>maxLength</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maxLength</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.
@@ -713,7 +713,7 @@ public @interface Header {
 	long maxl() default -1;
 
 	/**
-	 * <mk>minLength</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minLength</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.
@@ -746,7 +746,7 @@ public @interface Header {
 	long minl() default -1;
 
 	/**
-	 * <mk>pattern</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>pattern</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string input is valid if it matches the specified regular expression pattern.
@@ -777,7 +777,7 @@ public @interface Header {
 	String p() default "";
 
 	/**
-	 * <mk>maxItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maxItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * An array or collection is valid if its size is less than, or equal to, the value of this keyword.
@@ -808,7 +808,7 @@ public @interface Header {
 	long maxi() default -1;
 
 	/**
-	 * <mk>minItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * An array or collection is valid if its size is greater than, or equal to, the value of this keyword.
@@ -839,7 +839,7 @@ public @interface Header {
 	long mini() default -1;
 
 	/**
-	 * <mk>uniqueItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>uniqueItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * If <jk>true</jk> the input validates successfully if all of its elements are unique.
@@ -874,7 +874,7 @@ public @interface Header {
 	boolean ui() default false;
 
 	/**
-	 * <mk>enum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>enum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * If specified, the input validates successfully if it is equal to one of the elements in this array.
@@ -885,7 +885,7 @@ public @interface Header {
 	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).
 	 *
 	 * <p>
-	 * The format is a {@doc SimpleJson} array or comma-delimited list.
+	 * The format is a {@doc SimplifiedJson} array or comma-delimited list.
 	 * <br>Multiple lines are concatenated with newlines.
 	 *
 	 * <h5 class='section'>Examples:</h5>
@@ -926,7 +926,7 @@ public @interface Header {
 	String[] e() default {};
 
 	/**
-	 * <mk>multipleOf</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>multipleOf</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A numeric instance is valid if the result of the division of the instance by this keyword's value is an integer.
@@ -1005,10 +1005,10 @@ public @interface Header {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		The format is a {@doc SimpleJson} object or plain text string.
+	 * 		The format is a {@doc SimplifiedJson} object or plain text string.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -1020,7 +1020,7 @@ public @interface Header {
 	String[] ex() default {};
 
 	/**
-	 * Free-form value for the {@doc SwaggerParameterObject}.
+	 * Free-form value for the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * This is a JSON object that makes up the swagger information for this field.
@@ -1076,7 +1076,7 @@ public @interface Header {
 	 * 	<li>
 	 * 		Note that the only swagger field you can't specify using this value is <js>"name"</js> whose value needs to be known during servlet initialization.
 	 * 	<li>
-	 * 		The format is a {@doc SimpleJson} object.
+	 * 		The format is a {@doc SimplifiedJson} object.
 	 * 	<li>
 	 * 		Automatic validation is NOT performed on input based on attributes in this value.
 	 * 	<li>
@@ -1091,7 +1091,7 @@ public @interface Header {
 	 * 	<li>
 	 * 		Multiple lines are concatenated with newlines so that you can format the value to be readable.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		Values defined in this field supersede values pulled from the Swagger JSON file and are superseded by individual values defined on this annotation.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
index 3e3d634..474a541 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
@@ -50,8 +50,8 @@ import java.lang.annotation.*;
  * </p>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.Swagger}
- * 	<li class='extlink'>{@doc SwaggerLicenseObject}
+ * 	<li class='link'>{@doc RestSwagger}
+ * 	<li class='extlink'>{@doc ExtSwaggerLicenseObject}
  * </ul>
  */
 @Documented
@@ -59,33 +59,33 @@ import java.lang.annotation.*;
 public @interface License {
 
 	/**
-	 * <mk>name</mk> field of the {@doc SwaggerLicenseObject}.
+	 * <mk>name</mk> field of the {@doc ExtSwaggerLicenseObject}.
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
 	 * 		The format is a plain-text string.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
 	String name() default "";
 
 	/**
-	 * <mk>url</mk> field of the {@doc SwaggerLicenseObject}.
+	 * <mk>url</mk> field of the {@doc ExtSwaggerLicenseObject}.
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
 	 * 		The format is a plain-text string.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
 	String url() default "";
 
 	/**
-	 * Free-form value for the {@doc SwaggerLicenseObject}.
+	 * Free-form value for the {@doc ExtSwaggerLicenseObject}.
 	 *
 	 * <p>
 	 * This is a JSON object that makes up the swagger information for this field.
@@ -134,7 +134,7 @@ public @interface License {
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
-	 * 		The format is a {@doc SimpleJson} object.
+	 * 		The format is a {@doc SimplifiedJson} object.
 	 * 	<li>
 	 * 		The leading/trailing <c>{ }</c> characters are optional.
 	 * 		<br>The following two example are considered equivalent:
@@ -147,7 +147,7 @@ public @interface License {
 	 * 	<li>
 	 * 		Multiple lines are concatenated with newlines so that you can format the value to be readable.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * 	<li>
 	 * 		Values defined in this field supersede values pulled from the Swagger JSON file and are superseded by individual values defined on this annotation.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index 54b7e2d..75ea8b4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
@@ -61,9 +61,9 @@ import org.apache.juneau.oapi.*;
  * The special name <js>"/*"</js> is used to retrieve the path remainder after the path match (i.e. the part that matches <js>"/*"</js>).
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.Path}
- * 	<li class='link'>{@doc juneau-rest-server.Swagger}
- * 	<li class='extlink'>{@doc SwaggerParameterObject}
+ * 	<li class='link'>{@doc RestPathAnnotation}
+ * 	<li class='link'>{@doc RestSwagger}
+ * 	<li class='extlink'>{@doc ExtSwaggerParameterObject}
  * </ul>
  *
  * <h5 class='topic'>Arguments and argument-types of client-side @RemoteResource-annotated interfaces</h5>
@@ -71,14 +71,14 @@ import org.apache.juneau.oapi.*;
  * Annotation applied to Java method arguments of interface proxies to denote that they are path variables on the request.
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.Path}
+ * 	<li class='link'>{@doc RestcPath}
  * </ul>
  *
  * <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
  *
  * <ul class='seealso'>
- * 	<li class='link'>{@doc juneau-rest-server.HttpPartAnnotations.Request}
- * 	<li class='link'>{@doc juneau-rest-client.RestProxies.Request}
+ * 	<li class='link'>{@doc RestRequestAnnotation}
+ * 	<li class='link'>{@doc RestcRequest}
  * </ul>
  */
 @Documented
@@ -164,8 +164,8 @@ public @interface Path {
 	 * </ul>
 	 *
 	 * <p>
-	 * The name field MUST correspond to the associated {@doc SwaggerPathsPath path} segment from the path field in the {@doc SwaggerPathsObject Paths Object}.
-	 * See {@doc SwaggerPathTemplating Path Templating} for further information.
+	 * The name field MUST correspond to the associated {@doc ExtSwaggerPathsPath path} segment from the path field in the {@doc ExtSwaggerPathsObject Paths Object}.
+	 * See {@doc ExtSwaggerPathTemplating Path Templating} for further information.
 	 *
 	 * <ul class='notes'>
 	 * 	<li>
@@ -205,7 +205,7 @@ public @interface Path {
 	String value() default "";
 
 	/**
-	 * <mk>description</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>description</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A brief description of the parameter. This could contain examples of use.
@@ -221,7 +221,7 @@ public @interface Path {
 	 * 		The format is plain text.
 	 * 		<br>Multiple lines are concatenated with newlines.
 	 * 	<li>
-	 * 		Supports {@doc DefaultRestSvlVariables}
+	 * 		Supports {@doc RestSvlVariables}
 	 * 		(e.g. <js>"$L{my.localized.variable}"</js>).
 	 * </ul>
 	 */
@@ -233,7 +233,7 @@ public @interface Path {
 	String[] d() default {};
 
 	/**
-	 * <mk>required</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>required</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Determines whether the parameter is mandatory.
@@ -289,7 +289,7 @@ public @interface Path {
 	//=================================================================================================================
 
 	/**
-	 * <mk>type</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>type</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * The type of the parameter.
@@ -340,7 +340,7 @@ public @interface Path {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypes}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypes}
 	 * </ul>
 	 */
 	String type() default "";
@@ -351,10 +351,10 @@ public @interface Path {
 	String t() default "";
 
 	/**
-	 * <mk>format</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>format</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
-	 * The extending format for the previously mentioned {@doc SwaggerParameterTypes parameter type}.
+	 * The extending format for the previously mentioned {@doc ExtSwaggerParameterTypes parameter type}.
 	 *
 	 * <p>
 	 * The possible values are:
@@ -408,7 +408,7 @@ public @interface Path {
 	 * </ul>
 	 *
 	 * <ul class='seealso'>
-	 * 	<li class='extlink'>{@doc SwaggerDataTypeFormats}
+	 * 	<li class='extlink'>{@doc ExtSwaggerDataTypeFormats}
 	 * </ul>
 	 */
 	String format() default "";
@@ -419,7 +419,7 @@ public @interface Path {
 	String f() default "";
 
 	/**
-	 * <mk>allowEmptyValue</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>allowEmptyValue</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Sets the ability to pass empty-valued path parameter values.
@@ -445,7 +445,7 @@ public @interface Path {
 	boolean aev() default false;
 
 	/**
-	 * <mk>items</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>items</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Describes the type of items in the array.
@@ -466,7 +466,7 @@ public @interface Path {
 	Items items() default @Items;
 
 	/**
-	 * <mk>collectionFormat</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>collectionFormat</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Determines the format of the array if <c>type</c> <js>"array"</js> is used.
@@ -511,7 +511,7 @@ public @interface Path {
 	String cf() default "";
 
 	/**
-	 * <mk>maximum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maximum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines the maximum value for a parameter of numeric types.
@@ -543,7 +543,7 @@ public @interface Path {
 	String max() default "";
 
 	/**
-	 * <mk>exclusiveMaximum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>exclusiveMaximum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines whether the maximum is matched exclusively.
@@ -575,7 +575,7 @@ public @interface Path {
 	boolean emax() default false;
 
 	/**
-	 * <mk>minimum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minimum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines the minimum value for a parameter of numeric types.
@@ -607,7 +607,7 @@ public @interface Path {
 	String min() default "";
 
 	/**
-	 * <mk>exclusiveMinimum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>exclusiveMinimum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * Defines whether the minimum is matched exclusively.
@@ -639,7 +639,7 @@ public @interface Path {
 	boolean emin() default false;
 
 	/**
-	 * <mk>maxLength</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maxLength</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string instance is valid against this keyword if its length is less than, or equal to, the value of this keyword.
@@ -672,7 +672,7 @@ public @interface Path {
 	long maxl() default -1;
 
 	/**
-	 * <mk>minLength</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minLength</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.
@@ -705,7 +705,7 @@ public @interface Path {
 	long minl() default -1;
 
 	/**
-	 * <mk>pattern</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>pattern</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * A string input is valid if it matches the specified regular expression pattern.
@@ -736,7 +736,7 @@ public @interface Path {
 	String p() default "";
 
 	/**
-	 * <mk>maxItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>maxItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * An array or collection is valid if its size is less than, or equal to, the value of this keyword.
@@ -767,7 +767,7 @@ public @interface Path {
 	long maxi() default -1;
 
 	/**
-	 * <mk>minItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>minItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * An array or collection is valid if its size is greater than, or equal to, the value of this keyword.
@@ -798,7 +798,7 @@ public @interface Path {
 	long mini() default -1;
 
 	/**
-	 * <mk>uniqueItems</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>uniqueItems</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * If <jk>true</jk> the input validates successfully if all of its elements are unique.
@@ -833,7 +833,7 @@ public @interface Path {
 	boolean ui() default false;
 
 	/**
-	 * <mk>enum</mk> field of the {@doc SwaggerParameterObject}.
+	 * <mk>enum</mk> field of the {@doc ExtSwaggerParameterObject}.
 	 *
 	 * <p>
 	 * If specified, the input validates successfully if it is equal to one of the elements in this array.
@@ -844,7 +844,7 @@ public @interface Path {
 	 * <br>On the server-side, this gets converted to a <c>BadRequest</c> (400).
 	 *
 	 * <p>
-	 * The format is a {@doc SimpleJson} array or comma-delimited list.
... 30589 lines suppressed ...