You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2022/11/22 15:53:27 UTC
[juneau] branch master updated: Fix javadoc links
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 a5d980bc6 Fix javadoc links
a5d980bc6 is described below
commit a5d980bc61a8322046fd1b7f1d8dad58bdfb5df5
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Tue Nov 22 10:52:58 2022 -0500
Fix javadoc links
---
.../org/apache/juneau/assertions/AnyAssertion.java | 2 +-
.../apache/juneau/assertions/ArrayAssertion.java | 2 +-
.../org/apache/juneau/assertions/Assertion.java | 2 +-
.../juneau/assertions/AssertionPredicate.java | 2 +-
.../juneau/assertions/AssertionPredicates.java | 2 +-
.../org/apache/juneau/assertions/Assertions.java | 64 +-
.../apache/juneau/assertions/BeanAssertion.java | 2 +-
.../juneau/assertions/BeanListAssertion.java | 2 +-
.../apache/juneau/assertions/BooleanAssertion.java | 2 +-
.../juneau/assertions/ByteArrayAssertion.java | 2 +-
.../juneau/assertions/CollectionAssertion.java | 2 +-
.../juneau/assertions/ComparableAssertion.java | 2 +-
.../apache/juneau/assertions/DateAssertion.java | 2 +-
.../juneau/assertions/FluentAnyAssertion.java | 2 +-
.../juneau/assertions/FluentArrayAssertion.java | 2 +-
.../apache/juneau/assertions/FluentAssertion.java | 2 +-
.../juneau/assertions/FluentBeanAssertion.java | 2 +-
.../juneau/assertions/FluentBeanListAssertion.java | 2 +-
.../juneau/assertions/FluentBooleanAssertion.java | 2 +-
.../assertions/FluentByteArrayAssertion.java | 2 +-
.../assertions/FluentCollectionAssertion.java | 2 +-
.../assertions/FluentComparableAssertion.java | 2 +-
.../juneau/assertions/FluentDateAssertion.java | 2 +-
.../juneau/assertions/FluentIntegerAssertion.java | 2 +-
.../juneau/assertions/FluentListAssertion.java | 2 +-
.../juneau/assertions/FluentLongAssertion.java | 2 +-
.../juneau/assertions/FluentMapAssertion.java | 2 +-
.../juneau/assertions/FluentObjectAssertion.java | 2 +-
.../assertions/FluentPrimitiveArrayAssertion.java | 2 +-
.../juneau/assertions/FluentStringAssertion.java | 2 +-
.../assertions/FluentStringListAssertion.java | 2 +-
.../assertions/FluentThrowableAssertion.java | 2 +-
.../juneau/assertions/FluentVersionAssertion.java | 2 +-
.../assertions/FluentZonedDateTimeAssertion.java | 2 +-
.../apache/juneau/assertions/IntegerAssertion.java | 2 +-
.../apache/juneau/assertions/ListAssertion.java | 2 +-
.../apache/juneau/assertions/LongAssertion.java | 2 +-
.../org/apache/juneau/assertions/MapAssertion.java | 2 +-
.../apache/juneau/assertions/ObjectAssertion.java | 2 +-
.../juneau/assertions/PrimitiveArrayAssertion.java | 2 +-
.../apache/juneau/assertions/StringAssertion.java | 2 +-
.../juneau/assertions/StringListAssertion.java | 2 +-
.../juneau/assertions/ThrowableAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/Verify.java | 2 +-
.../apache/juneau/assertions/VersionAssertion.java | 2 +-
.../juneau/assertions/ZonedDateTimeAssertion.java | 2 +-
.../org/apache/juneau/common/utils/Snippet.java | 2 +-
.../org/apache/juneau/config/mod/XorEncodeMod.java | 2 +-
.../org/apache/juneau/config/vars/ConfigVar.java | 4 +-
.../org/apache/juneau/dto/atom/AtomBuilder.java | 3 +-
.../java/org/apache/juneau/dto/atom/Category.java | 3 +-
.../java/org/apache/juneau/dto/atom/Common.java | 3 +-
.../org/apache/juneau/dto/atom/CommonEntry.java | 3 +-
.../java/org/apache/juneau/dto/atom/Content.java | 3 +-
.../java/org/apache/juneau/dto/atom/Entry.java | 3 +-
.../main/java/org/apache/juneau/dto/atom/Feed.java | 3 +-
.../java/org/apache/juneau/dto/atom/Generator.java | 3 +-
.../main/java/org/apache/juneau/dto/atom/Icon.java | 3 +-
.../main/java/org/apache/juneau/dto/atom/Id.java | 3 +-
.../main/java/org/apache/juneau/dto/atom/Link.java | 3 +-
.../main/java/org/apache/juneau/dto/atom/Logo.java | 3 +-
.../java/org/apache/juneau/dto/atom/Person.java | 3 +-
.../java/org/apache/juneau/dto/atom/Source.java | 3 +-
.../main/java/org/apache/juneau/dto/atom/Text.java | 3 +-
.../java/org/apache/juneau/dto/atom/Utils.java | 3 +-
.../main/java/org/apache/juneau/dto/html5/A.java | 2 +-
.../java/org/apache/juneau/dto/html5/Abbr.java | 2 +-
.../java/org/apache/juneau/dto/html5/Address.java | 2 +-
.../java/org/apache/juneau/dto/html5/Area.java | 2 +-
.../java/org/apache/juneau/dto/html5/Article.java | 2 +-
.../java/org/apache/juneau/dto/html5/Aside.java | 2 +-
.../java/org/apache/juneau/dto/html5/Audio.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/B.java | 2 +-
.../java/org/apache/juneau/dto/html5/Base.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Bdi.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Bdo.java | 2 +-
.../org/apache/juneau/dto/html5/Blockquote.java | 2 +-
.../java/org/apache/juneau/dto/html5/Body.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Br.java | 2 +-
.../java/org/apache/juneau/dto/html5/Button.java | 2 +-
.../java/org/apache/juneau/dto/html5/Canvas.java | 2 +-
.../java/org/apache/juneau/dto/html5/Caption.java | 2 +-
.../java/org/apache/juneau/dto/html5/Cite.java | 2 +-
.../java/org/apache/juneau/dto/html5/Code.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Col.java | 2 +-
.../java/org/apache/juneau/dto/html5/Colgroup.java | 2 +-
.../java/org/apache/juneau/dto/html5/Data.java | 2 +-
.../java/org/apache/juneau/dto/html5/Datalist.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Dd.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Del.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Dfn.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Div.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Dl.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Dt.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Em.java | 2 +-
.../java/org/apache/juneau/dto/html5/Embed.java | 2 +-
.../java/org/apache/juneau/dto/html5/Fieldset.java | 2 +-
.../org/apache/juneau/dto/html5/Figcaption.java | 2 +-
.../java/org/apache/juneau/dto/html5/Figure.java | 2 +-
.../java/org/apache/juneau/dto/html5/Footer.java | 2 +-
.../java/org/apache/juneau/dto/html5/Form.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H1.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H2.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H3.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H4.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H5.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/H6.java | 2 +-
.../java/org/apache/juneau/dto/html5/Head.java | 2 +-
.../java/org/apache/juneau/dto/html5/Header.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Hr.java | 2 +-
.../java/org/apache/juneau/dto/html5/Html.java | 2 +-
.../juneau/dto/html5/HtmlBeanDictionary.java | 2 +-
.../org/apache/juneau/dto/html5/HtmlBuilder.java | 2 +-
.../org/apache/juneau/dto/html5/HtmlElement.java | 2 +-
.../juneau/dto/html5/HtmlElementContainer.java | 2 +-
.../apache/juneau/dto/html5/HtmlElementMixed.java | 2 +-
.../juneau/dto/html5/HtmlElementRawText.java | 2 +-
.../apache/juneau/dto/html5/HtmlElementText.java | 2 +-
.../apache/juneau/dto/html5/HtmlElementVoid.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/I.java | 2 +-
.../java/org/apache/juneau/dto/html5/Iframe.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Img.java | 2 +-
.../java/org/apache/juneau/dto/html5/Input.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Ins.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Kbd.java | 2 +-
.../java/org/apache/juneau/dto/html5/Keygen.java | 2 +-
.../java/org/apache/juneau/dto/html5/Label.java | 2 +-
.../java/org/apache/juneau/dto/html5/Legend.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Li.java | 2 +-
.../java/org/apache/juneau/dto/html5/Link.java | 2 +-
.../java/org/apache/juneau/dto/html5/Main.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Map.java | 2 +-
.../java/org/apache/juneau/dto/html5/Mark.java | 2 +-
.../java/org/apache/juneau/dto/html5/Meta.java | 2 +-
.../java/org/apache/juneau/dto/html5/Meter.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Nav.java | 2 +-
.../java/org/apache/juneau/dto/html5/Noscript.java | 2 +-
.../java/org/apache/juneau/dto/html5/Object_.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Ol.java | 2 +-
.../java/org/apache/juneau/dto/html5/Optgroup.java | 2 +-
.../java/org/apache/juneau/dto/html5/Option.java | 2 +-
.../java/org/apache/juneau/dto/html5/Output.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/P.java | 2 +-
.../java/org/apache/juneau/dto/html5/Param.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Pre.java | 2 +-
.../java/org/apache/juneau/dto/html5/Progress.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Q.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Rb.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Rp.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Rt.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Rtc.java | 2 +-
.../java/org/apache/juneau/dto/html5/Ruby.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/S.java | 2 +-
.../java/org/apache/juneau/dto/html5/Samp.java | 2 +-
.../java/org/apache/juneau/dto/html5/Script.java | 2 +-
.../java/org/apache/juneau/dto/html5/Section.java | 2 +-
.../java/org/apache/juneau/dto/html5/Select.java | 2 +-
.../java/org/apache/juneau/dto/html5/Small.java | 2 +-
.../java/org/apache/juneau/dto/html5/Source.java | 2 +-
.../java/org/apache/juneau/dto/html5/Span.java | 2 +-
.../java/org/apache/juneau/dto/html5/Strong.java | 2 +-
.../java/org/apache/juneau/dto/html5/Style.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Sub.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Sup.java | 2 +-
.../java/org/apache/juneau/dto/html5/Table.java | 2 +-
.../java/org/apache/juneau/dto/html5/Tbody.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Td.java | 2 +-
.../java/org/apache/juneau/dto/html5/Template.java | 2 +-
.../java/org/apache/juneau/dto/html5/Textarea.java | 2 +-
.../java/org/apache/juneau/dto/html5/Tfoot.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Th.java | 2 +-
.../java/org/apache/juneau/dto/html5/Thead.java | 2 +-
.../java/org/apache/juneau/dto/html5/Time.java | 2 +-
.../java/org/apache/juneau/dto/html5/Title.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Tr.java | 2 +-
.../java/org/apache/juneau/dto/html5/Track.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/U.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Ul.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Var.java | 2 +-
.../java/org/apache/juneau/dto/html5/Video.java | 2 +-
.../main/java/org/apache/juneau/dto/html5/Wbr.java | 2 +-
.../apache/juneau/dto/jsonschema/JsonSchema.java | 4 -
.../juneau/dto/jsonschema/JsonSchemaArray.java | 4 -
.../juneau/dto/jsonschema/JsonSchemaMap.java | 4 -
.../juneau/dto/jsonschema/JsonSchemaProperty.java | 4 -
.../jsonschema/JsonSchemaPropertySimpleArray.java | 4 -
.../juneau/dto/jsonschema/JsonSchemaRef.java | 4 -
.../org/apache/juneau/dto/jsonschema/JsonType.java | 4 -
.../juneau/dto/jsonschema/JsonTypeArray.java | 4 -
.../org/apache/juneau/dto/swagger/Contact.java | 2 +-
.../juneau/dto/swagger/ExternalDocumentation.java | 2 +-
.../org/apache/juneau/dto/swagger/HeaderInfo.java | 2 +-
.../java/org/apache/juneau/dto/swagger/Info.java | 2 +-
.../java/org/apache/juneau/dto/swagger/Items.java | 2 +-
.../org/apache/juneau/dto/swagger/License.java | 2 +-
.../org/apache/juneau/dto/swagger/Operation.java | 2 +-
.../apache/juneau/dto/swagger/OperationMap.java | 2 +-
.../apache/juneau/dto/swagger/ParameterInfo.java | 2 +-
.../apache/juneau/dto/swagger/ResponseInfo.java | 2 +-
.../org/apache/juneau/dto/swagger/SchemaInfo.java | 2 +-
.../apache/juneau/dto/swagger/SecurityScheme.java | 2 +-
.../org/apache/juneau/dto/swagger/Swagger.java | 2 +-
.../apache/juneau/dto/swagger/SwaggerBuilder.java | 2 +-
.../apache/juneau/dto/swagger/SwaggerElement.java | 2 +-
.../java/org/apache/juneau/dto/swagger/Tag.java | 2 +-
.../java/org/apache/juneau/dto/swagger/Xml.java | 2 +-
.../apache/juneau/dto/swagger/ui/SwaggerUI.java | 2 +-
.../apache/juneau/jena/annotation/RdfConfig.java | 68 +-
.../main/java/org/apache/juneau/BeanContext.java | 2 +-
.../java/org/apache/juneau/annotation/Bean.java | 8 +-
.../org/apache/juneau/annotation/BeanConfig.java | 70 +-
.../org/apache/juneau/annotation/BeanIgnore.java | 6 +-
.../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 | 4 +-
.../org/apache/juneau/annotation/ExternalDocs.java | 6 +-
.../java/org/apache/juneau/annotation/Items.java | 2 +-
.../org/apache/juneau/annotation/Marshalled.java | 6 +-
.../org/apache/juneau/annotation/NameProperty.java | 4 +-
.../apache/juneau/annotation/ParentProperty.java | 4 +-
.../java/org/apache/juneau/annotation/Schema.java | 26 +-
.../org/apache/juneau/annotation/SubItems.java | 4 +-
.../java/org/apache/juneau/annotation/Swap.java | 10 +-
.../java/org/apache/juneau/annotation/Uri.java | 6 +-
.../java/org/apache/juneau/csv/annotation/Csv.java | 4 +-
.../java/org/apache/juneau/encoders/Encoder.java | 2 +-
.../org/apache/juneau/encoders/EncoderMatch.java | 2 +-
.../org/apache/juneau/encoders/EncoderSet.java | 2 +-
.../org/apache/juneau/encoders/Finishable.java | 2 +-
.../org/apache/juneau/encoders/GzipEncoder.java | 2 +-
.../apache/juneau/encoders/IdentityEncoder.java | 2 +-
.../java/org/apache/juneau/html/AnchorText.java | 2 +-
.../java/org/apache/juneau/html/AsideFloat.java | 2 +-
.../apache/juneau/html/BasicHtmlDocTemplate.java | 2 +-
.../apache/juneau/html/HtmlBeanPropertyMeta.java | 2 +-
.../java/org/apache/juneau/html/HtmlClassMeta.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 6 +-
.../juneau/html/HtmlDocSerializerSession.java | 2 +-
.../org/apache/juneau/html/HtmlDocTemplate.java | 2 +-
.../org/apache/juneau/html/HtmlMetaProvider.java | 2 +-
.../java/org/apache/juneau/html/HtmlParser.java | 2 +-
.../org/apache/juneau/html/HtmlParserSession.java | 2 +-
.../java/org/apache/juneau/html/HtmlRender.java | 4 +-
.../juneau/html/HtmlSchemaDocSerializer.java | 2 +-
.../html/HtmlSchemaDocSerializerSession.java | 2 +-
.../apache/juneau/html/HtmlSchemaSerializer.java | 2 +-
.../juneau/html/HtmlSchemaSerializerSession.java | 2 +-
.../org/apache/juneau/html/HtmlSerializer.java | 2 +-
.../apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../juneau/html/HtmlStrippedDocSerializer.java | 2 +-
.../html/HtmlStrippedDocSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/html/HtmlTag.java | 2 +-
.../java/org/apache/juneau/html/HtmlWidget.java | 4 +-
.../java/org/apache/juneau/html/HtmlWidgetMap.java | 4 +-
.../java/org/apache/juneau/html/HtmlWidgetVar.java | 4 +-
.../java/org/apache/juneau/html/HtmlWriter.java | 2 +-
.../org/apache/juneau/html/SimpleHtmlWriter.java | 2 +-
.../org/apache/juneau/html/annotation/Html.java | 8 +-
.../juneau/html/annotation/HtmlAnnotation.java | 2 +-
.../apache/juneau/html/annotation/HtmlConfig.java | 14 +-
.../html/annotation/HtmlConfigAnnotation.java | 2 +-
.../juneau/html/annotation/HtmlDocConfig.java | 30 +-
.../html/annotation/HtmlDocConfigAnnotation.java | 2 +-
.../apache/juneau/html/annotation/HtmlFormat.java | 2 +-
.../apache/juneau/html/annotation/HtmlLink.java | 6 +-
.../juneau/html/annotation/HtmlLinkAnnotation.java | 2 +-
.../org/apache/juneau/http/annotation/Contact.java | 8 +-
.../org/apache/juneau/http/annotation/Content.java | 8 +-
.../apache/juneau/http/annotation/FormData.java | 12 +-
.../org/apache/juneau/http/annotation/Header.java | 10 +-
.../org/apache/juneau/http/annotation/License.java | 6 +-
.../org/apache/juneau/http/annotation/Path.java | 10 +-
.../org/apache/juneau/http/annotation/Query.java | 10 +-
.../org/apache/juneau/http/annotation/Request.java | 6 +-
.../apache/juneau/http/annotation/Response.java | 14 +-
.../apache/juneau/http/annotation/StatusCode.java | 8 +-
.../org/apache/juneau/http/annotation/Tag.java | 8 +-
.../apache/juneau/httppart/BaseHttpPartParser.java | 2 +-
.../juneau/httppart/BaseHttpPartParserSession.java | 2 +-
.../juneau/httppart/BaseHttpPartSerializer.java | 2 +-
.../httppart/BaseHttpPartSerializerSession.java | 2 +-
.../java/org/apache/juneau/httppart/Constants.java | 2 +-
.../java/org/apache/juneau/httppart/HttpPart.java | 2 +-
.../juneau/httppart/HttpPartCollectionFormat.java | 2 +-
.../apache/juneau/httppart/HttpPartDataType.java | 2 +-
.../org/apache/juneau/httppart/HttpPartFormat.java | 2 +-
.../org/apache/juneau/httppart/HttpPartParser.java | 2 +-
.../juneau/httppart/HttpPartParserSession.java | 2 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../apache/juneau/httppart/HttpPartSerializer.java | 2 +-
.../juneau/httppart/HttpPartSerializerSession.java | 2 +-
.../org/apache/juneau/httppart/HttpPartType.java | 2 +-
.../juneau/httppart/SchemaValidationException.java | 2 +-
.../apache/juneau/httppart/SimplePartParser.java | 2 +-
.../juneau/httppart/SimplePartParserSession.java | 2 +-
.../juneau/httppart/SimplePartSerializer.java | 2 +-
.../httppart/SimplePartSerializerSession.java | 2 +-
.../juneau/httppart/bean/RequestBeanMeta.java | 2 +-
.../httppart/bean/RequestBeanPropertyMeta.java | 2 +-
.../juneau/httppart/bean/ResponseBeanMeta.java | 2 +-
.../httppart/bean/ResponseBeanPropertyMeta.java | 2 +-
.../java/org/apache/juneau/json/Json5Parser.java | 2 +-
.../org/apache/juneau/json/Json5Serializer.java | 2 +-
.../apache/juneau/json/JsonBeanPropertyMeta.java | 2 +-
.../java/org/apache/juneau/json/JsonClassMeta.java | 2 +-
.../org/apache/juneau/json/JsonMetaProvider.java | 2 +-
.../java/org/apache/juneau/json/JsonParser.java | 2 +-
.../org/apache/juneau/json/JsonParserSession.java | 2 +-
.../apache/juneau/json/JsonSchemaSerializer.java | 2 +-
.../juneau/json/JsonSchemaSerializerSession.java | 2 +-
.../org/apache/juneau/json/JsonSerializer.java | 2 +-
.../apache/juneau/json/JsonSerializerSession.java | 2 +-
.../java/org/apache/juneau/json/JsonWriter.java | 2 +-
.../org/apache/juneau/json/annotation/Json.java | 6 +-
.../juneau/json/annotation/JsonAnnotation.java | 2 +-
.../apache/juneau/json/annotation/JsonConfig.java | 10 +-
.../json/annotation/JsonConfigAnnotation.java | 2 +-
.../juneau/jsonschema/BasicBeanDefMapper.java | 2 +-
.../apache/juneau/jsonschema/BeanDefMapper.java | 2 +-
.../jsonschema/JsonSchemaBeanPropertyMeta.java | 2 +-
.../juneau/jsonschema/JsonSchemaClassMeta.java | 2 +-
.../juneau/jsonschema/JsonSchemaGenerator.java | 2 +-
.../jsonschema/JsonSchemaGeneratorSession.java | 2 +-
.../juneau/jsonschema/JsonSchemaMetaProvider.java | 2 +-
.../org/apache/juneau/jsonschema/SchemaUtils.java | 2 +-
.../org/apache/juneau/jsonschema/TypeCategory.java | 2 +-
.../jsonschema/annotation/JsonSchemaConfig.java | 22 +-
.../annotation/JsonSchemaConfigAnnotation.java | 2 +-
.../apache/juneau/marshaller/CharMarshaller.java | 2 +-
.../java/org/apache/juneau/marshaller/Csv.java | 2 +-
.../java/org/apache/juneau/marshaller/Html.java | 2 +-
.../java/org/apache/juneau/marshaller/Json.java | 2 +-
.../java/org/apache/juneau/marshaller/Json5.java | 2 +-
.../org/apache/juneau/marshaller/Marshaller.java | 2 +-
.../java/org/apache/juneau/marshaller/MsgPack.java | 2 +-
.../java/org/apache/juneau/marshaller/OpenApi.java | 2 +-
.../org/apache/juneau/marshaller/PlainText.java | 2 +-
.../apache/juneau/marshaller/StreamMarshaller.java | 2 +-
.../java/org/apache/juneau/marshaller/Uon.java | 2 +-
.../org/apache/juneau/marshaller/UrlEncoding.java | 2 +-
.../java/org/apache/juneau/marshaller/Xml.java | 2 +-
.../java/org/apache/juneau/msgpack/DataType.java | 2 +-
.../juneau/msgpack/MsgPackBeanPropertyMeta.java | 2 +-
.../apache/juneau/msgpack/MsgPackClassMeta.java | 2 +-
.../apache/juneau/msgpack/MsgPackInputStream.java | 2 +-
.../apache/juneau/msgpack/MsgPackMetaProvider.java | 2 +-
.../apache/juneau/msgpack/MsgPackOutputStream.java | 2 +-
.../org/apache/juneau/msgpack/MsgPackParser.java | 2 +-
.../juneau/msgpack/MsgPackParserSession.java | 2 +-
.../apache/juneau/msgpack/MsgPackSerializer.java | 2 +-
.../juneau/msgpack/MsgPackSerializerSession.java | 2 +-
.../apache/juneau/msgpack/annotation/MsgPack.java | 6 +-
.../msgpack/annotation/MsgPackAnnotation.java | 2 +-
.../juneau/msgpack/annotation/MsgPackConfig.java | 4 +-
.../annotation/MsgPackConfigAnnotation.java | 2 +-
.../juneau/oapi/OpenApiBeanPropertyMeta.java | 2 +-
.../org/apache/juneau/oapi/OpenApiClassMeta.java | 2 +-
.../apache/juneau/oapi/OpenApiMetaProvider.java | 2 +-
.../java/org/apache/juneau/oapi/OpenApiParser.java | 2 +-
.../apache/juneau/oapi/OpenApiParserSession.java | 2 +-
.../org/apache/juneau/oapi/OpenApiSerializer.java | 2 +-
.../juneau/oapi/OpenApiSerializerSession.java | 2 +-
.../org/apache/juneau/oapi/annotation/OpenApi.java | 6 +-
.../juneau/oapi/annotation/OpenApiAnnotation.java | 2 +-
.../juneau/oapi/annotation/OpenApiConfig.java | 2 +-
.../oapi/annotation/OpenApiConfigAnnotation.java | 2 +-
.../apache/juneau/objecttools/AbstractMatcher.java | 2 +-
.../org/apache/juneau/objecttools/Equality.java | 2 +-
.../apache/juneau/objecttools/MatcherFactory.java | 2 +-
.../juneau/objecttools/NumberMatcherFactory.java | 2 +-
.../apache/juneau/objecttools/ObjectPaginator.java | 2 +-
.../apache/juneau/objecttools/ObjectSearcher.java | 2 +-
.../apache/juneau/objecttools/ObjectSorter.java | 2 +-
.../org/apache/juneau/objecttools/ObjectTool.java | 2 +-
.../apache/juneau/objecttools/ObjectViewer.java | 2 +-
.../org/apache/juneau/objecttools/PageArgs.java | 2 +-
.../juneau/objecttools/PatternException.java | 2 +-
.../org/apache/juneau/objecttools/SearchArgs.java | 2 +-
.../org/apache/juneau/objecttools/SortArgs.java | 2 +-
.../juneau/objecttools/StringMatcherFactory.java | 2 +-
.../juneau/objecttools/TimeMatcherFactory.java | 2 +-
.../org/apache/juneau/objecttools/ViewArgs.java | 2 +-
.../apache/juneau/parser/InputStreamParser.java | 2 +-
.../juneau/parser/InputStreamParserSession.java | 2 +-
.../org/apache/juneau/parser/ParseException.java | 2 +-
.../main/java/org/apache/juneau/parser/Parser.java | 4 +-
.../apache/juneau/parser/ParserInputStream.java | 2 +-
.../org/apache/juneau/parser/ParserListener.java | 2 +-
.../java/org/apache/juneau/parser/ParserMatch.java | 2 +-
.../java/org/apache/juneau/parser/ParserPipe.java | 2 +-
.../org/apache/juneau/parser/ParserReader.java | 2 +-
.../org/apache/juneau/parser/ParserSession.java | 2 +-
.../java/org/apache/juneau/parser/ParserSet.java | 2 +-
.../java/org/apache/juneau/parser/Position.java | 2 +-
.../org/apache/juneau/parser/Positionable.java | 2 +-
.../org/apache/juneau/parser/ReaderParser.java | 2 +-
.../apache/juneau/parser/ReaderParserSession.java | 2 +-
.../juneau/parser/annotation/ParserConfig.java | 18 +-
.../parser/annotation/ParserConfigAnnotation.java | 2 +-
.../apache/juneau/plaintext/PlainTextParser.java | 2 +-
.../juneau/plaintext/annotation/PlainText.java | 4 +-
.../juneau/serializer/OutputStreamSerializer.java | 2 +-
.../serializer/OutputStreamSerializerSession.java | 2 +-
.../juneau/serializer/SerializeException.java | 2 +-
.../org/apache/juneau/serializer/Serializer.java | 8 +-
.../juneau/serializer/SerializerListener.java | 2 +-
.../apache/juneau/serializer/SerializerMatch.java | 2 +-
.../apache/juneau/serializer/SerializerPipe.java | 2 +-
.../juneau/serializer/SerializerSession.java | 2 +-
.../apache/juneau/serializer/SerializerSet.java | 2 +-
.../apache/juneau/serializer/SerializerWriter.java | 2 +-
.../apache/juneau/serializer/WriterSerializer.java | 2 +-
.../juneau/serializer/WriterSerializerSession.java | 2 +-
.../serializer/annotation/SerializerConfig.java | 48 +-
.../annotation/SerializerConfigAnnotation.java | 2 +-
.../org/apache/juneau/soap/annotation/SoapXml.java | 4 +-
.../java/org/apache/juneau/svl/DefaultingVar.java | 2 +-
.../main/java/org/apache/juneau/svl/MapVar.java | 2 +-
.../apache/juneau/svl/MultipartResolvingVar.java | 2 +-
.../java/org/apache/juneau/svl/MultipartVar.java | 2 +-
.../org/apache/juneau/svl/ResolvingJsonMap.java | 2 +-
.../main/java/org/apache/juneau/svl/SimpleVar.java | 2 +-
.../java/org/apache/juneau/svl/StreamedVar.java | 2 +-
.../src/main/java/org/apache/juneau/svl/Var.java | 2 +-
.../main/java/org/apache/juneau/svl/VarList.java | 2 +-
.../java/org/apache/juneau/svl/VarResolver.java | 2 +-
.../apache/juneau/svl/VarResolverException.java | 2 +-
.../org/apache/juneau/svl/VarResolverSession.java | 2 +-
.../java/org/apache/juneau/svl/vars/ArgsVar.java | 2 +-
.../org/apache/juneau/svl/vars/CoalesceVar.java | 2 +-
.../apache/juneau/svl/vars/EnvVariablesVar.java | 2 +-
.../java/org/apache/juneau/svl/vars/IfVar.java | 2 +-
.../java/org/apache/juneau/svl/vars/LenVar.java | 2 +-
.../org/apache/juneau/svl/vars/LowerCaseVar.java | 2 +-
.../apache/juneau/svl/vars/ManifestFileVar.java | 2 +-
.../org/apache/juneau/svl/vars/NotEmptyVar.java | 2 +-
.../apache/juneau/svl/vars/PatternExtractVar.java | 2 +-
.../apache/juneau/svl/vars/PatternMatchVar.java | 2 +-
.../apache/juneau/svl/vars/PatternReplaceVar.java | 2 +-
.../org/apache/juneau/svl/vars/SubstringVar.java | 2 +-
.../java/org/apache/juneau/svl/vars/SwitchVar.java | 2 +-
.../juneau/svl/vars/SystemPropertiesVar.java | 2 +-
.../org/apache/juneau/svl/vars/UpperCaseVar.java | 2 +-
.../java/org/apache/juneau/swap/AutoListSwap.java | 2 +-
.../java/org/apache/juneau/swap/AutoMapSwap.java | 2 +-
.../org/apache/juneau/swap/AutoNumberSwap.java | 2 +-
.../org/apache/juneau/swap/AutoObjectSwap.java | 2 +-
.../org/apache/juneau/swap/BeanInterceptor.java | 2 +-
.../main/java/org/apache/juneau/swap/Builder.java | 4 +-
.../java/org/apache/juneau/swap/BuilderSwap.java | 4 +-
.../java/org/apache/juneau/swap/DefaultSwaps.java | 2 +-
.../org/apache/juneau/swap/FunctionalSwap.java | 2 +-
.../main/java/org/apache/juneau/swap/MapSwap.java | 2 +-
.../java/org/apache/juneau/swap/ObjectSwap.java | 10 +-
.../java/org/apache/juneau/swap/StringSwap.java | 2 +-
.../java/org/apache/juneau/swap/Surrogate.java | 4 +-
.../java/org/apache/juneau/swap/SurrogateSwap.java | 2 +-
.../org/apache/juneau/swaps/BeanStringSwap.java | 4 +-
.../org/apache/juneau/swaps/ByteArraySwap.java | 2 +-
.../java/org/apache/juneau/swaps/ClassSwap.java | 2 +-
.../juneau/swaps/DefaultingTemporalAccessor.java | 2 +-
.../org/apache/juneau/swaps/EnumerationSwap.java | 2 +-
.../org/apache/juneau/swaps/InputStreamSwap.java | 2 +-
.../java/org/apache/juneau/swaps/IteratorSwap.java | 2 +-
.../java/org/apache/juneau/swaps/LocaleSwap.java | 2 +-
.../org/apache/juneau/swaps/MatchResultSwap.java | 2 +-
.../org/apache/juneau/swaps/ParsedReaderSwap.java | 2 +-
.../java/org/apache/juneau/swaps/ReaderSwap.java | 2 +-
.../apache/juneau/swaps/StackTraceElementSwap.java | 2 +-
.../org/apache/juneau/swaps/StringFormatSwap.java | 2 +-
.../apache/juneau/swaps/TemporalCalendarSwap.java | 2 +-
.../org/apache/juneau/swaps/TemporalDateSwap.java | 2 +-
.../java/org/apache/juneau/swaps/TemporalSwap.java | 2 +-
.../java/org/apache/juneau/swaps/TimeZoneSwap.java | 2 +-
.../juneau/swaps/XMLGregorianCalendarSwap.java | 2 +-
.../java/org/apache/juneau/swaps/ZoneIdSwap.java | 2 +-
.../java/org/apache/juneau/uon/ParamFormat.java | 2 +-
.../org/apache/juneau/uon/UonBeanPropertyMeta.java | 2 +-
.../java/org/apache/juneau/uon/UonClassMeta.java | 2 +-
.../org/apache/juneau/uon/UonMetaProvider.java | 2 +-
.../main/java/org/apache/juneau/uon/UonParser.java | 2 +-
.../org/apache/juneau/uon/UonParserSession.java | 2 +-
.../main/java/org/apache/juneau/uon/UonReader.java | 2 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 2 +-
.../apache/juneau/uon/UonSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/uon/UonUtils.java | 2 +-
.../main/java/org/apache/juneau/uon/UonWriter.java | 2 +-
.../java/org/apache/juneau/uon/annotation/Uon.java | 6 +-
.../juneau/uon/annotation/UonAnnotation.java | 2 +-
.../apache/juneau/uon/annotation/UonConfig.java | 12 +-
.../juneau/uon/annotation/UonConfigAnnotation.java | 2 +-
.../urlencoding/UrlEncodingBeanPropertyMeta.java | 2 +-
.../juneau/urlencoding/UrlEncodingClassMeta.java | 2 +-
.../urlencoding/UrlEncodingMetaProvider.java | 2 +-
.../juneau/urlencoding/UrlEncodingParser.java | 2 +-
.../urlencoding/UrlEncodingParserSession.java | 2 +-
.../juneau/urlencoding/UrlEncodingSerializer.java | 2 +-
.../urlencoding/UrlEncodingSerializerSession.java | 2 +-
.../juneau/urlencoding/annotation/UrlEncoding.java | 6 +-
.../annotation/UrlEncodingAnnotation.java | 2 +-
.../urlencoding/annotation/UrlEncodingConfig.java | 4 +-
.../annotation/UrlEncodingConfigAnnotation.java | 2 +-
.../main/java/org/apache/juneau/xml/Namespace.java | 2 +-
.../java/org/apache/juneau/xml/XmlBeanMeta.java | 2 +-
.../org/apache/juneau/xml/XmlBeanPropertyMeta.java | 2 +-
.../java/org/apache/juneau/xml/XmlClassMeta.java | 2 +-
.../org/apache/juneau/xml/XmlDocSerializer.java | 2 +-
.../apache/juneau/xml/XmlDocSerializerSession.java | 2 +-
.../org/apache/juneau/xml/XmlEventAllocator.java | 2 +-
.../org/apache/juneau/xml/XmlMetaProvider.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlParser.java | 2 +-
.../org/apache/juneau/xml/XmlParserSession.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlReader.java | 2 +-
.../java/org/apache/juneau/xml/XmlReporter.java | 2 +-
.../java/org/apache/juneau/xml/XmlResolver.java | 2 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 10 +-
.../apache/juneau/xml/XmlSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlUtils.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlWriter.java | 2 +-
.../java/org/apache/juneau/xml/annotation/Xml.java | 6 +-
.../juneau/xml/annotation/XmlAnnotation.java | 2 +-
.../apache/juneau/xml/annotation/XmlConfig.java | 28 +-
.../juneau/xml/annotation/XmlConfigAnnotation.java | 2 +-
.../apache/juneau/xml/annotation/XmlFormat.java | 2 +-
.../org/apache/juneau/xml/annotation/XmlNs.java | 2 +-
.../apache/juneau/xml/annotation/XmlSchema.java | 2 +-
.../02.jm.SerializersAndParsers.html | 1 -
.../07.jm.ContextAnnotations.html | 4 -
.../docs/Topics/04.juneau-dto/01.jd.Html5.html | 10 -
.../docs/Topics/04.juneau-dto/02.jd.Atom.html | 14 -
.../02.jc.ReadingEntries/01.jc.Pojos.html | 4 +-
.../doc-files/jrs.HtmlBeans.json.png | Bin 80462 -> 0 bytes
juneau-doc/docs/Topics/17.Security.html | 2 +-
juneau-doc/juneau-doc.jar | Bin 27123 -> 27071 bytes
.../apache/juneau/doc/internal/DocGenerator.java | 33 +-
.../apache/juneau/doc/internal/DocLinkTester.java | 2 +-
juneau-doc/src/main/javadoc/javadoc.css | 2 +-
juneau-doc/src/main/javadoc/overview.html | 2035 ++++++++++----------
juneau-doc/src/main/javadoc/resources/docs.txt | 500 ++---
.../src/main/javadoc/resources/fragments/toc.html | 500 ++---
.../apache/juneau/examples/parser/ImageParser.java | 2 +-
.../examples/serializer/ImageSerializer.java | 2 +-
.../juneau/examples/rest/springboot/App.java | 2 +-
.../rest/springboot/HelloWorldMessageProvider.java | 2 +-
.../rest/springboot/HelloWorldResource.java | 2 +-
.../examples/rest/springboot/RootResources.java | 2 +-
.../juneau/examples/rest/HtmlBeansResource.java | 4 +-
.../juneau/examples/rest/PhotosResource.java | 2 +-
.../juneau/examples/rest/UtilityBeansResource.java | 4 +-
.../apache/juneau/rest/client/ResponseHeader.java | 4 +-
.../org/apache/juneau/rest/client/RestClient.java | 22 +-
.../assertion/FluentResponseBodyAssertion.java | 4 +-
.../assertion/FluentResponseHeaderAssertion.java | 4 +-
.../FluentResponseStatusLineAssertion.java | 2 +-
.../juneau/rest/client/remote/RemoteMeta.java | 2 +-
.../client/remote/RemoteMetadataException.java | 2 +-
.../rest/client/remote/RemoteOperationArg.java | 2 +-
.../rest/client/remote/RemoteOperationBeanArg.java | 2 +-
.../rest/client/remote/RemoteOperationMeta.java | 2 +-
.../rest/client/remote/RemoteOperationReturn.java | 2 +-
.../java/org/apache/juneau/http/remote/Remote.java | 10 +-
.../apache/juneau/http/remote/RemoteDelete.java | 2 +-
.../org/apache/juneau/http/remote/RemoteGet.java | 2 +-
.../org/apache/juneau/http/remote/RemoteOp.java | 2 +-
.../org/apache/juneau/http/remote/RemotePatch.java | 2 +-
.../org/apache/juneau/http/remote/RemotePost.java | 2 +-
.../org/apache/juneau/http/remote/RemotePut.java | 2 +-
.../apache/juneau/http/remote/RemoteReturn.java | 2 +-
.../juneau/http/remote/RrpcInterfaceMeta.java | 2 +-
.../http/remote/RrpcInterfaceMethodMeta.java | 2 +-
.../rest/springboot/BasicSpringRestServlet.java | 2 +-
.../springboot/BasicSpringRestServletGroup.java | 2 +-
.../juneau/rest/springboot/SpringRestServlet.java | 2 +-
.../java/org/apache/juneau/rest/RestChild.java | 2 +-
.../org/apache/juneau/rest/RestChildMatch.java | 2 +-
.../java/org/apache/juneau/rest/RestChildren.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 126 +-
.../java/org/apache/juneau/rest/RestOpContext.java | 6 +-
.../java/org/apache/juneau/rest/RestOpInvoker.java | 2 +-
.../java/org/apache/juneau/rest/RestRequest.java | 18 +-
.../java/org/apache/juneau/rest/RestResponse.java | 2 +-
.../org/apache/juneau/rest/annotation/Attr.java | 2 +-
.../org/apache/juneau/rest/annotation/Method.java | 2 +-
.../apache/juneau/rest/annotation/OpSwagger.java | 40 +-
.../rest/annotation/OpSwaggerAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/Rest.java | 68 +-
.../juneau/rest/annotation/RestAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestDelete.java | 28 +-
.../rest/annotation/RestDeleteAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestDestroy.java | 4 +-
.../rest/annotation/RestDestroyAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestEndCall.java | 4 +-
.../rest/annotation/RestEndCallAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestGet.java | 32 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestInit.java | 4 +-
.../juneau/rest/annotation/RestInitAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestOp.java | 40 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestOptions.java | 32 +-
.../rest/annotation/RestOptionsAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestPatch.java | 40 +-
.../rest/annotation/RestPatchAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestPost.java | 40 +-
.../juneau/rest/annotation/RestPostAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPostCall.java | 4 +-
.../rest/annotation/RestPostCallAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPostInit.java | 2 +-
.../rest/annotation/RestPostInitAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestPreCall.java | 4 +-
.../rest/annotation/RestPreCallAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestPut.java | 40 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 2 +-
.../juneau/rest/annotation/RestStartCall.java | 4 +-
.../rest/annotation/RestStartCallAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/Swagger.java | 34 +-
.../juneau/rest/annotation/SwaggerAnnotation.java | 2 +-
.../org/apache/juneau/rest/arg/ArgException.java | 2 +-
.../org/apache/juneau/rest/arg/AttributeArg.java | 2 +-
.../org/apache/juneau/rest/arg/ContentArg.java | 2 +-
.../org/apache/juneau/rest/arg/CookieList.java | 2 +-
.../org/apache/juneau/rest/arg/DefaultArg.java | 2 +-
.../org/apache/juneau/rest/arg/FormDataArg.java | 2 +-
.../org/apache/juneau/rest/arg/HasFormDataArg.java | 2 +-
.../org/apache/juneau/rest/arg/HasQueryArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/HeaderArg.java | 2 +-
.../juneau/rest/arg/HttpServletRequestArgs.java | 2 +-
.../juneau/rest/arg/HttpServletResponseArgs.java | 2 +-
.../apache/juneau/rest/arg/HttpSessionArgs.java | 2 +-
.../juneau/rest/arg/InputStreamParserArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/MethodArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/ParserArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/PathArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/QueryArg.java | 2 +-
.../apache/juneau/rest/arg/ReaderParserArg.java | 2 +-
.../org/apache/juneau/rest/arg/RequestBeanArg.java | 2 +-
.../apache/juneau/rest/arg/ResponseBeanArg.java | 2 +-
.../apache/juneau/rest/arg/ResponseCodeArg.java | 2 +-
.../apache/juneau/rest/arg/ResponseHeaderArg.java | 2 +-
.../apache/juneau/rest/arg/RestContextArgs.java | 2 +-
.../java/org/apache/juneau/rest/arg/RestOpArg.java | 2 +-
.../org/apache/juneau/rest/arg/RestOpArgList.java | 2 +-
.../apache/juneau/rest/arg/RestOpContextArgs.java | 2 +-
.../apache/juneau/rest/arg/RestOpSessionArgs.java | 2 +-
.../apache/juneau/rest/arg/RestRequestArgs.java | 2 +-
.../apache/juneau/rest/arg/RestResponseArgs.java | 2 +-
.../apache/juneau/rest/arg/RestSessionArgs.java | 2 +-
.../juneau/rest/arg/SimpleRestOperationArg.java | 2 +-
.../assertions/FluentProtocolVersionAssertion.java | 2 +-
.../assertions/FluentRequestContentAssertion.java | 6 +-
.../FluentRequestFormParamAssertion.java | 4 +-
.../assertions/FluentRequestHeaderAssertion.java | 4 +-
.../assertions/FluentRequestLineAssertion.java | 2 +-
.../FluentRequestQueryParamAssertion.java | 4 +-
.../apache/juneau/rest/beans/BeanDescription.java | 2 +-
.../rest/beans/ChildResourceDescriptions.java | 2 +-
.../org/apache/juneau/rest/beans/Hyperlink.java | 2 +-
.../juneau/rest/beans/ResourceDescription.java | 2 +-
.../juneau/rest/beans/ResourceDescriptions.java | 2 +-
.../org/apache/juneau/rest/beans/SeeOtherRoot.java | 2 +-
.../juneau/rest/config/BasicJson5Config.java | 2 +-
.../apache/juneau/rest/config/BasicJsonConfig.java | 2 +-
.../juneau/rest/config/BasicJsonHtmlConfig.java | 2 +-
.../juneau/rest/config/BasicOpenApiConfig.java | 2 +-
.../juneau/rest/config/BasicUniversalConfig.java | 2 +-
.../juneau/rest/converter/Introspectable.java | 2 +-
.../apache/juneau/rest/converter/Queryable.java | 2 +-
.../juneau/rest/converter/RestConverter.java | 2 +-
.../juneau/rest/converter/RestConverterList.java | 2 +-
.../apache/juneau/rest/converter/Traversable.java | 2 +-
.../juneau/rest/debug/BasicDebugEnablement.java | 2 +-
.../apache/juneau/rest/debug/DebugEnablement.java | 2 +-
.../juneau/rest/debug/DebugEnablementMap.java | 2 +-
.../org/apache/juneau/rest/guard/RestGuard.java | 2 +-
.../apache/juneau/rest/guard/RestGuardList.java | 2 +-
.../juneau/rest/guard/RoleBasedRestGuard.java | 2 +-
.../org/apache/juneau/rest/guard/RoleMatcher.java | 2 +-
.../juneau/rest/httppart/BasicNamedAttribute.java | 2 +-
.../juneau/rest/httppart/NamedAttribute.java | 2 +-
.../juneau/rest/httppart/NamedAttributeMap.java | 2 +-
.../juneau/rest/httppart/RequestAttribute.java | 2 +-
.../juneau/rest/httppart/RequestAttributes.java | 2 +-
.../juneau/rest/httppart/RequestContent.java | 4 +-
.../juneau/rest/httppart/RequestFormParam.java | 2 +-
.../juneau/rest/httppart/RequestFormParams.java | 2 +-
.../apache/juneau/rest/httppart/RequestHeader.java | 2 +-
.../juneau/rest/httppart/RequestHeaders.java | 2 +-
.../juneau/rest/httppart/RequestHttpPart.java | 4 +-
.../juneau/rest/httppart/RequestPathParam.java | 2 +-
.../juneau/rest/httppart/RequestPathParams.java | 2 +-
.../juneau/rest/httppart/RequestQueryParam.java | 2 +-
.../juneau/rest/httppart/RequestQueryParams.java | 2 +-
.../juneau/rest/httppart/ResponsePartMeta.java | 2 +-
.../apache/juneau/rest/httppart/RestPartType.java | 2 +-
.../apache/juneau/rest/logger/BasicCallLogger.java | 2 +-
.../rest/logger/BasicDisabledCallLogger.java | 2 +-
.../juneau/rest/logger/BasicTestCallLogger.java | 2 +-
.../rest/logger/BasicTestCaptureCallLogger.java | 2 +-
.../org/apache/juneau/rest/logger/CallLogger.java | 2 +-
.../apache/juneau/rest/logger/CallLoggerRule.java | 2 +-
.../juneau/rest/logger/CallLoggingDetail.java | 2 +-
.../juneau/rest/matcher/ClientVersionMatcher.java | 2 +-
.../rest/matcher/MultipartFormDataMatcher.java | 2 +-
.../apache/juneau/rest/matcher/RestMatcher.java | 2 +-
.../juneau/rest/matcher/RestMatcherList.java | 2 +-
.../juneau/rest/matcher/UrlEncodedFormMatcher.java | 2 +-
.../juneau/rest/processor/HttpEntityProcessor.java | 2 +-
.../rest/processor/HttpResourceProcessor.java | 2 +-
.../rest/processor/HttpResponseProcessor.java | 2 +-
.../rest/processor/InputStreamProcessor.java | 2 +-
.../rest/processor/PlainTextPojoProcessor.java | 2 +-
.../juneau/rest/processor/ReaderProcessor.java | 2 +-
.../rest/processor/ResponseBeanProcessor.java | 2 +-
.../juneau/rest/processor/ResponseProcessor.java | 2 +-
.../rest/processor/ResponseProcessorList.java | 2 +-
.../rest/processor/SerializedPojoProcessor.java | 2 +-
.../juneau/rest/processor/ThrowableProcessor.java | 2 +-
.../org/apache/juneau/rest/remote/RrpcServlet.java | 2 +-
.../apache/juneau/rest/rrpc/RrpcRestOpContext.java | 2 +-
.../apache/juneau/rest/rrpc/RrpcRestOpSession.java | 2 +-
.../juneau/rest/servlet/BasicGroupOperations.java | 2 +-
.../juneau/rest/servlet/BasicRestObject.java | 2 +-
.../juneau/rest/servlet/BasicRestObjectGroup.java | 2 +-
.../juneau/rest/servlet/BasicRestOperations.java | 2 +-
.../juneau/rest/servlet/BasicRestServlet.java | 2 +-
.../juneau/rest/servlet/BasicRestServletGroup.java | 2 +-
.../org/apache/juneau/rest/servlet/RestObject.java | 2 +-
.../apache/juneau/rest/servlet/RestServlet.java | 2 +-
.../juneau/rest/staticfile/BasicStaticFiles.java | 2 +-
.../apache/juneau/rest/staticfile/StaticFiles.java | 2 +-
.../apache/juneau/rest/stats/MethodExecStats.java | 2 +-
.../apache/juneau/rest/stats/MethodExecStore.java | 2 +-
.../apache/juneau/rest/stats/RestContextStats.java | 2 +-
.../org/apache/juneau/rest/stats/ThrownStats.java | 2 +-
.../org/apache/juneau/rest/stats/ThrownStore.java | 2 +-
.../juneau/rest/swagger/BasicSwaggerProvider.java | 2 +-
.../rest/swagger/BasicSwaggerProviderSession.java | 2 +-
.../juneau/rest/swagger/SwaggerProvider.java | 2 +-
.../java/org/apache/juneau/rest/vars/FileVar.java | 2 +-
.../apache/juneau/rest/vars/LocalizationVar.java | 2 +-
.../juneau/rest/vars/RequestAttributeVar.java | 2 +-
.../juneau/rest/vars/RequestFormDataVar.java | 2 +-
.../apache/juneau/rest/vars/RequestHeaderVar.java | 2 +-
.../apache/juneau/rest/vars/RequestPathVar.java | 2 +-
.../apache/juneau/rest/vars/RequestQueryVar.java | 2 +-
.../apache/juneau/rest/vars/RequestSwaggerVar.java | 2 +-
.../org/apache/juneau/rest/vars/RequestVar.java | 2 +-
.../juneau/rest/vars/SerializedRequestAttrVar.java | 2 +-
.../juneau/rest/vars/ServletInitParamVar.java | 2 +-
.../org/apache/juneau/rest/vars/SwaggerVar.java | 2 +-
.../org/apache/juneau/rest/vars/UrlEncodeVar.java | 2 +-
.../java/org/apache/juneau/rest/vars/UrlVar.java | 2 +-
.../juneau/rest/widget/ContentTypeMenuItem.java | 4 +-
.../apache/juneau/rest/widget/MenuItemWidget.java | 4 +-
.../apache/juneau/rest/widget/PoweredByApache.java | 4 +-
.../apache/juneau/rest/widget/PoweredByJuneau.java | 4 +-
.../apache/juneau/rest/widget/QueryMenuItem.java | 4 +-
.../apache/juneau/rest/widget/ThemeMenuItem.java | 4 +-
.../org/apache/juneau/rest/widget/Tooltip.java | 4 +-
.../java/org/apache/juneau/rest/widget/Widget.java | 10 +-
761 files changed, 2863 insertions(+), 2970 deletions(-)
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
index d12ff4bc9..8a49a3d2a 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
@@ -121,7 +121,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The object type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
index 2bf2f41e4..85fff429e 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
@@ -105,7 +105,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
index 8628bce03..04592d9e3 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -50,7 +50,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index efd4ef4fd..38b683a4c 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -47,7 +47,7 @@ import org.apache.juneau.cp.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> the type of input being tested.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index 6367f1bdf..62e31e43b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -45,7 +45,7 @@ import org.apache.juneau.cp.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
public class AssertionPredicates {
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
index 11ee5b253..0523ad935 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
@@ -65,7 +65,7 @@ import org.apache.juneau.common.utils.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a>
* </ul>
*/
public class Assertions {
@@ -96,7 +96,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link AnyAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link AnyAssertion} for supported operations on this type.
*
* @param <T> The value type.
* @param value
@@ -124,7 +124,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ArrayAssertion} for supported operations on this type.
*
* @param <E> The value element type.
* @param value
@@ -153,7 +153,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BeanAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BeanAssertion} for supported operations on this type.
*
* @param <T> The value type.
* @param value
@@ -182,7 +182,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BeanListAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BeanListAssertion} for supported operations on this type.
*
* @param <E> The element type.
* @param value
@@ -209,7 +209,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BooleanAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link BooleanAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -236,7 +236,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -268,7 +268,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -299,7 +299,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ByteArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ByteArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -325,7 +325,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ByteArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ByteArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -353,7 +353,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -384,7 +384,7 @@ public class Assertions {
* provides more functionality than {@link CollectionAssertion}.
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link CollectionAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link CollectionAssertion} for supported operations on this type.
*
* @param <E> The element type.
* @param value
@@ -411,7 +411,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ComparableAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ComparableAssertion} for supported operations on this type.
*
* @param <T> The value type.
* @param value
@@ -438,7 +438,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link DateAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link DateAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -465,7 +465,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -492,7 +492,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -519,7 +519,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -545,7 +545,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link IntegerAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link IntegerAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -572,7 +572,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ListAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ListAssertion} for supported operations on this type.
*
* @param <E> The element type.
* @param value
@@ -600,7 +600,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ListAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ListAssertion} for supported operations on this type.
*
* @param <E> The element type.
* @param value
@@ -629,7 +629,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link LongAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link LongAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -656,7 +656,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -683,7 +683,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link MapAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link MapAssertion} for supported operations on this type.
*
* @param <K> The key type.
* @param <V> The value type.
@@ -713,7 +713,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ObjectAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ObjectAssertion} for supported operations on this type.
*
* @param <T> The value type.
* @param value
@@ -742,7 +742,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link AnyAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link AnyAssertion} for supported operations on this type.
*
* @param <T> The value type.
* @param value
@@ -769,7 +769,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -798,7 +798,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link PrimitiveArrayAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -825,7 +825,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -856,7 +856,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringListAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link StringListAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -883,7 +883,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ThrowableAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ThrowableAssertion} for supported operations on this type.
*
* @param <T> The value type.
* @param value
@@ -910,7 +910,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link VersionAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link VersionAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
@@ -936,7 +936,7 @@ public class Assertions {
* </p>
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ZonedDateTimeAssertion} for supported operations on this type.
+ * See <a class="doclink" href="../../../../index.html#ja.Overview">Fluent Assertions</a> for general assertion usage and {@link ZonedDateTimeAssertion} for supported operations on this type.
*
* @param value
* The object being tested.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
index c9a7ee93c..67da1849d 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
@@ -89,7 +89,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The bean type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
index d4903a87f..b247e3957 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
@@ -119,7 +119,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The bean type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
index 339683f0a..dcbbf9d2e 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
@@ -87,7 +87,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="BooleanAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
index bf83cb89d..fcbcfe035 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
@@ -107,7 +107,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="ByteArrayAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
index 5d0dfe6f6..43e251e68 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
@@ -96,7 +96,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
index 4218fb674..94ec2d87c 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
@@ -82,7 +82,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The comparable type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
index 401f62019..692258bc6 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
@@ -104,7 +104,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="DateAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
index 99aa7250c..bdb3648b8 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
@@ -127,7 +127,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The object type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index d0b8e1f22..98fad965f 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -107,7 +107,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The entry type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
index d9c58ead0..f3eb3bfd7 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
@@ -75,7 +75,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
index 1e89d9dc7..fd082d941 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
@@ -85,7 +85,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The bean type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
index 61abc2143..4775a4db9 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
@@ -114,7 +114,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The bean type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
index e09e63a04..602c33eee 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
@@ -89,7 +89,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
index 4f2935033..e6d52918c 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
@@ -103,7 +103,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index 982249abc..c62788893 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -95,7 +95,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index ba4feacad..d4a23cf0b 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -85,7 +85,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The value type
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index 6d15ba35a..582ac023c 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -112,7 +112,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
index fc0994667..f891f8951 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
@@ -93,7 +93,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
index 358a69eee..4487ca7cd 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
@@ -112,7 +112,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
index 069562467..8ae60ccf1 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
@@ -97,7 +97,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index fc130b2c7..8c739928c 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -95,7 +95,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <K> The key type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 3447beac7..25eab440a 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -83,7 +83,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The object type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index ed940acfb..72a70b9bc 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -99,7 +99,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The array element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 32af2276a..9ecce7178 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -123,7 +123,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
index b6126dbc2..9de368e30 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
@@ -115,7 +115,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index e4f3639df..c4d34f3dd 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -92,7 +92,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The throwable type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
index d29937f60..854ac3d1e 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
@@ -100,7 +100,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index b48122715..dd0eedc83 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -106,7 +106,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <R> The return type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
index 8d85612af..39c221511 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
@@ -88,7 +88,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="IntegerAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
index 20e93cffd..eb404cc06 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
@@ -113,7 +113,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
index 0ba94958d..b1782d7c8 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
@@ -93,7 +93,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="LongAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
index 5274cb999..e6bddbd50 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
@@ -97,7 +97,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <K> The map key type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
index a306d5e65..9b5f225e8 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
@@ -81,7 +81,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The object type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
index 5746e625c..46cc0a311 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
@@ -98,7 +98,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <E> The array element type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index db059d6e6..d4c247d3f 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -115,7 +115,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="StringAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
index 84d776945..6ddde7813 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
@@ -112,7 +112,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="StringListAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
index 4910ba390..49aa7b145 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
@@ -92,7 +92,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*
* @param <T> The throwable type.
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
index 4b61efde0..2cc998d47 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
@@ -33,7 +33,7 @@ import org.apache.juneau.cp.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
public class Verify {
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
index 0f1b9d28c..c39ee32b4 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
@@ -97,7 +97,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="VersionAssertion")
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
index a706cfb71..5eea62863 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
@@ -100,7 +100,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Overview > juneau-assertions > Overview</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#ja.Overview">Overview > juneau-assertions > Overview</a>
* </ul>
*/
@FluentSetters(returns="ZonedDateTimeAssertion")
diff --git a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Snippet.java b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Snippet.java
index 5eba14203..6d83ded03 100644
--- a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Snippet.java
+++ b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Snippet.java
@@ -22,7 +22,7 @@ package org.apache.juneau.common.utils;
* See <c>Assertions.<jsm>assertThrown</jsm>(Snippet)</c> for an example.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-assertions.ja.Overview">Fluent Assertions</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#ja.Overview">Fluent Assertions</a>
* </ul>
*/
public interface Snippet {
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
index be89a0d56..f269a77af 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/XorEncodeMod.java
@@ -22,7 +22,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
* This is not intended to be used as strong encryption.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-config.jc.ModdedEntries">Overview > juneau-config > Modded/Encoded Entries</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jc.ModdedEntries">Overview > juneau-config > Modded/Encoded Entries</a>
* </ul>
*/
public class XorEncodeMod extends Mod {
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
index 6d529aadf..b77cd2c93 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/vars/ConfigVar.java
@@ -46,8 +46,8 @@ import org.apache.juneau.svl.*;
* Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Overview > juneau-marshall > Simple Variable Language</a>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-config.jc.Variables">Overview > juneau-config > Variables</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Overview > juneau-marshall > Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jc.Variables">Overview > juneau-config > Variables</a>
* </ul>
*/
public class ConfigVar extends DefaultingVar {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
index 928a291cd..e4dd61adf 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java
@@ -38,8 +38,7 @@ import org.apache.juneau.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
public class AtomBuilder {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
index d6cd94f3b..ee445fffc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Category.java
@@ -37,8 +37,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@Bean(typeName="category")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
index 1c881f510..82f416a19 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Common.java
@@ -33,8 +33,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
index eec7bc9c8..ef32b395d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java
@@ -24,8 +24,7 @@ import org.apache.juneau.xml.annotation.*;
* Parent class of {@link Entry}, {@link Feed}, and {@link Source}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
index 8de0f57fb..31fb9bbe6 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Content.java
@@ -61,8 +61,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
index addec55f0..6c77d6883 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Entry.java
@@ -44,8 +44,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@Bean(typeName="entry")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
index 60a843acb..6e703f13d 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Feed.java
@@ -49,8 +49,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@Bean(typeName="feed")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
index e84005edc..1ca59521c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Generator.java
@@ -35,8 +35,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@Bean(typeName="generator")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
index c02aff07b..736096239 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Icon.java
@@ -34,8 +34,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@Bean(typeName="icon")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
index f71e5415b..2c7a7903b 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Id.java
@@ -30,8 +30,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@Bean(typeName="id")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
index 7d13fe220..ea8c3f309 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Link.java
@@ -37,8 +37,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@Bean(typeName="link")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
index f9bcd5a74..688405998 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Logo.java
@@ -34,8 +34,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@Bean(typeName="logo")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
index 4fcb7d583..aa455ab10 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Person.java
@@ -33,8 +33,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
index 09e935705..280dc0ddc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Source.java
@@ -41,8 +41,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
index 803a1ab2b..3f578f820 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Text.java
@@ -42,8 +42,7 @@ import org.apache.juneau.xml.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
index 95e9da2e6..01cfc2938 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
@@ -20,8 +20,7 @@ import javax.xml.bind.*;
* Static utility methods for ATOM marshalling code.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Atom">Overview > juneau-dto > Atom</a>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">package-summary.html</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Atom">Overview > juneau-dto > Atom</a>
* </ul>
*/
class Utils {
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 6e9e0836a..51cb19c3a 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="a")
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 55513cac0..70dd0ddfc 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="abbr")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Address.java
index 4f67c5276..6cca5cae0 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="address")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Area.java
index cb2992aa7..546c8729f 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="area")
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 8493838a4..b8a299148 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="article")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Aside.java
index a60e9d92d..8375c2b7a 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="aside")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Audio.java
index 10a785779..2e0bcd859 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="audio")
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 a40323a0d..77d8f5956 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="b")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Base.java
index 90f627ba3..3f347abb3 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="base")
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 5bc1d0915..22319201d 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="bdi")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Bdo.java
index 0c8cffcc1..c190e0b7e 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="bdo")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Blockquote.java
index c4eaad852..7161fafd1 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="blockquote")
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 c39d7cf91..a09c88ee2 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="body")
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 c99a5e6a6..da80e48eb 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="br")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Button.java
index 1351d20fb..e4ac76ee1 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="button")
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 53238a74a..4049a53f0 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="canvas")
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 954c61b78..b521795fc 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="caption")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Cite.java
index b468ca964..57b0934d1 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="cite")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Code.java
index 4e4733df4..67f53bd98 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="code")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Col.java
index ae57e074c..4397be4ca 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="col")
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 0ce8719cc..4ae1302d4 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="colgroup")
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 19e490822..076371b89 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="data")
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 5a25da50d..9b9d16a3a 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="datalist")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dd.java
index 2544df6d3..299d915a8 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="dd")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Del.java
index 9d5dc2124..6693c8e10 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="del")
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 1f0d40221..ba9b1d6b9 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="dfn")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Div.java
index a8e9e6cc0..d74889835 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="div")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dl.java
index ef0d10531..450f7957b 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="dl")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Dt.java
index 46fc2ef9b..451f779ec 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="dt")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Em.java
index 52181569b..589c982e7 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="em")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Embed.java
index c84a2f14e..cba4606c0 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="embed")
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 0872d9f86..64d64594d 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="fieldset")
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 38d1586b7..3968efeed 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="figcaption")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Figure.java
index 8ec119406..7fb008809 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="figure")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Footer.java
index 694eca7d2..1d17efd5f 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="footer")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Form.java
index e65004a3e..1999f8121 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="form")
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 4cb60a97a..ab339a449 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="h1")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H2.java
index e551ea940..603fb09a3 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="h2")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H3.java
index 1dd7128c0..d6c26d51b 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="h3")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H4.java
index d1f1a7109..f56c487d5 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="h4")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H5.java
index 8c4d13a61..2f371c480 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="h5")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/H6.java
index f25fc7601..d321ed639 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="h6")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Head.java
index 6f0f2064e..eb0493752 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="head")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Header.java
index 4bf0f490e..2322dd570 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="header")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Hr.java
index 21b2803bc..742dcce95 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="hr")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Html.java
index 201f582c7..9612120e3 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="html")
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 726dde0d3..782a60ba6 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'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*
* @serial exclude
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlBuilder.java
index 92c16817c..79fe86e79 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'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
public class HtmlBuilder {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
index 7502004e1..6a7cd1ebe 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'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@org.apache.juneau.html.annotation.Html(format=XML)
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 d49fcb6af..1ea310e51 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'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
index 01ec70dbd..e0b439660 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'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
index 9a606e84b..a81b55147 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementRawText.java
@@ -21,7 +21,7 @@ import org.apache.juneau.xml.annotation.*;
* only.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
index d2783b9f3..83e3227b1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementText.java
@@ -20,7 +20,7 @@ import org.apache.juneau.xml.annotation.*;
* A subclass of HTML elements that contain text only.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
index b270b0c5d..2fef766c5 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementVoid.java
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
* See <a href="https://www.w3.org/TR/html51/syntax.html#void-elements">void elements</a>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Xml(format=VOID)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/I.java
index ce7970bd1..25ff9c3d0 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="i")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Iframe.java
index 6ae420aba..06ae080da 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="iframe")
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 9057adcbf..3eef4fbea 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="img")
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 a5409a32b..a4a7dc020 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
@@ -22,7 +22,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="input")
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 8450654e7..ece9b4616 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="ins")
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 f7997afba..bbf210a0e 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="kbd")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Keygen.java
index 4a81e39c3..1a9d89a73 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="keygen")
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 d4901d400..51a3f3205 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="label")
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 c11318e11..ab074ec54 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="legend")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Li.java
index 10df9afd7..caeab44a5 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="li")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Link.java
index d62fcbae8..128daa218 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="link")
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 a3fcb0fa6..9d90108bc 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="main")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Map.java
index 2a74aed8e..6ece4910d 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="map")
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 f77635a88..ae5b338f4 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="mark")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Meta.java
index e10aad50f..ea302bdc8 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="meta")
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 5f3454f1e..987a4e8e9 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="meter")
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 df4278abc..b8dd3581f 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="nav")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Noscript.java
index 19ffefe5f..910af5c21 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="noscript")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Object_.java
index 5316504c6..2f78c32e1 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="object")
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 311e4ebfa..737285cf9 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="ol")
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 cc1ed85c3..1a2299cc1 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="optgroup")
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 564feaa4d..2d65711f9 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="option")
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 2bbe5a3ba..742f86ff1 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="output")
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 b090ac6de..6f8365be8 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="p")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Param.java
index 7919c0476..c26784e4e 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="param")
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 997aedc7e..f5a6d21d5 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
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="pre")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Progress.java
index b4d6f6eda..1252c1928 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="progress")
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 fe95f03ee..0a40a07a3 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="q")
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 6d5d9a396..d430d9324 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="rb")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rp.java
index 5aa48d917..1f698a84c 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="rp")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rt.java
index 00ff01897..14b74c706 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="rt")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Rtc.java
index d9d859daf..196ace485 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="rtc")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ruby.java
index 5df8459e9..abd99d7df 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="ruby")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/S.java
index 07d0cefa3..37d550b05 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="s")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Samp.java
index 3509a15f1..1b0a03210 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="samp")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Script.java
index 4bced2301..7610cba4c 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
@@ -25,7 +25,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="script")
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 5bb042666..e9363da87 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="section")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Select.java
index 17dc33f5d..c9b809e4f 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
@@ -22,7 +22,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="select")
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 26e0eafb9..bc9d0691a 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="small")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Source.java
index a8ede69bf..e7b53dbfe 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="source")
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 01635e572..74e259d08 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="span")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Strong.java
index b54aa6262..73559d383 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="strong")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Style.java
index 61878ff3e..625ee4786 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
@@ -22,7 +22,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="style")
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 cc7567f18..d49be8b1c 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="sub")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Sup.java
index 41ab56046..5eb2ca9c3 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="sup")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Table.java
index c4c1777fe..39cb7806f 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="table")
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 693af22b2..7ec58de78 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="tbody")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Td.java
index 1b6fb4cfd..b3e3f8919 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="td")
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 f9479ccd1..015accf32 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="template")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Textarea.java
index 23fb5a94d..ac1145984 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="textarea")
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 26408dce2..c420178cc 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="tfoot")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Th.java
index 6dff40671..f5f45f271 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="th")
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 d88fda824..4a8a07880 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="thead")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Time.java
index a442f241d..129d623ac 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="time")
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 85ef4703c..c13c6a8ba 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="title")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Tr.java
index 7db9395eb..cf343eec8 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="tr")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Track.java
index 8ec6e0024..036ef23ba 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="track")
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 df1da337a..755d6fe8c 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="u")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Ul.java
index e924e94fa..2e67d6643 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="ul")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Var.java
index f256fbadc..3ae6073e4 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="var")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/Video.java
index e30016c10..174eae65c 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
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="video")
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 849cc92bd..c5c53e90c 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
@@ -20,7 +20,7 @@ import org.apache.juneau.internal.*;
* element.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Html5">Overview > juneau-dto > HTML5</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jd.Html5">Overview > juneau-dto > HTML5</a>
* </ul>
*/
@Bean(typeName="wbr")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
index c5bf4bb11..f515a0c80 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
@@ -28,10 +28,6 @@ import org.apache.juneau.swap.*;
/**
* Represents a top-level schema object bean in the JSON-Schema core specification.
- *
- * <ul class='seealso'>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
- * </ul>
*/
@Bean(typeName="schema",
properties="id,$schema,$ref, title,description,type,definitions,properties,"
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
index 10c131af5..602ea69f2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaArray.java
@@ -17,10 +17,6 @@ import java.util.*;
/**
* Represents a list of {@link JsonSchema} objects.
*
- * <ul class='seealso'>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
- * </ul>
- *
* @serial exclude
*/
public class JsonSchemaArray extends LinkedList<JsonSchema> {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
index 386e022aa..15fbad255 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaMap.java
@@ -34,10 +34,6 @@ import org.apache.juneau.json.*;
* {@link #load(URI)} - If you want control over construction of {@link JsonSchema} objects.
* </ul>
*
- * <ul class='seealso'>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
- * </ul>
- *
* @serial exclude
*/
public abstract class JsonSchemaMap extends ConcurrentHashMap<URI,JsonSchema> {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaProperty.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaProperty.java
index 94cc20b9c..231981d2c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaProperty.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaProperty.java
@@ -14,10 +14,6 @@ package org.apache.juneau.dto.jsonschema;
/**
* Represents a JSON property in the JSON-Schema core specification.
- *
- * <ul class='seealso'>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
- * </ul>
*/
public class JsonSchemaProperty extends JsonSchema {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
index 9b321ece2..0bae0cd8a 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaPropertySimpleArray.java
@@ -25,10 +25,6 @@ package org.apache.juneau.dto.jsonschema;
* <jk>new</jk> JsonSchema().setType(<jv>elementType</jv>)
* );
* </p>
- *
- * <ul class='seealso'>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
- * </ul>
*/
public class JsonSchemaPropertySimpleArray extends JsonSchemaProperty {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
index 12a4e7b13..6142d4c2e 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchemaRef.java
@@ -25,10 +25,6 @@ import org.apache.juneau.*;
* <p class='bjava'>
* JsonSchema <jv>schema</jv> = <jk>new</jk> JsonSchema().setRef(<jv>uri</jv>);
* </p>
- *
- * <ul class='seealso'>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
- * </ul>
*/
public class JsonSchemaRef extends JsonSchema {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
index 4b996fe97..e31ed1973 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonType.java
@@ -25,10 +25,6 @@ package org.apache.juneau.dto.jsonschema;
* <jc>// Produces 'number', not 'NUMBER'.</jc>
* String <jv>json</jv> = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(JsonType.<jsf>NUMBER</jsf>);
* </p>
- *
- * <ul class='seealso'>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
- * </ul>
*/
public enum JsonType {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
index 7d28d765d..ad3e11213 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonTypeArray.java
@@ -17,10 +17,6 @@ import java.util.*;
/**
* Represents a list of {@link JsonType} objects.
*
- * <ul class='seealso'>
- * <li class='jp'><a class="doclink" href="package-summary.html#TOC">org.apache.juneau.dto.jsonschema</a>
- * </ul>
- *
* @serial exclude
*/
public final class JsonTypeArray extends LinkedList<JsonType> {
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 d1acde9f6..3e54d7118 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Contact.java
@@ -46,7 +46,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="name,url,email,*")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ExternalDocumentation.java
index b4df53424..18b89d517 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'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="description,url,*")
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 bc288b9e9..1535e614f 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
@@ -46,7 +46,7 @@ import org.apache.juneau.marshaller.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="description,type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,$ref,example,*")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Info.java
index 689f7fd6f..fc5d53159 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'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="siteName,title,description,version,contact,license,termsOfService,*")
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 6fb79a84e..2dacaa871 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
@@ -50,7 +50,7 @@ import org.apache.juneau.marshaller.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,$ref,*")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/License.java
index c989d1726..f57e102a7 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'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="name,url,*")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
index 5a62914fc..f6f5eeae1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
@@ -124,7 +124,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="operationId,summary,description,tags,externalDocs,consumes,produces,parameters,responses,schemes,deprecated,security,*")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
index 23c37921d..036073f12 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/OperationMap.java
@@ -36,7 +36,7 @@ import org.apache.juneau.common.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*
* @serial exclude
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 1291ce338..c34b36244 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.marshaller.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="in,name,type,description,required,schema,format,allowEmptyValue,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,*")
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 28561e3ac..4a93ceeab 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
@@ -57,7 +57,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="description,schema,headers,examples,*")
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 8067a4ba5..203bac96c 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
@@ -55,7 +55,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="format,title,description,default,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,maxProperties,minProperties,required,requiredProperties,enum,type,items,allOf,properties,additionalProperties,discriminator,readOnly,xml,externalDocs,example,$ref,*")
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 5d9c4ab69..dca04511d 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.marshaller.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="type,description,name,in,flow,authorizationUrl,tokenUrl,scopes,*")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
index 9195557dd..d3c0e88db 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.objecttools.*;
* This is the root document object for the API specification.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="swagger,info,tags,externalDocs,basePath,schemes,consumes,produces,paths,definitions,parameters,responses,securityDefinitions,security,*")
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 3edf3f590..00c950d98 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerBuilder.java
@@ -21,7 +21,7 @@ import org.apache.juneau.common.internal.*;
* Various useful static methods for creating Swagger elements.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
public class SwaggerBuilder {
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
index 6a9779cb4..3c60b1afd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
@@ -26,7 +26,7 @@ import org.apache.juneau.json.*;
* Root class for all Swagger beans.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@FluentSetters
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Tag.java
index 3276bec08..d15d052e9 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
@@ -49,7 +49,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="name,description,externalDocs,*")
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 b8d7719b9..e11f7703e 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'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Overview > juneau-rest-server > Swagger</a>
* </ul>
*/
@Bean(properties="name,namespace,prefix,attribute,wrapped,*")
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
index 75e2c5792..5ad67ff65 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ui/SwaggerUI.java
@@ -31,7 +31,7 @@ import org.apache.juneau.swap.*;
* Generates a Swagger-UI interface from a Swagger document.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../../index.html#juneau-dto.jd.SwaggerUi">Overview > juneau-dto > Swagger UI</a>
+ * <li class='link'><a class="doclink" href="../../../../../../index.html#jd.SwaggerUi">Overview > juneau-dto > Swagger UI</a>
* </ul>
*/
public class SwaggerUI extends ObjectSwap<Swagger,Div> {
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
index b918f635d..306abd96a 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
@@ -89,7 +89,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -106,7 +106,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -123,7 +123,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -156,7 +156,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* @return The annotation value.
@@ -181,7 +181,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -207,7 +207,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -227,7 +227,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -248,7 +248,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -268,7 +268,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -310,7 +310,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -338,7 +338,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -361,7 +361,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -381,7 +381,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -401,7 +401,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -423,7 +423,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -443,7 +443,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -463,7 +463,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -483,7 +483,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -503,7 +503,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -523,7 +523,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -544,7 +544,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -564,7 +564,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -584,7 +584,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -604,7 +604,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -624,7 +624,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -657,7 +657,7 @@ public @interface RdfConfig {
* If you use <js>"BAG"</js> or <js>"MULTI_VALUED"</js>, the order of the elements in the collection will get
* lost.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -687,7 +687,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -711,7 +711,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -738,7 +738,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -754,7 +754,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -779,7 +779,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -802,7 +802,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -821,7 +821,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -846,7 +846,7 @@ public @interface RdfConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index ded62d3cb..7a8b6711a 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
@@ -153,7 +153,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../index.html#juneau-marshall.jm.BeanContexts">Bean Contexts</a>
+ * <li class='link'><a class="doclink" href="../../../index.html#jm.BeanContexts">Bean Contexts</a>
* </ul>
*/
@SuppressWarnings({"unchecked","rawtypes"})
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 fb0ec7aa6..67cc7b493 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -33,7 +33,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.BeanAnnotation">@Bean Annotation</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.BeanAnnotation">@Bean Annotation</a>
* </ul>
*/
@Documented
@Target({METHOD,TYPE})
@@ -89,7 +89,7 @@ public @interface Bean {
* <li>A static method with name <c>example</c> with no arguments or one {@link BeanSession} argument.
* </ul>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -258,7 +258,7 @@ public @interface Bean {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -272,7 +272,7 @@ public @interface Bean {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index 7d54bfef0..96d6416e8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -72,7 +72,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -103,7 +103,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -134,7 +134,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -160,7 +160,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -191,7 +191,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -216,7 +216,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* <li class='note'>
* The {@link Bean @Bean} annotation can be used on a class to override this setting when <js>"true"</js>.
* </ul>
@@ -243,7 +243,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* <li class='note'>
* The {@link Bean @Bean} annotation can be used on a class to override this setting when <js>"true"</js>.
* </ul>
@@ -270,7 +270,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -295,7 +295,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -317,7 +317,7 @@ public @interface BeanConfig {
* <li class='note'>
* Default value: <js>"_type"</js>.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
* <ul class='seealso'>
@@ -357,7 +357,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -389,7 +389,7 @@ public @interface BeanConfig {
* <li class='ja'>{@link Beanp#dictionary()}
* <li class='ja'>{@link BeanConfig#dictionary_replace()}
* <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#beanDictionary(Class...)}
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.BeanDictionaries">Bean Names and Dictionaries</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.BeanDictionaries">Bean Names and Dictionaries</a>
* </ul>
*
* @return The annotation value.
@@ -435,7 +435,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -461,7 +461,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -486,7 +486,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -511,7 +511,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -535,7 +535,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -560,7 +560,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -584,7 +584,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -609,7 +609,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -666,7 +666,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -686,7 +686,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -707,7 +707,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -759,7 +759,7 @@ public @interface BeanConfig {
* <li class='jp'><c>java.util.*</c>
* </ul>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -827,7 +827,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -855,12 +855,12 @@ public @interface BeanConfig {
*
* <ul class='seealso'>
* <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#swaps(Class...)}
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.OneWaySwaps">One-way Swaps</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.SwapAnnotation">@Swap Annotation</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.AutoSwaps">Auto-detected swaps</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.SurrogateClasses">Surrogate Classes</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OneWaySwaps">One-way Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SwapAnnotation">@Swap Annotation</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.AutoSwaps">Auto-detected swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SurrogateClasses">Surrogate Classes</a>
* </ul>
*
* @return The annotation value.
@@ -889,7 +889,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -914,7 +914,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -940,7 +940,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -965,7 +965,7 @@ public @interface BeanConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
index 8d1c4daa7..e622e9e62 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
@@ -30,7 +30,7 @@ import java.lang.annotation.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.BeanIgnoreAnnotation">@BeanIgnore Annotation</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.BeanIgnoreAnnotation">@BeanIgnore Annotation</a>
* </ul>
*/
@Documented
@@ -141,7 +141,7 @@ public @interface BeanIgnore {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -155,7 +155,7 @@ public @interface BeanIgnore {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
index 4d5cd1e98..c1390ec13 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
@@ -50,7 +50,7 @@ import org.apache.juneau.*;
* Multiple calls to {@link BeanMap#getBean()} will return the same bean instance.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.BeancAnnotation">@Beanc Annotation</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.BeancAnnotation">@Beanc Annotation</a>
* </ul>
*/
@Documented
@Target({METHOD,TYPE,CONSTRUCTOR})
@@ -131,7 +131,7 @@ public @interface Beanc {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
index d89a6da23..5b5a02ab3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
@@ -33,7 +33,7 @@ import org.apache.juneau.*;
* This annotation is applied to public fields and public getter/setter methods of beans.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.BeanpAnnotation">@Beanp Annotation</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.BeanpAnnotation">@Beanp Annotation</a>
* </ul>
*/
@Documented
@@ -274,7 +274,7 @@ public @interface Beanp {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Builder.java
index df0ba2e2c..4c86d4b7f 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'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.PojoBuilders">POJO Builders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.PojoBuilders">POJO Builders</a>
* </ul>
*/
@Documented
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
index 52eef5300..1a8b26458 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
@@ -147,7 +147,7 @@ public @interface Example {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -161,7 +161,7 @@ public @interface Example {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocs.java
index 0a2f6332e..48608abbf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExternalDocs.java
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a>
* <li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#externalDocumentationObject">Swagger ExternalDocumentation Object</a>
* </ul>
*/
@@ -55,7 +55,7 @@ public @interface ExternalDocs {
* The format is a plain-text string.
* <br>Multiple lines are concatenated with newlines.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*
* @return The annotation value.
@@ -74,7 +74,7 @@ public @interface ExternalDocs {
* <li class='note'>
* The format is a URL string.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
index 8ddd3c505..5b27d8d7a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
@@ -64,7 +64,7 @@ import org.apache.juneau.oapi.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a>
* <li class='link'><a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>
* </ul>
*/
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
index ae418fcd4..635becbe2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
@@ -73,7 +73,7 @@ public @interface Marshalled {
* <li>A static method with name <c>example</c> with no arguments or one {@link BeanSession} argument.
* </ul>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -152,7 +152,7 @@ public @interface Marshalled {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -166,7 +166,7 @@ public @interface Marshalled {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
index 037c0062a..1be6b2ae6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
@@ -33,7 +33,7 @@ import java.lang.annotation.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.NamePropertyAnnotation">@NameProperty Annotation</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.NamePropertyAnnotation">@NameProperty Annotation</a>
* </ul>
*/
@Target({METHOD,FIELD,TYPE})
@@ -102,7 +102,7 @@ public @interface NameProperty {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
index b0ff35120..21f533cff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.ParentPropertyAnnotation">@ParentProperty Annotation</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ParentPropertyAnnotation">@ParentProperty Annotation</a>
* </ul>
*/
@Target({METHOD,FIELD,TYPE})
@@ -105,7 +105,7 @@ public @interface ParentProperty {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
index e6d5b65b5..7a7e37349 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
@@ -64,7 +64,7 @@ import org.apache.juneau.oapi.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a>
* <li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#schemaObject">Swagger Schema Object</a>
* </ul>
*/
@@ -180,7 +180,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
@@ -193,7 +193,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
@@ -316,7 +316,7 @@ public @interface Schema {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*
* @return The annotation value.
@@ -335,7 +335,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
@@ -427,7 +427,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
@@ -670,7 +670,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
@@ -798,7 +798,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
@@ -922,7 +922,7 @@ public @interface Schema {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -936,7 +936,7 @@ public @interface Schema {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -989,7 +989,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
@@ -1009,7 +1009,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
@@ -1227,7 +1227,7 @@ public @interface Schema {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
index 78710bd72..836811cba 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
@@ -27,7 +27,7 @@ import java.lang.annotation.*;
* <br>If you want to nest items further, you have to define them free-form using {@link #items()} as free-form JSON.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-dto.jd.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a>
* <li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#itemsObject">Swagger Items Object</a>
* </ul>
*/
@@ -168,7 +168,7 @@ public @interface SubItems {
* Describes the type of items in the array.
*
* <p>
- * This is a <a class="doclink" href="../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object.
+ * This is a <a class="doclink" href="../../../../index.html#jd.Swagger">Swagger</a> object.
* <br>It must be declared free-form because it's not possible to nest annotations in Java.
*
* @return The annotation value.
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 c54a63a3e..aee948794 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
@@ -31,7 +31,7 @@ import org.apache.juneau.swap.*;
* </ul>
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.SwapAnnotation">@Swap Annotation</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SwapAnnotation">@Swap Annotation</a>
* </ul>
*/
@Documented
@@ -70,7 +70,7 @@ public @interface Swap {
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
* </ul>
*
* @return The annotation value.
@@ -157,7 +157,7 @@ public @interface Swap {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -171,7 +171,7 @@ public @interface Swap {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -209,7 +209,7 @@ public @interface Swap {
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.TemplatedSwaps">Templated Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.TemplatedSwaps">Templated Swaps</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
index 55b8a33f5..582435229 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
@@ -32,7 +32,7 @@ import java.lang.annotation.*;
* This annotation allows you to identify other classes that return URIs via <c>toString()</c> as URI objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MarshallingUris">URIs</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MarshallingUris">URIs</a>
* </ul>
*/
@Documented
@@ -123,7 +123,7 @@ public @interface Uri {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -137,7 +137,7 @@ public @interface Uri {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
index f082029d7..83f2a0524 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
@@ -121,7 +121,7 @@ public @interface Csv {
* </ul>
*
\ * <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -135,7 +135,7 @@ public @interface Csv {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
index 54927d380..5f649354d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Encoder.java
@@ -29,7 +29,7 @@ import java.io.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Encoders">Encoders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Encoders">Encoders</a>
* </ul>
*/
public abstract class Encoder {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderMatch.java
index 660d9586d..3eabdbe97 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderMatch.java
@@ -16,7 +16,7 @@ package org.apache.juneau.encoders;
* Represents a encoder and encoding that matches an HTTP <c>Accept-Encoding</c> header value.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Encoders">Encoders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Encoders">Encoders</a>
* </ul>
*/
public final class EncoderMatch {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
index 5986c6aaa..9b44356cc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
@@ -65,7 +65,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Encoders">Encoders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Encoders">Encoders</a>
* </ul>
*/
public final class EncoderSet {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Finishable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Finishable.java
index fa27fb3c4..2b79a2b59 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Finishable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/Finishable.java
@@ -18,7 +18,7 @@ import java.io.*;
* Interface that identifies an output stream has having a <c>finish()</c> method.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Encoders">Encoders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Encoders">Encoders</a>
* </ul>
*/
public interface Finishable {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/GzipEncoder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/GzipEncoder.java
index c235a488e..b4a21f9ad 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/GzipEncoder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/GzipEncoder.java
@@ -23,7 +23,7 @@ import java.util.zip.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Encoders">Encoders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Encoders">Encoders</a>
* </ul>
*/
public class GzipEncoder extends Encoder {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/IdentityEncoder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/IdentityEncoder.java
index b233f603a..4cb34e8b1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/IdentityEncoder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/IdentityEncoder.java
@@ -25,7 +25,7 @@ import java.io.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Encoders">Encoders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Encoders">Encoders</a>
* </ul>
*/
public class IdentityEncoder extends Encoder {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/AnchorText.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/AnchorText.java
index 1bbf445d3..941734eb6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/AnchorText.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/AnchorText.java
@@ -16,7 +16,7 @@ package org.apache.juneau.html;
* Identifies possible values for the {@link HtmlSerializer.Builder#uriAnchorText(AnchorText)} setting.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public enum AnchorText {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/AsideFloat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/AsideFloat.java
index e418c557c..ae70cc762 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/AsideFloat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/AsideFloat.java
@@ -16,7 +16,7 @@ package org.apache.juneau.html;
* Identifies possible float values for {@link HtmlDocSerializer.Builder#asideFloat(AsideFloat)}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public enum AsideFloat {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
index 8abd99d2d..d625dd13f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
* This class can be subclassed to customize page rendering.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class BasicHtmlDocTemplate implements HtmlDocTemplate {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlBeanPropertyMeta.java
index 21b3556e3..03737e331 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlBeanPropertyMeta.java
@@ -21,7 +21,7 @@ import org.apache.juneau.html.annotation.*;
* annotation on the bean property.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
@SuppressWarnings("rawtypes")
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
index f57f01cd0..2333cffdb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlClassMeta.java
@@ -24,7 +24,7 @@ import org.apache.juneau.html.annotation.*;
* the class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlClassMeta extends ExtendedClassMeta {
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 6b4f6afdf..3e888845a 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
@@ -74,7 +74,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
@@ -238,7 +238,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* <li class='note'>
* Format: HTML
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a>
+ * Supports <a class="doclink" href="../../../../index.html#jrs.SvlVariables">SVL Variables</a>
* (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* A value of <js>"NONE"</js> can be used to force no value.
@@ -777,7 +777,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-rest-server.jrs.HtmlDocAnnotation.jrs.HtmlWidgets">Widgets</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jrs.HtmlWidgets">Widgets</a>
* </ul>
*
* @param values The values to add to this setting.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
index 40cb8e90c..82d97b89d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
@@ -38,7 +38,7 @@ import org.apache.juneau.svl.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
index b685b2e57..78fc2cd5c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocTemplate.java
@@ -54,7 +54,7 @@ package org.apache.juneau.html;
* This interface allows you to control how these sections get rendered.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public interface HtmlDocTemplate {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlMetaProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlMetaProvider.java
index b12a538a0..4ce41edc7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlMetaProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlMetaProvider.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Interface for providing access to {@link HtmlClassMeta} and {@link HtmlBeanPropertyMeta} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public interface HtmlMetaProvider extends AnnotationProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index e37b6f7cd..852aabedc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -41,7 +41,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlParser extends XmlParser implements HtmlMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index dd5f9250a..42ce436c3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -42,7 +42,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
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 0e565cc68..1008e9cd4 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,8 +25,8 @@ 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'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails.jm.HtmlRenderAnnotation">@Html(render) Annotation</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlRenderAnnotation">@Html(render) Annotation</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </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 3a8c27151..3f80752a6 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
@@ -50,7 +50,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
index 8eeaf1daa..e90766590 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
@@ -33,7 +33,7 @@ import org.apache.juneau.svl.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlSchemaDocSerializerSession extends HtmlDocSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index 86b945aa8..284d84e5f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -53,7 +53,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlSchemaSerializer extends HtmlSerializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
index 45db33577..e1cdf522a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
@@ -33,7 +33,7 @@ import org.apache.juneau.svl.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlSchemaSerializerSession extends HtmlSerializerSession {
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 1238409d2..570e22257 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
@@ -136,7 +136,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 7dcb8c5d0..f3a8b41fe 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -42,7 +42,7 @@ import org.apache.juneau.xml.annotation.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlSerializerSession extends XmlSerializerSession {
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 4ecaf3a58..df2f49830 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
@@ -42,7 +42,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlStrippedDocSerializer extends HtmlSerializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
index 873a4b540..9330a57cf 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
@@ -32,7 +32,7 @@ import org.apache.juneau.svl.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlStrippedDocSerializerSession extends HtmlSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlTag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlTag.java
index 2acd78187..37ccedef0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlTag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlTag.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.*;
* Predefined tags that occur in the serialized output of the HTML serializer.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
enum HtmlTag {
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 654481d5b..6fc5264ec 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,8 +27,8 @@ import org.apache.juneau.svl.*;
* Widgets can be defined as inner classes of REST resource classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-rest-server.jrs.HtmlDocAnnotation.jrs.HtmlWidgets">Widgets</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jrs.HtmlWidgets">Widgets</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public interface HtmlWidget {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidgetMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidgetMap.java
index cc254a896..945dbb12e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidgetMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWidgetMap.java
@@ -18,8 +18,8 @@ import java.util.*;
* A collection of {@link HtmlWidget} objects keyed by their names.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-rest-server.jrs.HtmlDocAnnotation.jrs.HtmlWidgets">Widgets</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jrs.HtmlWidgets">Widgets</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*
* @serial exclude
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 65380f44b..cf18d09b6 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
@@ -31,8 +31,8 @@ import org.apache.juneau.svl.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-rest-server.jrs.HtmlDocAnnotation.jrs.HtmlWidgets">Widgets</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jrs.HtmlWidgets">Widgets</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlWidgetVar extends SimpleVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWriter.java
index 5feb97d34..46c057194 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlWriter.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.*;
* Specialized writer for serializing HTML.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlWriter extends XmlWriter {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/SimpleHtmlWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/SimpleHtmlWriter.java
index 38c4d6036..5e1372e44 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/SimpleHtmlWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/SimpleHtmlWriter.java
@@ -24,7 +24,7 @@ import java.io.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class SimpleHtmlWriter extends HtmlWriter {
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 61c1151a5..0d0884d80 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
@@ -31,8 +31,8 @@ import org.apache.juneau.html.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails.jm.HtmlAnnotation">@Html Annotation</a>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlAnnotation">@Html Annotation</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
@Documented
@Target({TYPE,FIELD,METHOD})
@@ -202,7 +202,7 @@ public @interface Html {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -216,7 +216,7 @@ public @interface Html {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
index b4fad04b1..defc8e66a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
@@ -29,7 +29,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link Html @Html} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
@SuppressWarnings("rawtypes")
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 95aa36fad..4c0c7a9a2 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
@@ -28,7 +28,7 @@ import org.apache.juneau.serializer.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -73,7 +73,7 @@ public @interface HtmlConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -122,7 +122,7 @@ public @interface HtmlConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -171,7 +171,7 @@ public @interface HtmlConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -192,7 +192,7 @@ public @interface HtmlConfig {
* <li class='note'>
* Default value: <js>"label"</js>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -244,7 +244,7 @@ public @interface HtmlConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -275,7 +275,7 @@ public @interface HtmlConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
index ac4fc2a2b..75f978085 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link HtmlConfig @HtmlConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlConfigAnnotation {
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 51aad9d4f..771b27b63 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
@@ -29,7 +29,7 @@ import org.apache.juneau.svl.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -77,7 +77,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* Format: HTML
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* A value of <js>"NONE"</js> can be used to force no value.
* <li class='note'>
@@ -132,7 +132,7 @@ public @interface HtmlDocConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* On methods, this value is inherited from the <ja>@HtmlDocConfig</ja> annotation on the servlet/resource class.
* On servlet/resource classes, this value is inherited from the <ja>@HtmlDocConfig</ja> annotation on the
@@ -166,7 +166,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* Format: HTML
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* A value of <js>"NONE"</js> can be used to force no value.
* <li class='note'>
@@ -207,7 +207,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* Format: HTML
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* A value of <js>"NONE"</js> can be used to force no value.
* <li class='note'>
@@ -251,7 +251,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* The parent value can be included by adding the literal <js>"INHERIT"</js> as a value.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* Multiple values are combined with newlines into a single string.
* <li class='note'>
@@ -291,7 +291,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* When {@link #navlinks()} is also specified, this content is placed AFTER the navigation links.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* A value of <js>"NONE"</js> can be used to force no value.
* <li class='note'>
@@ -352,7 +352,7 @@ public @interface HtmlDocConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* A value of <js>"NONE"</js> can be used to force no value.
* <li class='note'>
@@ -360,7 +360,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 class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.MarshallingUris">URIs</a> (e.g. <js>"servlet:/..."</js>, <js>"request:/..."</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.MarshallingUris">URIs</a> (e.g. <js>"servlet:/..."</js>, <js>"request:/..."</js>).
* <li class='note'>
* On methods, this value is inherited from the <ja>@HtmlDocConfig</ja> annotation on the servlet/resource class.
* <li class='note'>
@@ -395,7 +395,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* A value of <js>"NONE"</js> can be used to represent no value to differentiate it from an empty string.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -419,7 +419,7 @@ public @interface HtmlDocConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -449,7 +449,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* Format: Javascript
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* A value of <js>"NONE"</js> can be used to force no value.
* <li class='note'>
@@ -491,7 +491,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* Format: CSS
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* A value of <js>"NONE"</js> can be used to force no value.
* <li class='note'>
@@ -526,7 +526,7 @@ public @interface HtmlDocConfig {
* <li class='note'>
* Format: URL
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>).
* <li class='note'>
* On methods, this value is inherited from the <ja>@HtmlDocConfig</ja> annotation on the servlet/resource class.
* <li class='note'>
@@ -616,7 +616,7 @@ public @interface HtmlDocConfig {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.HtmlDocAnnotation.jrs.HtmlWidgets">Widgets</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.HtmlWidgets">Widgets</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
index 30813c8d7..ac0b85659 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link HtmlDocConfig @HtmlDocConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlDocConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlFormat.java
index 6ed862d3b..c54548e7a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlFormat.java
@@ -16,7 +16,7 @@ package org.apache.juneau.html.annotation;
* Identifies possible values for the {@link Html#format()} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public enum HtmlFormat {
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 4695f8fb2..5b916c95f 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
@@ -41,7 +41,7 @@ import org.apache.juneau.html.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
@Documented
@@ -79,7 +79,7 @@ public @interface HtmlLink {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -93,7 +93,7 @@ public @interface HtmlLink {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
index 9befaa974..37ceb43e6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
@@ -27,7 +27,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link HtmlLink @HtmlLink} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HtmlDetails">HTML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HtmlDetails">HTML Details</a>
* </ul>
*/
public class HtmlLinkAnnotation {
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 d1d37e655..aab9f02ef 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
@@ -37,7 +37,7 @@ import java.lang.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* <li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#contactObject">Swagger Contact Object</a>
* </ul>
*/
@@ -55,7 +55,7 @@ public @interface Contact {
* <li class='note'>
* The format is an email string.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*
* @return The annotation value.
@@ -72,7 +72,7 @@ public @interface Contact {
* <li class='note'>
* The format is a plain-text string.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*
* @return The annotation value.
@@ -89,7 +89,7 @@ public @interface Contact {
* <li class='note'>
* The format is a URL string.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a>
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a>
* (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Content.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Content.java
index e0170b6da..59459c7a9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Content.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Content.java
@@ -67,13 +67,13 @@ import org.apache.juneau.json.*;
* <h5 class='topic'>Arguments and argument-types of client-side @RemoteResource-annotated interfaces</h5>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Content">@Content</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Content">@Content</a>
* </ul>
*
* <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Request">@Request</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Request">@Request</a>
* </ul>
*
* <ul class='notes'>
@@ -109,7 +109,7 @@ public @interface Content {
* Dynamically apply this annotation to the specified classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -123,7 +123,7 @@ public @interface Content {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
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 41988f0c8..56d23c047 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
@@ -62,7 +62,7 @@ import org.apache.juneau.oapi.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* <li class='extlink'><a class='doclink' href='https://swagger.io/specification/v2#parameterObject'>Swagger Parameter Object</a>
* </ul>
*
@@ -82,14 +82,14 @@ import org.apache.juneau.oapi.*;
* request.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.FormData">@FormData</a>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Request">@Request</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.FormData">@FormData</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Request">@Request</a>
* </ul>
*
* <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
* <p>
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Request">@Request</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Request">@Request</a>
* </ul>
*
* <div class='warn'>
@@ -198,7 +198,7 @@ public @interface FormData {
* Dynamically apply this annotation to the specified classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -212,7 +212,7 @@ public @interface FormData {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
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 deb1fdf2c..afe5e53dd 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
@@ -57,7 +57,7 @@ import org.apache.juneau.oapi.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* <li class='extlink'><a class='doclink' href='https://swagger.io/specification/v2#parameterObject'>Swagger Parameter Object</a>
* </ul>
*
@@ -67,13 +67,13 @@ import org.apache.juneau.oapi.*;
* header value.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Header">@Header</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Header">@Header</a>
* </ul>
*
* <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
* <p>
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Request">@Request</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Request">@Request</a>
* </ul>
* <p>
* <ul class='seealso'>
@@ -159,7 +159,7 @@ public @interface Header {
* Dynamically apply this annotation to the specified classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -173,7 +173,7 @@ public @interface Header {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
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 547fe27f8..ca4a9624a 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
@@ -36,7 +36,7 @@ import java.lang.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* <li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#licenseObject">Swagger License Object</a>
* </ul>
*/
@@ -51,7 +51,7 @@ public @interface License {
* <li class='note'>
* The format is a plain-text string.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*
* @return The annotation value.
@@ -65,7 +65,7 @@ public @interface License {
* <li class='note'>
* The format is a plain-text string.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index b1471638a..76a27284e 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
@@ -55,7 +55,7 @@ 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'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* <li class='extlink'><a class='doclink' href='https://swagger.io/specification/v2#parameterObject'>Swagger Parameter Object</a>
* </ul>
*
@@ -64,13 +64,13 @@ 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'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Path">@Path</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Path">@Path</a>
* </ul>
*
* <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
* <p>
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Request">@Request</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Request">@Request</a>
* </ul>
*
* <ul class='seealso'>
@@ -164,7 +164,7 @@ public @interface Path {
* Dynamically apply this annotation to the specified classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -178,7 +178,7 @@ public @interface Path {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
index df909209b..0acfe34a2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
@@ -68,20 +68,20 @@ import org.apache.juneau.oapi.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* <li class='extlink'><a class='doclink' href='https://swagger.io/specification/v2#parameterObject'>Swagger Parameter Object</a>
* </ul>
*
* <h5 class='topic'>Arguments and argument-types of client-side @RemoteResource-annotated interfaces</h5>
* <p>
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Query">@Query</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Query">@Query</a>
* </ul>
*
* <h5 class='topic'>Methods and return types of server-side and client-side @Request-annotated interfaces</h5>
* <p>
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Request">@Request</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Request">@Request</a>
* </ul>
* <p>
*/
@@ -168,7 +168,7 @@ public @interface Query {
* Dynamically apply this annotation to the specified classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -182,7 +182,7 @@ public @interface Query {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Request.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Request.java
index 93f891129..a0efa39df 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Request.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Request.java
@@ -134,7 +134,7 @@ import org.apache.juneau.oapi.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Request">@Request</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Request">@Request</a>
* </ul>
* <p>
* <ul class='seealso'>
@@ -152,7 +152,7 @@ public @interface Request {
* Dynamically apply this annotation to the specified classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -166,7 +166,7 @@ public @interface Request {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
index 9351b089b..416222d2a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
@@ -39,8 +39,8 @@ import org.apache.juneau.oapi.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Response">@Response</a>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Response">@Response</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* <li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#responseObject">Swagger Response Object</a>
* </ul>
*/
@@ -56,7 +56,7 @@ public @interface Response {
* Serialized examples of the body of a response.
*
* <p>
- * This is a <a class="doclink" href="../../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object whose keys are media types and values are string representations of that value.
+ * This is a <a class="doclink" href="../../../../../index.html#jd.Swagger">Swagger</a> object whose keys are media types and values are string representations of that value.
*
* <p class='bjava'>
* <jc>// A JSON representation of a PetCreate object.</jc>
@@ -76,13 +76,13 @@ public @interface Response {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../../index.html#juneau-dto.jd.Swagger">Swagger</a> object with string keys (media type) and string values (example for that media type) .
+ * The format is a <a class="doclink" href="../../../../../index.html#jd.Swagger">Swagger</a> object with string keys (media type) and string values (example for that media type) .
* <li class='note'>
* The leading/trailing <c>{ }</c> characters are optional.
* <li class='note'>
* Multiple lines are concatenated with newlines so that you can format the value to be readable:
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* <li class='note'>
* Resolution of variables is delayed until request time and occurs before parsing.
* <br>This allows you to, for example, pull in a JSON construct from a properties file based on the locale of the HTTP request.
@@ -109,7 +109,7 @@ public @interface Response {
* Dynamically apply this annotation to the specified classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -123,7 +123,7 @@ public @interface Response {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCode.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCode.java
index b93bf8fd3..c896dee68 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCode.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/StatusCode.java
@@ -85,13 +85,13 @@ import org.apache.juneau.annotation.*;
*
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* </ul>
*
* <h5 class='topic'>Methods and return types of server-side and client-side @Response-annotated interfaces</h5>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-client.jrc.Proxies.jrc.Response">@Response</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrc.Response">@Response</a>
* </ul>
*
* <p>
@@ -110,7 +110,7 @@ public @interface StatusCode {
* Dynamically apply this annotation to the specified classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -124,7 +124,7 @@ public @interface StatusCode {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
index 6dc8635fe..deaafd571 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
@@ -44,7 +44,7 @@ import org.apache.juneau.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a>
* <li class='extlink'><a class="doclink" href="https://swagger.io/specification/v2#tagObject">Swagger Tag Object</a>
* </ul>
*/
@@ -57,10 +57,10 @@ public @interface Tag {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
+ * Supports <a class="doclink" href="../../../../../index.html#jrs.SvlVariables">SVL Variables</a> (e.g. <js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*
* @return The annotation value.
@@ -72,7 +72,7 @@ public @interface Tag {
*
* <ul class='notes'>
* <li class='note'>
- * The format is a <a class="doclink" href="../../../../../index.html#juneau-rest-server.jrs.Swagger">Swagger</a> object.
+ * The format is a <a class="doclink" href="../../../../../index.html#jrs.Swagger">Swagger</a> object.
* <br>Multiple lines are concatenated with newlines.
* </ul>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
index 803ce74e1..b37df8b27 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParser.java
@@ -25,7 +25,7 @@ import org.apache.juneau.parser.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public abstract class BaseHttpPartParser extends BeanContextable implements HttpPartParser {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParserSession.java
index 04bf0f851..c69085d66 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartParserSession.java
@@ -16,7 +16,7 @@ package org.apache.juneau.httppart;
* Base class for implementations of {@link HttpPartParserSession}
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public abstract class BaseHttpPartParserSession implements HttpPartParserSession {}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java
index 16089ce93..34a5dc630 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializer.java
@@ -23,7 +23,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public abstract class BaseHttpPartSerializer extends BeanContextable implements HttpPartSerializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializerSession.java
index 84b8f2c7e..4c2729c2e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/BaseHttpPartSerializerSession.java
@@ -16,7 +16,7 @@ package org.apache.juneau.httppart;
* Base class for implementations of {@link HttpPartSerializerSession}
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public abstract class BaseHttpPartSerializerSession implements HttpPartSerializerSession {}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/Constants.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/Constants.java
index 8b03ca93a..272d87189 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/Constants.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/Constants.java
@@ -16,7 +16,7 @@ package org.apache.juneau.httppart;
* HTTP-Part constants.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class Constants {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPart.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPart.java
index eb1fcaa8c..fc0f8fb23 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPart.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPart.java
@@ -23,7 +23,7 @@ import org.apache.http.*;
* Can be used to represent both request and response parts.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class HttpPart implements NameValuePair {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartCollectionFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartCollectionFormat.java
index b938d8628..3f2c172ba 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartCollectionFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartCollectionFormat.java
@@ -16,7 +16,7 @@ package org.apache.juneau.httppart;
* Valid values for the <c>collectionFormat</c> field.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public enum HttpPartCollectionFormat {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartDataType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartDataType.java
index 44fee1ace..29b721cf0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartDataType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartDataType.java
@@ -16,7 +16,7 @@ package org.apache.juneau.httppart;
* Valid values for the <c>type</c> field.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public enum HttpPartDataType {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartFormat.java
index ee0ea25c2..514a9aec0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartFormat.java
@@ -16,7 +16,7 @@ package org.apache.juneau.httppart;
* Valid values for the <c>format</c> field.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public enum HttpPartFormat {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
index 9a7334430..87d0516ec 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParser.java
@@ -32,7 +32,7 @@ import org.apache.juneau.cp.*;
* Implementations must include either a public no-args constructor.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public interface HttpPartParser {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
index 28e53cc68..71ce93f68 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartParserSession.java
@@ -23,7 +23,7 @@ import org.apache.juneau.parser.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public interface HttpPartParserSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index c64060059..eed140dfc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -52,7 +52,7 @@ import org.apache.juneau.reflect.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public class HttpPartSchema {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
index 2923b5229..186740c5b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializer.java
@@ -44,7 +44,7 @@ import org.apache.juneau.http.annotation.*;
* Implementations must include either a public no-args constructor.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public interface HttpPartSerializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
index 17c2b8e47..fc74d49bc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSerializerSession.java
@@ -22,7 +22,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public interface HttpPartSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartType.java
index eb3f1c863..b6972ec8c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartType.java
@@ -16,7 +16,7 @@ package org.apache.juneau.httppart;
* Represents possible enum values that can be passed to the {@link HttpPartSerializerSession#serialize(HttpPartType, HttpPartSchema, Object)}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public enum HttpPartType {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SchemaValidationException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SchemaValidationException.java
index 018577392..7dbfa0fd9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SchemaValidationException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SchemaValidationException.java
@@ -20,7 +20,7 @@ import org.apache.juneau.parser.ParseException;
* Exception thrown when an HTTP part fails schema validation during parsing.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*
* @serial exclude
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
index 9090258a0..25f0a1461 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParser.java
@@ -45,7 +45,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class SimplePartParser extends BaseHttpPartParser {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParserSession.java
index 7db08bbbe..ea0e13148 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartParserSession.java
@@ -24,7 +24,7 @@ import org.apache.juneau.reflect.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class SimplePartParserSession extends BaseHttpPartParserSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java
index bcefe8253..9c6f84378 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializer.java
@@ -28,7 +28,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class SimplePartSerializer extends BaseHttpPartSerializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializerSession.java
index c7e6a448a..11f7a236f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/SimplePartSerializerSession.java
@@ -22,7 +22,7 @@ import org.apache.juneau.reflect.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class SimplePartSerializerSession extends BaseHttpPartSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
index 615d3e2af..0c2f18cf4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanMeta.java
@@ -29,7 +29,7 @@ import org.apache.juneau.reflect.*;
* Represents the metadata gathered from a parameter or class annotated with {@link Request}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class RequestBeanMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
index fd2eeb103..ff841ca05 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
@@ -28,7 +28,7 @@ import org.apache.juneau.reflect.*;
* Represents the metadata gathered from a getter method of a class annotated with {@link Request}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class RequestBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index e10ce84a2..c17d9471a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -32,7 +32,7 @@ import org.apache.juneau.reflect.*;
* Represents the metadata gathered from a parameter or class annotated with {@link Response}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class ResponseBeanMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
index 1e642e898..272e917bd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanPropertyMeta.java
@@ -25,7 +25,7 @@ import org.apache.juneau.cp.*;
* Represents the metadata gathered from a getter method of a class annotated with {@link Response}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.HttpPartSerializersParsers">HTTP Part Serializers and Parsers</a>
* </ul>
*/
public class ResponseBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Parser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Parser.java
index de29f8230..19797351f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Parser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Parser.java
@@ -28,7 +28,7 @@ package org.apache.juneau.json;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class Json5Parser extends JsonParser {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Serializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Serializer.java
index 3140c994e..2150f00f7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Serializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Serializer.java
@@ -34,7 +34,7 @@ package org.apache.juneau.json;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class Json5Serializer extends JsonSerializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonBeanPropertyMeta.java
index 81214863b..d5231c29d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonBeanPropertyMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.json.annotation.*;
* annotation on the bean property.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public final class JsonBeanPropertyMeta extends ExtendedBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
index b1600c25f..64b4f34fe 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonClassMeta.java
@@ -22,7 +22,7 @@ import org.apache.juneau.json.annotation.*;
* the class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class JsonClassMeta extends ExtendedClassMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonMetaProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonMetaProvider.java
index a93334a80..186c5bc17 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonMetaProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonMetaProvider.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Interface for providing access to {@link JsonClassMeta} and {@link JsonBeanPropertyMeta} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public interface JsonMetaProvider extends AnnotationProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index e1d55e250..cb5c76b8b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -112,7 +112,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class JsonParser extends ReaderParser implements JsonMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index bbe57c467..2f7664993 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -37,7 +37,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index 60c594e52..1de385f86 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -45,7 +45,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class JsonSchemaSerializer extends JsonSerializer implements JsonSchemaMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
index 043b7e8a1..5d23f8eb8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
@@ -33,7 +33,7 @@ import org.apache.juneau.svl.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class JsonSchemaSerializerSession extends JsonSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 6cf0ecd75..f7ee37f66 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -100,7 +100,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class JsonSerializer extends WriterSerializer implements JsonMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index d0a2bfdeb..141b86c3a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -35,7 +35,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class JsonSerializerSession extends WriterSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
index 12c2e8777..086691081 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonWriter.java
@@ -28,7 +28,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public final class JsonWriter extends SerializerWriter {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
index 5cd362e5b..f213aaa86 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
@@ -37,7 +37,7 @@ import org.apache.juneau.annotation.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
@Documented
@@ -128,7 +128,7 @@ public @interface Json {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -142,7 +142,7 @@ public @interface Json {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
index 785e72067..9ce540306 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link Json @Json} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class JsonAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
index 53e0ab182..82a08e7ae 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
@@ -28,7 +28,7 @@ import org.apache.juneau.serializer.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -69,7 +69,7 @@ public @interface JsonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -102,7 +102,7 @@ public @interface JsonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -129,7 +129,7 @@ public @interface JsonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -169,7 +169,7 @@ public @interface JsonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
index 9ba8f1a88..0cb740a1e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link JsonConfig @JsonConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.JsonDetails">JSON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.JsonDetails">JSON Details</a>
* </ul>
*/
public class JsonConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BasicBeanDefMapper.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BasicBeanDefMapper.java
index b7927e33b..0a76edad2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BasicBeanDefMapper.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BasicBeanDefMapper.java
@@ -26,7 +26,7 @@ import org.apache.juneau.*;
* URIs are constructed using the pattern <js>"#/definitions/{id}"</js>.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public class BasicBeanDefMapper implements BeanDefMapper {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BeanDefMapper.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BeanDefMapper.java
index f016a72dc..1d8b362bb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BeanDefMapper.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/BeanDefMapper.java
@@ -20,7 +20,7 @@ import org.apache.juneau.*;
* Interface used to retrieve identifiers and URIs for bean classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public interface BeanDefMapper {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java
index 2817f1efa..8bde325d6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaBeanPropertyMeta.java
@@ -24,7 +24,7 @@ import org.apache.juneau.parser.*;
* on the bean property.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public class JsonSchemaBeanPropertyMeta extends ExtendedBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java
index 4428ddfae..f150b4dd1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaClassMeta.java
@@ -26,7 +26,7 @@ import org.apache.juneau.parser.*;
* the class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public class JsonSchemaClassMeta extends ExtendedClassMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index ee7cee773..a822b2f92 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -40,7 +40,7 @@ import org.apache.juneau.utils.*;
*
* <p>
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public class JsonSchemaGenerator extends BeanTraverseContext implements JsonSchemaMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index 0c2dc6eba..50197f7ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -38,7 +38,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public class JsonSchemaGeneratorSession extends BeanTraverseSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaMetaProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaMetaProvider.java
index 223e85849..fcd469fb0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaMetaProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaMetaProvider.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Interface for providing access to {@link JsonSchemaClassMeta} and {@link JsonSchemaBeanPropertyMeta} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public interface JsonSchemaMetaProvider extends AnnotationProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
index 6e6104476..acf438006 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
@@ -26,7 +26,7 @@ import org.apache.juneau.parser.*;
* Utilities for working with the schema annotations.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public class SchemaUtils {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
index d75933113..1068ee073 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
@@ -25,7 +25,7 @@ import java.util.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public enum TypeCategory {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
index 6a4c37774..7c408a45a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
@@ -31,7 +31,7 @@ import org.apache.juneau.parser.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -78,7 +78,7 @@ public @interface JsonSchemaConfig {
* <li><js>"OTHER"</js>
* </ul>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -117,7 +117,7 @@ public @interface JsonSchemaConfig {
* <li><js>"OTHER"</js>
* </ul>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -141,7 +141,7 @@ public @interface JsonSchemaConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -165,7 +165,7 @@ public @interface JsonSchemaConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -209,7 +209,7 @@ public @interface JsonSchemaConfig {
* <li class='note'>
* Format: Comma-delimited list of patterns
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -245,7 +245,7 @@ public @interface JsonSchemaConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -291,7 +291,7 @@ public @interface JsonSchemaConfig {
* <li class='warn'>
* Checking for recursion can cause a small performance penalty.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -320,7 +320,7 @@ public @interface JsonSchemaConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -344,7 +344,7 @@ public @interface JsonSchemaConfig {
* <li class='note'>
* Default value: <js>"0"</js>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -368,7 +368,7 @@ public @interface JsonSchemaConfig {
* <li class='note'>
* Default value: <js>"100"</js>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
index cd9b6cf4d..114046319 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link JsonSchemaConfig @JsonSchemaConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.JsonSchemaDetails">JSON-Schema Support</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.JsonSchemaDetails">JSON-Schema Support</a>
* </ul>
*/
public class JsonSchemaConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/CharMarshaller.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/CharMarshaller.java
index f5a214029..c9b0aeb5f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/CharMarshaller.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/CharMarshaller.java
@@ -22,7 +22,7 @@ import org.apache.juneau.serializer.*;
* A subclass of {@link Marshaller} for character-based serializers and parsers.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class CharMarshaller extends Marshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Csv.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Csv.java
index eac9846ed..3bd092bce 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Csv.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Csv.java
@@ -25,7 +25,7 @@ import org.apache.juneau.serializer.*;
* A pairing of a {@link CsvSerializer} and {@link CsvParser} into a single class with convenience read/write methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class Csv extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Html.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Html.java
index 57d247203..b15107241 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Html.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Html.java
@@ -41,7 +41,7 @@ import org.apache.juneau.serializer.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class Html extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json.java
index a2afb0caa..c8f4ecd92 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json.java
@@ -41,7 +41,7 @@ import org.apache.juneau.serializer.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class Json extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json5.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json5.java
index a0ace60db..9a6f1dfef 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json5.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Json5.java
@@ -41,7 +41,7 @@ import org.apache.juneau.serializer.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class Json5 extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Marshaller.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Marshaller.java
index e55de1f20..baaa2ac67 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Marshaller.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Marshaller.java
@@ -41,7 +41,7 @@ import org.apache.juneau.serializer.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public abstract class Marshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/MsgPack.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/MsgPack.java
index 0620e2fc3..f1fdd6588 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/MsgPack.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/MsgPack.java
@@ -40,7 +40,7 @@ import org.apache.juneau.serializer.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class MsgPack extends StreamMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
index 1fe4876f5..0ccb66cff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/OpenApi.java
@@ -42,7 +42,7 @@ import org.apache.juneau.serializer.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class OpenApi extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/PlainText.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/PlainText.java
index ab899db2c..1cad12ec3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/PlainText.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/PlainText.java
@@ -41,7 +41,7 @@ import org.apache.juneau.serializer.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class PlainText extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/StreamMarshaller.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/StreamMarshaller.java
index 0be5b09bd..23a7c6866 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/StreamMarshaller.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/StreamMarshaller.java
@@ -23,7 +23,7 @@ import org.apache.juneau.serializer.*;
* A subclass of {@link Marshaller} for stream-based serializers and parsers.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class StreamMarshaller extends Marshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Uon.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Uon.java
index dcc61539e..09ca93b02 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Uon.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Uon.java
@@ -41,7 +41,7 @@ import org.apache.juneau.uon.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class Uon extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/UrlEncoding.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/UrlEncoding.java
index 80f43fe1d..d57dfdd7d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/UrlEncoding.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/UrlEncoding.java
@@ -41,7 +41,7 @@ import org.apache.juneau.urlencoding.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class UrlEncoding extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Xml.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Xml.java
index c1283dc9d..466c1d986 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Xml.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/marshaller/Xml.java
@@ -41,7 +41,7 @@ import org.apache.juneau.xml.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Marshallers">Marshallers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Marshallers">Marshallers</a>
* </ul>
*/
public class Xml extends CharMarshaller {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/DataType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/DataType.java
index d211bae84..4296ebd98 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/DataType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/DataType.java
@@ -16,7 +16,7 @@ package org.apache.juneau.msgpack;
* Constants for the MessagePack format.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
enum DataType {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackBeanPropertyMeta.java
index 09eb6978c..a146b6394 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackBeanPropertyMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.msgpack.annotation.*;
* annotation on the bean property.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
public final class MsgPackBeanPropertyMeta extends ExtendedBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackClassMeta.java
index e7ef103ea..8f7617c12 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackClassMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.msgpack.annotation.*;
* the class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
public class MsgPackClassMeta extends ExtendedClassMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
index 641643f21..6052875fb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackInputStream.java
@@ -28,7 +28,7 @@ import org.apache.juneau.parser.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
public final class MsgPackInputStream extends ParserInputStream {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackMetaProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackMetaProvider.java
index aabfaa7cf..50245a9e6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackMetaProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackMetaProvider.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Interface for providing access to {@link MsgPackClassMeta} and {@link MsgPackBeanPropertyMeta} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
public interface MsgPackMetaProvider extends AnnotationProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
index d8bc5c5f2..318724f7f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackOutputStream.java
@@ -30,7 +30,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
public final class MsgPackOutputStream extends OutputStream {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index d63b7f7d2..d9d7c7b7f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -34,7 +34,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
public class MsgPackParser extends InputStreamParser implements MsgPackMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
index 81e01f6f8..849c9ff43 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
@@ -35,7 +35,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index 189c9df00..19aa61f65 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -39,7 +39,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
public class MsgPackSerializer extends OutputStreamSerializer implements MsgPackMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index 54b6ca79e..cd1bccf00 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -35,7 +35,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MsgPackDetails">MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MsgPackDetails">MessagePack Details</a>
* </ul>
*/
public final class MsgPackSerializerSession extends OutputStreamSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPack.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPack.java
index 4fec87fdd..cdccb1558 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPack.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPack.java
@@ -31,7 +31,7 @@ import org.apache.juneau.msgpack.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.MsgPackDetails">Overview > juneau-marshall > MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.MsgPackDetails">Overview > juneau-marshall > MessagePack Details</a>
* </ul>
*/
@Documented
@@ -122,7 +122,7 @@ public @interface MsgPack {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -136,7 +136,7 @@ public @interface MsgPack {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
index 43538fc08..b312dab29 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link MsgPack @MsgPack} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.MsgPackDetails">Overview > juneau-marshall > MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.MsgPackDetails">Overview > juneau-marshall > MessagePack Details</a>
* </ul>
*/
public class MsgPackAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
index 14248a708..35a48bd46 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
@@ -28,7 +28,7 @@ import org.apache.juneau.serializer.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.MsgPackDetails">Overview > juneau-marshall > MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.MsgPackDetails">Overview > juneau-marshall > MessagePack Details</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -73,7 +73,7 @@ public @interface MsgPackConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
index 73c769ce1..cb84c5d70 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link MsgPackConfig @MsgPackConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.MsgPackDetails">Overview > juneau-marshall > MessagePack Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.MsgPackDetails">Overview > juneau-marshall > MessagePack Details</a>
* </ul>
*/
public class MsgPackConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiBeanPropertyMeta.java
index 9e1b4b0ad..23057093c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiBeanPropertyMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.oapi.annotation.*;
* annotation on the bean property.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public final class OpenApiBeanPropertyMeta extends ExtendedBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiClassMeta.java
index 92c22cb76..963ec7444 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiClassMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.oapi.annotation.*;
* the class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public class OpenApiClassMeta extends ExtendedClassMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiMetaProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiMetaProvider.java
index 6a2155e0b..1d5e538c4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiMetaProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiMetaProvider.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Interface for providing access to {@link OpenApiClassMeta} and {@link OpenApiBeanPropertyMeta} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public interface OpenApiMetaProvider extends AnnotationProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
index 2770f937a..1ab03c57a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
@@ -33,7 +33,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public class OpenApiParser extends UonParser implements OpenApiMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
index 75237c97f..623df9e3b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
@@ -41,7 +41,7 @@ import org.apache.juneau.uon.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public class OpenApiParserSession extends UonParserSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index 8aef69a47..d74edd206 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -33,7 +33,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public class OpenApiSerializer extends UonSerializer implements OpenApiMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
index 021778532..6a43587ac 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
@@ -44,7 +44,7 @@ import org.apache.juneau.uon.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public class OpenApiSerializerSession extends UonSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java
index 02cf97e13..a4b50cba5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java
@@ -31,7 +31,7 @@ import org.apache.juneau.oapi.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
@Documented
@@ -122,7 +122,7 @@ public @interface OpenApi {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -136,7 +136,7 @@ public @interface OpenApi {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
index f674be3eb..2bd1b0795 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link OpenApi @OpenApi} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public class OpenApiAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
index cc8ce03b3..89a7a531a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
@@ -28,7 +28,7 @@ import org.apache.juneau.msgpack.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
@Target({TYPE,METHOD})
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
index b8e2577e4..611e4a31e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
@@ -22,7 +22,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link OpenApiConfig @OpenApiConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.OpenApiDetails">OpenAPI Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.OpenApiDetails">OpenAPI Details</a>
* </ul>
*/
public class OpenApiConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/AbstractMatcher.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/AbstractMatcher.java
index f83100d9d..e790eb307 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/AbstractMatcher.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/AbstractMatcher.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Common interface for matchers used by the {@link ObjectSearcher} class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public abstract class AbstractMatcher {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/Equality.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/Equality.java
index 5e9459c4c..cd45c3e6c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/Equality.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/Equality.java
@@ -16,7 +16,7 @@ package org.apache.juneau.objecttools;
* Represents possible values for number and date comparisons.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
@SuppressWarnings("javadoc")
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/MatcherFactory.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/MatcherFactory.java
index bf34095ea..c625ea020 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/MatcherFactory.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/MatcherFactory.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Common interface for matchers used by the {@link ObjectSearcher} class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public abstract class MatcherFactory {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
index 0c2f3eff3..6665da952 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/NumberMatcherFactory.java
@@ -37,7 +37,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public class NumberMatcherFactory extends MatcherFactory {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
index 11e1a2d31..a125b7ba3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
@@ -42,7 +42,7 @@ import org.apache.juneau.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public final class ObjectPaginator implements ObjectTool<PageArgs> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
index 88d6b77b8..73cb16b40 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
@@ -93,7 +93,7 @@ import org.apache.juneau.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
@SuppressWarnings({"rawtypes"})
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
index 77643e8c5..55a7dbe80 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
@@ -47,7 +47,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
@SuppressWarnings({"unchecked","rawtypes"})
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
index 531bc3454..b70f60441 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectTool.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Interface for classes that convert POJOs in some way using some predefined arguments object.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*
* @param <T> The argument object type.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
index f34bf1448..38bd3afbe 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
@@ -44,7 +44,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
@SuppressWarnings({"unchecked","rawtypes"})
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/PageArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/PageArgs.java
index 71be67485..c93ce83f5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/PageArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/PageArgs.java
@@ -18,7 +18,7 @@ import static java.util.Optional.*;
* Arguments passed to {@link ObjectPaginator}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public class PageArgs {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/PatternException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/PatternException.java
index 98f76a62b..f0a5598ab 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/PatternException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/PatternException.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Indicates an invalid search pattern was specified.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*
* @serial exclude
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SearchArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SearchArgs.java
index 3f197f147..57654ad3d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SearchArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SearchArgs.java
@@ -23,7 +23,7 @@ import org.apache.juneau.common.internal.*;
* Arguments passed to {@link ObjectSearcher}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public class SearchArgs {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SortArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SortArgs.java
index 047274699..d162f94ca 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SortArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/SortArgs.java
@@ -21,7 +21,7 @@ import java.util.*;
* Arguments passed to {@link ObjectSorter}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public class SortArgs {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
index 21d08195c..d7c9cc0ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/StringMatcherFactory.java
@@ -38,7 +38,7 @@ import org.apache.juneau.common.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public class StringMatcherFactory extends MatcherFactory {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
index 34e41385a..28079e919 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/TimeMatcherFactory.java
@@ -42,7 +42,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public class TimeMatcherFactory extends MatcherFactory {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ViewArgs.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ViewArgs.java
index 2948c04b3..00cb0d9f8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ViewArgs.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ViewArgs.java
@@ -21,7 +21,7 @@ import java.util.*;
* Arguments passed to {@link ObjectViewer}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.ObjectTools">Overview > juneau-marshall > Object Tools</a>
* </ul>
*/
public class ViewArgs {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
index bc2abe346..f87612e37 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParser.java
@@ -38,7 +38,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class InputStreamParser extends Parser {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
index 7df8de295..50060f832 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
@@ -29,7 +29,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class InputStreamParserSession extends ParserSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParseException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParseException.java
index 4c8be37b7..04cb43007 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParseException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParseException.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
* Exception that indicates invalid syntax encountered during parsing.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*
* @serial exclude
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index 499c279f4..e57d67ba2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -40,7 +40,7 @@ import org.apache.juneau.xml.*;
*
* <h5 class='topic'>Valid data conversions</h5>
* <p>
- * Parsers can parse any parsable POJO types, as specified in the <a class="doclink" href="../../../../index.html#juneau-marshall.jm.PojoCategories">POJO Categories</a>.
+ * Parsers can parse any parsable POJO types, as specified in the <a class="doclink" href="../../../../index.html#jm.PojoCategories">POJO Categories</a>.
*
* <p>
* Some examples of conversions are shown below...
@@ -128,7 +128,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class Parser extends BeanContextable {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserInputStream.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserInputStream.java
index 17ece52f5..09a470ed8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserInputStream.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserInputStream.java
@@ -25,7 +25,7 @@ import java.io.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class ParserInputStream extends InputStream implements Positionable {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserListener.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserListener.java
index e5c7405eb..9dbf247c0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserListener.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserListener.java
@@ -20,7 +20,7 @@ import org.apache.juneau.*;
* Class for listening for certain parse events during a document parse.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class ParserListener {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserMatch.java
index b8f3da3e7..eb109bf1e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserMatch.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Represents a parser and media type that matches an HTTP <c>Content-Type</c> header value.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public final class ParserMatch {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
index dbd3a97cb..b64c6ab4f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserPipe.java
@@ -51,7 +51,7 @@ import org.apache.juneau.common.internal.*;
* streams and readers created from other types (e.g. Files) WILL be automatically closed.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public final class ParserPipe implements Closeable {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
index 23c0767e7..36d3b8357 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserReader.java
@@ -32,7 +32,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class ParserReader extends Reader implements Positionable {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index 9ee8e5bc1..405cfcd31 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -39,7 +39,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class ParserSession extends BeanSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
index 4190d61cc..db88aecb2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
@@ -77,7 +77,7 @@ import org.apache.juneau.reflect.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public final class ParserSet {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
index 81d72c0ad..35fa32340 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
@@ -22,7 +22,7 @@ import org.apache.juneau.common.internal.*;
* Identifies a position in a reader or input stream.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class Position {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Positionable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Positionable.java
index c38fbcd16..496aad83d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Positionable.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Positionable.java
@@ -16,7 +16,7 @@ package org.apache.juneau.parser;
* Interface for objects with positions (lines/columns/byte-positions for example).
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public interface Positionable {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
index d21b15f44..a99ea8f56 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -40,7 +40,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class ReaderParser extends Parser {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
index 8a64076e0..bcd76aef4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
@@ -33,7 +33,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class ReaderParserSession extends ParserSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
index 0588a15bf..0a0ba2a2d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
@@ -34,7 +34,7 @@ import org.apache.juneau.xml.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -72,7 +72,7 @@ public @interface ParserConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -101,7 +101,7 @@ public @interface ParserConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -125,7 +125,7 @@ public @interface ParserConfig {
* <li class='note'>
* Default: 5
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -191,7 +191,7 @@ public @interface ParserConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -216,7 +216,7 @@ public @interface ParserConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -257,7 +257,7 @@ public @interface ParserConfig {
* <li>RDF parsers - These read everything into an internal model before any parsing begins.
* </ul>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -285,7 +285,7 @@ public @interface ParserConfig {
* <li class='note'>
* <js>"DEFAULT"</js> can be used to indicate the JVM default file system charset.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -309,7 +309,7 @@ public @interface ParserConfig {
* <li class='note'>
* <js>"DEFAULT"</js> can be used to indicate the JVM default file system charset.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
index b85b7ea41..45cc3e822 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link ParserConfig @ParserConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class ParserConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 2faa2dffc..c42a99ad9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -28,7 +28,7 @@ import org.apache.juneau.utils.*;
* Parsers HTTP plain text request bodies into Group 5 POJOs.
*
* <p>
- * See <a class="doclink" href="../../../../index.html#juneau-marshall.jm.PojoCategories">POJO Categories</a>.
+ * See <a class="doclink" href="../../../../index.html#jm.PojoCategories">POJO Categories</a>.
*
* <h5 class='topic'>Media types</h5>
*
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainText.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainText.java
index 328a3697a..ed5fea841 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainText.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainText.java
@@ -121,7 +121,7 @@ public @interface PlainText {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -135,7 +135,7 @@ public @interface PlainText {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index 21106189c..76074ba9e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -30,7 +30,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class OutputStreamSerializer extends Serializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
index ee0594a5c..6d811a5be 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
@@ -39,7 +39,7 @@ import org.apache.juneau.svl.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class OutputStreamSerializerSession extends SerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializeException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializeException.java
index 123b8bb8f..2dbb45662 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializeException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializeException.java
@@ -25,7 +25,7 @@ import org.apache.juneau.json.*;
* General exception thrown whenever an error occurs during serialization.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*
* @serial exclude
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index dabcc26ac..8de3a3e9a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -60,7 +60,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class Serializer extends BeanTraverseContext {
@@ -749,7 +749,7 @@ public class Serializer extends BeanTraverseContext {
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MarshallingUris">URIs</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MarshallingUris">URIs</a>
* </ul>
*
* @param value The new value for this property.
@@ -783,7 +783,7 @@ public class Serializer extends BeanTraverseContext {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MarshallingUris">URIs</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MarshallingUris">URIs</a>
* </ul>
*
* @param value
@@ -821,7 +821,7 @@ public class Serializer extends BeanTraverseContext {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.MarshallingUris">URIs</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.MarshallingUris">URIs</a>
* </ul>
*
* @param value
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerListener.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerListener.java
index 785e96f66..1626b015d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerListener.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerListener.java
@@ -20,7 +20,7 @@ import org.apache.juneau.*;
* Class for listening for serialize events during a serialization.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class SerializerListener {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerMatch.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerMatch.java
index 3fa8b3976..550f32580 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerMatch.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerMatch.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Represents a serializer and media type that matches an HTTP <c>Accept</c> header value.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public final class SerializerMatch {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
index 95ea201c0..56e24ea8f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerPipe.java
@@ -43,7 +43,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public final class SerializerPipe implements Closeable {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 999f63508..5ab87316a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -55,7 +55,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class SerializerSession extends BeanTraverseSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
index f0a7dde05..3738e198f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
@@ -76,7 +76,7 @@ import org.apache.juneau.reflect.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public final class SerializerSet {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
index 967f24f49..450fd68ed 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerWriter.java
@@ -32,7 +32,7 @@ import org.apache.juneau.internal.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
@FluentSetters
public class SerializerWriter extends Writer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index f34f1b72e..03b1ccf29 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -35,7 +35,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class WriterSerializer extends Serializer {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
index 83fdfddd8..76bb1962f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
@@ -43,7 +43,7 @@ import org.apache.juneau.svl.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class WriterSerializerSession extends SerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
index 716b26cfc..fd8ec5758 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
@@ -30,7 +30,7 @@ import org.apache.juneau.serializer.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -68,7 +68,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -109,7 +109,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -145,7 +145,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -176,7 +176,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -217,7 +217,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -244,7 +244,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -277,7 +277,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -308,7 +308,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -332,7 +332,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -354,7 +354,7 @@ public @interface SerializerConfig {
* <li class='note'>
* Format: JSON object representing a {@link UriContext}
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -383,12 +383,12 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
* <li class='jm'>{@link org.apache.juneau.serializer.Serializer.Builder#uriRelativity(UriRelativity)}
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.MarshallingUris">URIs</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.MarshallingUris">URIs</a>
* </ul>
*
* @return The annotation value.
@@ -414,12 +414,12 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
* <li class='jm'>{@link org.apache.juneau.serializer.Serializer.Builder#uriResolution(UriResolution)}
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.MarshallingUris">URIs</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.MarshallingUris">URIs</a>
* </ul>
*
* @return The annotation value.
@@ -447,7 +447,7 @@ public @interface SerializerConfig {
* <li class='note'>
* Default: JVM system default.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* <li class='note'>
* This setting does not apply to the RDF serializers.
* </ul>
@@ -472,7 +472,7 @@ public @interface SerializerConfig {
* <li class='note'>
* Default: 100
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* <li class='note'>
* This setting does not apply to the RDF serializers.
* </ul>
@@ -495,7 +495,7 @@ public @interface SerializerConfig {
* <li class='note'>
* Default: <c>"</c>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* <li class='note'>
* This setting does not apply to the RDF serializers.
* </ul>
@@ -523,7 +523,7 @@ public @interface SerializerConfig {
* <li class='note'>
* Default: <js>"utf-8"</js>.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* <li class='note'>
* This setting does not apply to the RDF serializers.
* </ul>
@@ -549,7 +549,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -595,7 +595,7 @@ public @interface SerializerConfig {
* <li class='warn'>
* Checking for recursion can cause a small performance penalty.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -624,7 +624,7 @@ public @interface SerializerConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -648,7 +648,7 @@ public @interface SerializerConfig {
* <li class='note'>
* Default value: <js>"0"</js>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -672,7 +672,7 @@ public @interface SerializerConfig {
* <li class='note'>
* Default value: <js>"100"</js>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
index 952afc170..515d09a92 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link SerializerConfig @SerializerConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SerializersAndParsers">Serializers and Parsers</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SerializersAndParsers">Serializers and Parsers</a>
* </ul>
*/
public class SerializerConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXml.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXml.java
index cf23ab655..1057b5a8d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXml.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXml.java
@@ -121,7 +121,7 @@ public @interface SoapXml {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -135,7 +135,7 @@ public @interface SoapXml {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/DefaultingVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/DefaultingVar.java
index da065c99d..454837477 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/DefaultingVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/DefaultingVar.java
@@ -26,7 +26,7 @@ package org.apache.juneau.svl;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public abstract class DefaultingVar extends SimpleVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
index 4c9696b2b..7df7ed08c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
@@ -21,7 +21,7 @@ import java.util.*;
* A subclass of {@link DefaultingVar} that simply pulls values from a {@link Map}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
@SuppressWarnings("rawtypes")
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartResolvingVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartResolvingVar.java
index 8011e803e..4199de512 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartResolvingVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartResolvingVar.java
@@ -28,7 +28,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public abstract class MultipartResolvingVar extends SimpleVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartVar.java
index 9db60a870..efe967e7f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MultipartVar.java
@@ -23,7 +23,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public abstract class MultipartVar extends SimpleVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java
index fb837d3a1..87ca15054 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/ResolvingJsonMap.java
@@ -30,7 +30,7 @@ import org.apache.juneau.collections.*;
* All other data types are left as-is.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
@SuppressWarnings({"serial"})
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/SimpleVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/SimpleVar.java
index b3dc0ae30..1df3baf67 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/SimpleVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/SimpleVar.java
@@ -29,7 +29,7 @@ import java.io.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
09 */
public abstract class SimpleVar extends Var {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/StreamedVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/StreamedVar.java
index 952a4a248..7e35c25e2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/StreamedVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/StreamedVar.java
@@ -28,7 +28,7 @@ package org.apache.juneau.svl;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public abstract class StreamedVar extends Var {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
index 6769945d7..953970090 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
@@ -43,7 +43,7 @@ import java.io.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public abstract class Var {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
index 7d20cffc1..d713931ee 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
@@ -22,7 +22,7 @@ import org.apache.juneau.svl.vars.*;
* Simple list of variables that can consist of either variable classes or instances.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*
* @serial exclude
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolver.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolver.java
index d60d63618..a9ff30ad8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolver.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolver.java
@@ -59,7 +59,7 @@ import org.apache.juneau.svl.vars.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class VarResolver {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverException.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverException.java
index 316226b83..11c361234 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverException.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverException.java
@@ -20,7 +20,7 @@ import org.apache.juneau.*;
* Exception that occurs during a var resolver session.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*
* @serial exclude
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index f9a0a42cd..89626456e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -41,7 +41,7 @@ import org.apache.juneau.internal.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class VarResolverSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ArgsVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ArgsVar.java
index 4beb301e2..f69a4b46b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ArgsVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ArgsVar.java
@@ -50,7 +50,7 @@ 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'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class ArgsVar extends DefaultingVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/CoalesceVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/CoalesceVar.java
index 963fb31a5..2c4eb7e66 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/CoalesceVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/CoalesceVar.java
@@ -21,7 +21,7 @@ import org.apache.juneau.svl.*;
* The format for this var is <js>"$CO{arg1[,arg2...]}"</js>.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class CoalesceVar extends MultipartResolvingVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/EnvVariablesVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/EnvVariablesVar.java
index 804d13095..675920af4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/EnvVariablesVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/EnvVariablesVar.java
@@ -34,7 +34,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class EnvVariablesVar extends DefaultingVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/IfVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/IfVar.java
index c886d6565..98d78c72c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/IfVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/IfVar.java
@@ -46,7 +46,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class IfVar extends MultipartVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LenVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LenVar.java
index 29b589226..5e0d2cab9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LenVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LenVar.java
@@ -42,7 +42,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class LenVar extends MultipartVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LowerCaseVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LowerCaseVar.java
index a683e6fee..9da8f9178 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LowerCaseVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LowerCaseVar.java
@@ -28,7 +28,7 @@ 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'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class LowerCaseVar extends SimpleVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ManifestFileVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ManifestFileVar.java
index f0bf40dfb..70709dcc4 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ManifestFileVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/ManifestFileVar.java
@@ -44,7 +44,7 @@ import org.apache.juneau.utils.*;
* Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class ManifestFileVar extends DefaultingVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/NotEmptyVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/NotEmptyVar.java
index 1bfe77205..7c3d749b0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/NotEmptyVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/NotEmptyVar.java
@@ -28,7 +28,7 @@ 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'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class NotEmptyVar extends SimpleVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternExtractVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternExtractVar.java
index 95d741d20..d85b90914 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternExtractVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternExtractVar.java
@@ -45,7 +45,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class PatternExtractVar extends MultipartVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternMatchVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternMatchVar.java
index 3540b746c..6a6b44199 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternMatchVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternMatchVar.java
@@ -46,7 +46,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class PatternMatchVar extends MultipartVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternReplaceVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternReplaceVar.java
index 407eb71f4..dada3c121 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternReplaceVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternReplaceVar.java
@@ -45,7 +45,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class PatternReplaceVar extends MultipartVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SubstringVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SubstringVar.java
index abdb21d8e..08a65e0ff 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SubstringVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SubstringVar.java
@@ -43,7 +43,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class SubstringVar extends MultipartVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
index 0332afd82..e25a72acd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
@@ -47,7 +47,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class SwitchVar extends MultipartVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SystemPropertiesVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SystemPropertiesVar.java
index 6b8e60d54..cb4dd60ce 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SystemPropertiesVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SystemPropertiesVar.java
@@ -34,7 +34,7 @@ import org.apache.juneau.svl.*;
* <br>Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class SystemPropertiesVar extends MapVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/UpperCaseVar.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/UpperCaseVar.java
index 4e391269c..1966fc842 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/UpperCaseVar.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/UpperCaseVar.java
@@ -28,7 +28,7 @@ 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'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage">Simple Variable Language</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.SimpleVariableLanguage">Simple Variable Language</a>
* </ul>
*/
public class UpperCaseVar extends SimpleVar {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
index e434b43ca..a2f338c94 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
@@ -72,7 +72,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The normal class type.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
index ed3033e2f..65af0a6cc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
@@ -72,7 +72,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The normal class type.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
index 8d39a10d8..c76c02648 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
@@ -95,7 +95,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The normal class type.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
index 619c91df9..b7e53026c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
@@ -74,7 +74,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The normal class type.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BeanInterceptor.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BeanInterceptor.java
index e09c3213f..67cfc4a44 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BeanInterceptor.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BeanInterceptor.java
@@ -57,7 +57,7 @@ package org.apache.juneau.swap;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The bean type.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/Builder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/Builder.java
index de69ec434..9f139c6e0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/Builder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/Builder.java
@@ -20,8 +20,8 @@ package org.apache.juneau.swap;
* <br>It's purpose is to identify a class as a builder when it's used on a constructor of the built class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.PojoBuilders">POJO Builders</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.PojoBuilders">POJO Builders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The type of objects that this builder creates.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
index 59377b1db..db0a93e57 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
@@ -22,8 +22,8 @@ import org.apache.juneau.reflect.*;
* Specialized transform for builder classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.JavaBeansSupport.jm.PojoBuilders">POJO Builders</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.PojoBuilders">POJO Builders</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The bean class.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/DefaultSwaps.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/DefaultSwaps.java
index c16582e3d..f00f24fe3 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/DefaultSwaps.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/DefaultSwaps.java
@@ -27,7 +27,7 @@ import org.apache.juneau.swaps.*;
* Maintain the list of default swaps used by all serializers and parsers.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class DefaultSwaps {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/FunctionalSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/FunctionalSwap.java
index ac357521e..6a4828c9b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/FunctionalSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/FunctionalSwap.java
@@ -28,7 +28,7 @@ import org.apache.juneau.utils.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The normal form of the class.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/MapSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/MapSwap.java
index 7d1691645..4e6d41cbb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/MapSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/MapSwap.java
@@ -40,7 +40,7 @@ import org.apache.juneau.collections.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The normal form of the class.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/ObjectSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/ObjectSwap.java
index 10c8355b1..a768f2c86 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/ObjectSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/ObjectSwap.java
@@ -89,7 +89,7 @@ import org.apache.juneau.serializer.*;
* The normal object representation of an object.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The normal form of the class.
@@ -151,7 +151,7 @@ public abstract class ObjectSwap<T,S> {
* This method is the programmatic equivalent to the {@link Swap#mediaTypes() @Swap(mediaTypes)} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
* </ul>
* @return The media types that this swap is applicable to, or <jk>null</jk> if it's applicable for all media types.
*/
@@ -172,7 +172,7 @@ public abstract class ObjectSwap<T,S> {
* This method is the programmatic equivalent to the {@link Swap#template() @Swap(template)} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.TemplatedSwaps">Templated Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.TemplatedSwaps">Templated Swaps</a>
* </ul>
*
* @return Additional context information, or <jk>null</jk> if not specified.
@@ -185,7 +185,7 @@ public abstract class ObjectSwap<T,S> {
* Sets the media types that this swap is associated with.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.PerMediaTypeSwaps">Per-media-type Swaps</a>
* </ul>
*
* @param mediaTypes The media types that this swap is associated with.
@@ -200,7 +200,7 @@ public abstract class ObjectSwap<T,S> {
* Sets the template string on this swap.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.TemplatedSwaps">Templated Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.TemplatedSwaps">Templated Swaps</a>
* </ul>
*
* @param template The template string on this swap.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/StringSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/StringSwap.java
index 67730bfd7..4aa225855 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/StringSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/StringSwap.java
@@ -39,7 +39,7 @@ import org.apache.juneau.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The normal form of the class.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/Surrogate.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/Surrogate.java
index a09688d0c..7ec49a276 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/Surrogate.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/Surrogate.java
@@ -81,8 +81,8 @@ import org.apache.juneau.annotation.*;
* </p>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps.jm.SurrogateClasses">Surrogate Classes</a>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.SurrogateClasses">Surrogate Classes</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public interface Surrogate {}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/SurrogateSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/SurrogateSwap.java
index 1d233c989..ccf02f24c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/SurrogateSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/SurrogateSwap.java
@@ -26,7 +26,7 @@ import org.apache.juneau.serializer.*;
* Specialized {@link ObjectSwap} for {@link Surrogate} classes.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The class type that this transform applies to.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/BeanStringSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/BeanStringSwap.java
index fdd55378f..1f890f6e6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/BeanStringSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/BeanStringSwap.java
@@ -26,10 +26,10 @@ import org.apache.juneau.swap.*;
* <p>
* This is usually a one-way transform.
* Beans serialized as strings cannot be reconstituted using a parser unless it is a
- * <a class="doclink" href="../../../../index.html#juneau-marshall.jm.PojoCategories">parsable POJO</a>.
+ * <a class="doclink" href="../../../../index.html#jm.PojoCategories">parsable POJO</a>.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*
* @param <T> The class type of the bean.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ByteArraySwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ByteArraySwap.java
index 430f74e3a..9e221148f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ByteArraySwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ByteArraySwap.java
@@ -21,7 +21,7 @@ import org.apache.juneau.swap.*;
* Transforms <code><jk>byte</jk>[]</code> arrays to Strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public abstract class ByteArraySwap extends StringSwap<byte[]> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ClassSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ClassSwap.java
index 3ded5da16..2a76e09eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ClassSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ClassSwap.java
@@ -19,7 +19,7 @@ import org.apache.juneau.swap.*;
* Transforms {@link Class} objects to and from {@link String Strings}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class ClassSwap extends StringSwap<Class<?>> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/DefaultingTemporalAccessor.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/DefaultingTemporalAccessor.java
index 05a296a06..b397b9588 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/DefaultingTemporalAccessor.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/DefaultingTemporalAccessor.java
@@ -27,7 +27,7 @@ import java.time.temporal.*;
* should be able to be passed to any <code>Temporal.from(TemporalAccessor)</code> static method (such as {@link ZonedDateTime#from(TemporalAccessor)}).
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class DefaultingTemporalAccessor implements TemporalAccessor {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/EnumerationSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/EnumerationSwap.java
index e98af7708..f4c5f9829 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/EnumerationSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/EnumerationSwap.java
@@ -24,7 +24,7 @@ import org.apache.juneau.swap.*;
* This is a one-way transform, since {@code Enumerations} cannot be reconstituted.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
@SuppressWarnings({"unchecked","rawtypes"})
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/InputStreamSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/InputStreamSwap.java
index 0d69f2b88..7eedf5d85 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/InputStreamSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/InputStreamSwap.java
@@ -24,7 +24,7 @@ import org.apache.juneau.swap.*;
* Transforms <code>InputStreams</code> to {@link String Strings}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public abstract class InputStreamSwap extends StringSwap<InputStream> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/IteratorSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/IteratorSwap.java
index dd804da7b..5948b465e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/IteratorSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/IteratorSwap.java
@@ -24,7 +24,7 @@ import org.apache.juneau.swap.*;
* This is a one-way transform, since {@code Iterators} cannot be reconstituted.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
@SuppressWarnings({"unchecked","rawtypes"})
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/LocaleSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/LocaleSwap.java
index 115f20ef4..b6e606c76 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/LocaleSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/LocaleSwap.java
@@ -21,7 +21,7 @@ import org.apache.juneau.swap.*;
* Transforms {@link Locale} objects to and from language tag {@link String Strings}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class LocaleSwap extends StringSwap<Locale> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
index 589941787..ef56f1974 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
@@ -27,7 +27,7 @@ import org.apache.juneau.swap.*;
* Entries in the list represent matched groups in a regular expression.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class MatchResultSwap extends ObjectSwap<MatchResult,List<String>> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ParsedReaderSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ParsedReaderSwap.java
index 3a197c838..39132ed83 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ParsedReaderSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ParsedReaderSwap.java
@@ -50,7 +50,7 @@ import org.apache.juneau.xml.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class ParsedReaderSwap extends ObjectSwap<Reader,Object> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ReaderSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ReaderSwap.java
index 975f84b70..22a736034 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ReaderSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ReaderSwap.java
@@ -23,7 +23,7 @@ import org.apache.juneau.swap.*;
* Transforms <code>Readers</code> to {@link String Strings}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class ReaderSwap extends StringSwap<Reader> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StackTraceElementSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StackTraceElementSwap.java
index d55276ca6..e156e3841 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StackTraceElementSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StackTraceElementSwap.java
@@ -25,7 +25,7 @@ import org.apache.juneau.swap.*;
* parse the resulting string back into a bean.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class StackTraceElementSwap extends ObjectSwap<StackTraceElement,String> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StringFormatSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StringFormatSwap.java
index 50b45294a..69df39be1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StringFormatSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/StringFormatSwap.java
@@ -20,7 +20,7 @@ import org.apache.juneau.swap.*;
* Built-in object swap implementation class for the {@link Beanp#format() @Beanp(format)} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class StringFormatSwap extends StringSwap<Object> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalCalendarSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalCalendarSwap.java
index 9598228c2..84edc510a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalCalendarSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalCalendarSwap.java
@@ -28,7 +28,7 @@ import org.apache.juneau.swap.*;
* Uses the {@link DateTimeFormatter} class for converting {@link Calendar} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class TemporalCalendarSwap extends StringSwap<Calendar> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalDateSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalDateSwap.java
index 9cbf414d6..6f3adf34c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalDateSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalDateSwap.java
@@ -28,7 +28,7 @@ import org.apache.juneau.swap.*;
* Uses the {@link DateTimeFormatter} class for converting {@link Date} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class TemporalDateSwap extends StringSwap<Date> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalSwap.java
index 6232262ee..b15417896 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TemporalSwap.java
@@ -50,7 +50,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class TemporalSwap extends StringSwap<Temporal> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TimeZoneSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TimeZoneSwap.java
index 3ade11144..4c6f2ce10 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TimeZoneSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/TimeZoneSwap.java
@@ -21,7 +21,7 @@ import org.apache.juneau.swap.*;
* Transforms {@link TimeZone} objects to and from {@link String Strings}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class TimeZoneSwap extends StringSwap<TimeZone> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/XMLGregorianCalendarSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/XMLGregorianCalendarSwap.java
index 7ccbb1e8a..62179a990 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/XMLGregorianCalendarSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/XMLGregorianCalendarSwap.java
@@ -30,7 +30,7 @@ import org.apache.juneau.swap.*;
* Strings are converted to objects using {@link DatatypeFactory#newXMLGregorianCalendar(String)}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class XMLGregorianCalendarSwap extends StringSwap<XMLGregorianCalendar> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ZoneIdSwap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ZoneIdSwap.java
index 8ff04d4a5..95b622a52 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ZoneIdSwap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/ZoneIdSwap.java
@@ -21,7 +21,7 @@ import org.apache.juneau.swap.*;
* Transforms {@link ZoneId} objects to and from {@link String Strings}.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.Swaps">Swaps</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.Swaps">Swaps</a>
* </ul>
*/
public class ZoneIdSwap extends StringSwap<ZoneId> {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/ParamFormat.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/ParamFormat.java
index 3b5ef9724..fdd677f48 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/ParamFormat.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/ParamFormat.java
@@ -16,7 +16,7 @@ package org.apache.juneau.uon;
* Identifies the possible values for the {@link UonSerializer.Builder#paramFormat(ParamFormat)} setting.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public enum ParamFormat {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonBeanPropertyMeta.java
index b2d8ae738..9149c7b87 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonBeanPropertyMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.uon.annotation.*;
* annotation on the bean property.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public final class UonBeanPropertyMeta extends ExtendedBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonClassMeta.java
index 1137a4eea..e4cc93743 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonClassMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.uon.annotation.*;
* the class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public class UonClassMeta extends ExtendedClassMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonMetaProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonMetaProvider.java
index 8006a36ac..942b9d927 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonMetaProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonMetaProvider.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Interface for providing access to {@link UonClassMeta} and {@link UonBeanPropertyMeta} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public interface UonMetaProvider extends AnnotationProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 5b84710f6..f4556d13c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -42,7 +42,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public class UonParser extends ReaderParser implements HttpPartParser, UonMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index e72470c52..118ee3162 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -38,7 +38,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
index 036a3e13d..710801a94 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonReader.java
@@ -30,7 +30,7 @@ import org.apache.juneau.parser.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public final class UonReader extends ParserReader {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index 2cfe30626..17ded2f0e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -128,7 +128,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public class UonSerializer extends WriterSerializer implements HttpPartSerializer, UonMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index 443e5bb6d..7f6019f57 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -37,7 +37,7 @@ import org.apache.juneau.swap.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public class UonSerializerSession extends WriterSerializerSession implements HttpPartSerializerSession {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
index 9bbdb7ceb..c1709c2df 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonUtils.java
@@ -20,7 +20,7 @@ import org.apache.juneau.common.internal.*;
* Utility methods for the UON and UrlEncoding serializers and parsers.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public final class UonUtils {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
index 95369dc52..6a89c4acb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonWriter.java
@@ -27,7 +27,7 @@ import org.apache.juneau.serializer.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public final class UonWriter extends SerializerWriter {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/Uon.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/Uon.java
index 0fbeb0424..0f2a3391a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/Uon.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/Uon.java
@@ -31,7 +31,7 @@ import org.apache.juneau.uon.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
@Documented
@Target({TYPE,FIELD,METHOD})
@@ -121,7 +121,7 @@ public @interface Uon {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -135,7 +135,7 @@ public @interface Uon {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
index a5b62aafc..9fe91a843 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link Uon @Uon} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public class UonAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
index 7f1a2fc6e..cb8f226ee 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
@@ -29,7 +29,7 @@ import org.apache.juneau.urlencoding.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -70,7 +70,7 @@ public @interface UonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -95,7 +95,7 @@ public @interface UonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
* <ul class='seealso'>
@@ -128,7 +128,7 @@ public @interface UonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -157,7 +157,7 @@ public @interface UonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -181,7 +181,7 @@ public @interface UonConfig {
*
* <ul class='notes'>
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
index 00ec55efd..688a2000e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.uon.*;
* Utility classes and methods for the {@link UonConfig @UonConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.UonDetails">UON Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.UonDetails">UON Details</a>
* </ul>
*/
public class UonConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingBeanPropertyMeta.java
index 63a87c8a2..30909816e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingBeanPropertyMeta.java
@@ -20,7 +20,7 @@ import org.apache.juneau.urlencoding.annotation.*;
* annotation on the bean property.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
public final class UrlEncodingBeanPropertyMeta extends ExtendedBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
index c28ca5eea..ba3745e9f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
@@ -19,7 +19,7 @@ import org.apache.juneau.urlencoding.annotation.*;
* Metadata on classes specific to the URL-Encoding serializers and parsers pulled from the {@link UrlEncoding @UrlEncoding} annotation on the class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
public class UrlEncodingClassMeta extends ExtendedClassMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingMetaProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingMetaProvider.java
index c19130ce0..2f342db86 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingMetaProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingMetaProvider.java
@@ -18,7 +18,7 @@ import org.apache.juneau.*;
* Interface for providing access to {@link UrlEncodingClassMeta} and {@link UrlEncodingBeanPropertyMeta} objects.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
public interface UrlEncodingMetaProvider extends AnnotationProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 39daebace..4526ece5d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -47,7 +47,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
public class UrlEncodingParser extends UonParser implements UrlEncodingMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index 84b17a521..2bd26558e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -36,7 +36,7 @@ import org.apache.juneau.uon.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index 9e2b11bae..02d336c79 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -124,7 +124,7 @@ import org.apache.juneau.utils.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
public class UrlEncodingSerializer extends UonSerializer implements UrlEncodingMetaProvider {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index 049cb39c8..c39da8770 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -37,7 +37,7 @@ import org.apache.juneau.uon.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncoding.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncoding.java
index 86474f930..9f10c82a9 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncoding.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncoding.java
@@ -32,7 +32,7 @@ import org.apache.juneau.urlencoding.*;
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
@Documented
@@ -134,7 +134,7 @@ public @interface UrlEncoding {
* </ul>
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
@@ -148,7 +148,7 @@ public @interface UrlEncoding {
* Identical to {@link #on()} except allows you to specify class objects instead of a strings.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.DynamicallyAppliedAnnotations">Dynamically Applied Annotations</a>
* </ul>
*
* @return The annotation value.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
index ca9f451a4..733f695c8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.juneau.svl.*;
* Utility classes and methods for the {@link UrlEncoding @UrlEncoding} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
public class UrlEncodingAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
index 15c905113..cd15746ec 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
@@ -27,7 +27,7 @@ import org.apache.juneau.urlencoding.*;
* Used primarily for specifying bean configuration properties on REST classes and methods.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
@Target({TYPE,METHOD})
@@ -77,7 +77,7 @@ public @interface UrlEncodingConfig {
* <li class='note'>
* This option only applies to beans.
* <li class='note'>
- * Supports <a class="doclink" href="../../../../../index.html#juneau-marshall.jm.SimpleVariableLanguage.jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
+ * Supports <a class="doclink" href="../../../../../index.html#jm.DefaultVarResolver">VarResolver.DEFAULT</a> (e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
*
* <ul class='seealso'>
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
index 3d8e4eb5d..5b7e4f9df 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
@@ -21,7 +21,7 @@ import org.apache.juneau.urlencoding.*;
* Utility classes and methods for the {@link UrlEncodingConfig @UrlEncodingConfig} annotation.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../../index.html#juneau-marshall.jm.UrlEncodingDetails">URL-Encoding Details</a>
+ * <li class='link'><a class="doclink" href="../../../../../index.html#jm.UrlEncodingDetails">URL-Encoding Details</a>
* </ul>
*/
public class UrlEncodingConfigAnnotation {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
index 1310230d9..e05a5088f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/Namespace.java
@@ -28,7 +28,7 @@ import org.apache.juneau.common.internal.*;
* in the serializer.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.XmlDetails">XML Details</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.XmlDetails">XML Details</a>
* </ul>
*/
@Bean(sort=true)
public final class Namespace {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
index f863dc7bd..204a17b7b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanMeta.java
@@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*;
* class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.XmlDetails">XML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.XmlDetails">XML Details</a>
* </ul>
*/
public class XmlBeanMeta extends ExtendedBeanMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
index c24321d6c..10ee3bd33 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
@@ -22,7 +22,7 @@ import org.apache.juneau.xml.annotation.*;
* on the bean property.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.XmlDetails">XML Details</a>
* </ul>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.XmlDetails">XML Details</a>
* </ul>
*/
public class XmlBeanPropertyMeta extends ExtendedBeanPropertyMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
index b1ad10d5a..dcaca387f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
@@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*;
* class.
*
* <ul class='seealso'>
- * <li class='link'><a class="doclink" href="../../../../index.html#juneau-marshall.jm.XmlDetails">XML Details</a>
+ * <li class='link'><a class="doclink" href="../../../../index.html#jm.XmlDetails">XML Details</a>
* </ul>
*/
public class XmlClassMeta extends ExtendedClassMeta {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
index b8ef556f5..9cac9e100 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
... 11937 lines suppressed ...