You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gi...@apache.org on 2024/04/27 15:25:41 UTC

(jspwiki-site) branch asf-site updated: Automatic Site Publish by Buildbot

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

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new b5ea8a4e28 Automatic Site Publish by Buildbot
b5ea8a4e28 is described below

commit b5ea8a4e289814b459b6e5062cdee51d31bb6dbf
Author: jenkins <bu...@apache.org>
AuthorDate: Sat Apr 27 15:25:35 2024 +0000

    Automatic Site Publish by Buildbot
---
 apidocs/2.12.2-SNAPSHOT/constant-values.html       |    4 +-
 apidocs/2.12.2-SNAPSHOT/index-all.html             |   11 +-
 apidocs/2.12.2-SNAPSHOT/member-search-index.js     |    2 +-
 apidocs/2.12.2-SNAPSHOT/member-search-index.zip    |  Bin 46608 -> 46642 bytes
 .../org/apache/wiki/InternalWikiException.svg      |    4 +-
 .../org/apache/wiki/LinkCollector.svg              |    4 +-
 .../org/apache/wiki/StringTransmutator.svg         |    4 +-
 .../org/apache/wiki/TranslationsCheck.svg          |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/WatchDog.svg   |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/Watchable.svg  |    4 +-
 .../org/apache/wiki/WikiBackgroundThread.svg       |    4 +-
 .../org/apache/wiki/WikiContext.svg                |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/WikiEngine.svg |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/WikiPage.svg   |    4 +-
 .../org/apache/wiki/WikiProvider.svg               |    4 +-
 .../org/apache/wiki/WikiServlet.svg                |    4 +-
 .../org/apache/wiki/WikiSession.svg                |    4 +-
 .../org/apache/wiki/ajax/AjaxUtil.svg              |    4 +-
 .../apache/wiki/ajax/WikiAjaxDispatcherServlet.svg |    4 +-
 .../org/apache/wiki/ajax/WikiAjaxServlet.svg       |    4 +-
 .../org/apache/wiki/ajax/package.svg               |   30 +-
 .../org/apache/wiki/api/Release.svg                |    4 +-
 .../org/apache/wiki/api/core/Acl.svg               |    4 +-
 .../org/apache/wiki/api/core/AclEntry.svg          |    4 +-
 .../org/apache/wiki/api/core/Attachment.svg        |    4 +-
 .../org/apache/wiki/api/core/Command.svg           |    4 +-
 .../org/apache/wiki/api/core/Context.svg           |    4 +-
 .../org/apache/wiki/api/core/ContextEnum.svg       |    4 +-
 .../org/apache/wiki/api/core/Engine.svg            |    4 +-
 .../org/apache/wiki/api/core/Page.svg              |    4 +-
 .../org/apache/wiki/api/core/Session.svg           |    4 +-
 .../org/apache/wiki/api/core/package.svg           |  320 ++--
 .../wiki/api/engine/EngineLifecycleExtension.svg   |    4 +-
 .../org/apache/wiki/api/engine/Initializable.svg   |    4 +-
 .../org/apache/wiki/api/engine/RenderApi.svg       |    4 +-
 .../org/apache/wiki/api/engine/package.svg         |   24 +-
 .../wiki/api/events/CustomWikiEventListener.svg    |    4 +-
 .../org/apache/wiki/api/events/package.svg         |    4 +-
 .../apache/wiki/api/exceptions/FilterException.svg |    4 +-
 .../api/exceptions/NoRequiredPropertyException.svg |    4 +-
 .../api/exceptions/NoSuchVariableException.svg     |    4 +-
 .../apache/wiki/api/exceptions/PluginException.svg |    4 +-
 .../wiki/api/exceptions/ProviderException.svg      |    4 +-
 .../wiki/api/exceptions/RedirectException.svg      |    4 +-
 .../apache/wiki/api/exceptions/WikiException.svg   |    4 +-
 .../wiki/api/exceptions/WikiI18nException.svg      |    4 +-
 .../org/apache/wiki/api/exceptions/package.svg     |   84 +-
 .../org/apache/wiki/api/filters/BasePageFilter.svg |    4 +-
 .../apache/wiki/api/filters/BasicPageFilter.svg    |    4 +-
 .../org/apache/wiki/api/filters/PageFilter.svg     |    4 +-
 .../org/apache/wiki/api/filters/package.svg        |   24 +-
 .../org/apache/wiki/api/package.svg                |    4 +-
 .../apache/wiki/api/plugin/InitializablePlugin.svg |    4 +-
 .../apache/wiki/api/plugin/ParserStagePlugin.svg   |    4 +-
 .../org/apache/wiki/api/plugin/Plugin.svg          |    4 +-
 .../org/apache/wiki/api/plugin/PluginElement.svg   |    4 +-
 .../org/apache/wiki/api/plugin/WikiPlugin.svg      |    4 +-
 .../org/apache/wiki/api/plugin/package.svg         |   40 +-
 .../wiki/api/providers/AttachmentProvider.svg      |    4 +-
 .../org/apache/wiki/api/providers/PageProvider.svg |    4 +-
 .../org/apache/wiki/api/providers/WikiProvider.svg |    4 +-
 .../org/apache/wiki/api/providers/package.svg      |   46 +-
 .../org/apache/wiki/api/search/QueryItem.svg       |    4 +-
 .../org/apache/wiki/api/search/SearchResult.svg    |    4 +-
 .../org/apache/wiki/api/search/package.svg         |   22 +-
 .../org/apache/wiki/api/spi/AclsDSL.svg            |    4 +-
 .../org/apache/wiki/api/spi/AclsSPI.svg            |    4 +-
 .../org/apache/wiki/api/spi/ContentsDSL.svg        |    4 +-
 .../org/apache/wiki/api/spi/ContentsSPI.svg        |    4 +-
 .../org/apache/wiki/api/spi/ContextDSL.svg         |    4 +-
 .../org/apache/wiki/api/spi/ContextSPI.svg         |    4 +-
 .../org/apache/wiki/api/spi/EngineDSL.svg          |    4 +-
 .../org/apache/wiki/api/spi/EngineSPI.svg          |    4 +-
 .../org/apache/wiki/api/spi/SessionDSL.svg         |    4 +-
 .../org/apache/wiki/api/spi/SessionSPI.svg         |    4 +-
 .../org/apache/wiki/api/spi/Wiki.svg               |    4 +-
 .../org/apache/wiki/api/spi/package.svg            |  102 +-
 .../org/apache/wiki/attachment/Attachment.svg      |    4 +-
 .../apache/wiki/attachment/AttachmentManager.svg   |    4 +-
 .../apache/wiki/attachment/AttachmentServlet.svg   |    4 +-
 .../wiki/attachment/DefaultAttachmentManager.svg   |    4 +-
 .../apache/wiki/attachment/DynamicAttachment.svg   |    4 +-
 .../wiki/attachment/DynamicAttachmentProvider.svg  |    4 +-
 .../org/apache/wiki/attachment/package.svg         |   86 +-
 .../org/apache/wiki/auth/AuthenticationManager.svg |    4 +-
 .../org/apache/wiki/auth/AuthorizationManager.svg  |    4 +-
 .../org/apache/wiki/auth/Authorizer.svg            |    4 +-
 .../wiki/auth/DefaultAuthenticationManager.svg     |    4 +-
 .../wiki/auth/DefaultAuthorizationManager.svg      |    4 +-
 .../auth/DefaultUserManager.JSONUserModule.svg     |    4 +-
 .../org/apache/wiki/auth/DefaultUserManager.svg    |    4 +-
 .../org/apache/wiki/auth/GroupPrincipal.svg        |    4 +-
 .../apache/wiki/auth/NoSuchPrincipalException.svg  |    4 +-
 .../org/apache/wiki/auth/SecurityVerifier.svg      |    4 +-
 .../org/apache/wiki/auth/SessionMonitor.svg        |    4 +-
 .../org/apache/wiki/auth/UserManager.svg           |    4 +-
 .../org/apache/wiki/auth/WikiPrincipal.svg         |    4 +-
 .../org/apache/wiki/auth/WikiSecurityException.svg |    4 +-
 .../org/apache/wiki/auth/acl/Acl.svg               |    4 +-
 .../org/apache/wiki/auth/acl/AclEntry.svg          |    4 +-
 .../org/apache/wiki/auth/acl/AclEntryImpl.svg      |    4 +-
 .../org/apache/wiki/auth/acl/AclImpl.svg           |    4 +-
 .../org/apache/wiki/auth/acl/AclManager.svg        |    4 +-
 .../org/apache/wiki/auth/acl/DefaultAclManager.svg |    4 +-
 .../apache/wiki/auth/acl/UnresolvedPrincipal.svg   |    4 +-
 .../org/apache/wiki/auth/acl/package.svg           |  126 +-
 .../wiki/auth/authorize/DefaultGroupManager.svg    |    4 +-
 .../org/apache/wiki/auth/authorize/Group.svg       |    4 +-
 .../apache/wiki/auth/authorize/GroupDatabase.svg   |    4 +-
 .../apache/wiki/auth/authorize/GroupManager.svg    |    4 +-
 .../wiki/auth/authorize/JDBCGroupDatabase.svg      |    4 +-
 .../org/apache/wiki/auth/authorize/Role.svg        |    4 +-
 .../apache/wiki/auth/authorize/WebAuthorizer.svg   |    4 +-
 .../WebContainerAuthorizer.LocalEntityResolver.svg |    4 +-
 .../wiki/auth/authorize/WebContainerAuthorizer.svg |    4 +-
 .../wiki/auth/authorize/XMLGroupDatabase.svg       |    4 +-
 .../org/apache/wiki/auth/authorize/package.svg     |  242 +--
 .../apache/wiki/auth/login/AbstractLoginModule.svg |    4 +-
 .../wiki/auth/login/AnonymousLoginModule.svg       |    4 +-
 .../apache/wiki/auth/login/AuthorizerCallback.svg  |    4 +-
 .../wiki/auth/login/CookieAssertionLoginModule.svg |    4 +-
 .../auth/login/CookieAuthenticationLoginModule.svg |    4 +-
 .../apache/wiki/auth/login/HttpRequestCallback.svg |    4 +-
 .../apache/wiki/auth/login/PrincipalWrapper.svg    |    4 +-
 .../wiki/auth/login/UserDatabaseCallback.svg       |    4 +-
 .../wiki/auth/login/UserDatabaseLoginModule.svg    |    4 +-
 .../auth/login/WebContainerCallbackHandler.svg     |    4 +-
 .../wiki/auth/login/WebContainerLoginModule.svg    |    4 +-
 .../apache/wiki/auth/login/WikiCallbackHandler.svg |    4 +-
 .../apache/wiki/auth/login/WikiEngineCallback.svg  |    4 +-
 .../org/apache/wiki/auth/login/package.svg         |  170 +-
 .../org/apache/wiki/auth/package.svg               |  350 ++---
 .../apache/wiki/auth/permissions/AllPermission.svg |    4 +-
 .../auth/permissions/AllPermissionCollection.svg   |    4 +-
 .../wiki/auth/permissions/GroupPermission.svg      |    4 +-
 .../wiki/auth/permissions/PagePermission.svg       |    4 +-
 .../wiki/auth/permissions/PermissionFactory.svg    |    4 +-
 .../wiki/auth/permissions/WikiPermission.svg       |    4 +-
 .../org/apache/wiki/auth/permissions/package.svg   |  130 +-
 .../apache/wiki/auth/user/AbstractUserDatabase.svg |    4 +-
 .../apache/wiki/auth/user/DefaultUserProfile.svg   |    4 +-
 .../apache/wiki/auth/user/DummyUserDatabase.svg    |    4 +-
 .../wiki/auth/user/DuplicateUserException.svg      |    4 +-
 .../org/apache/wiki/auth/user/JDBCUserDatabase.svg |    4 +-
 .../org/apache/wiki/auth/user/UserDatabase.svg     |    4 +-
 .../org/apache/wiki/auth/user/UserProfile.svg      |    4 +-
 .../org/apache/wiki/auth/user/XMLUserDatabase.svg  |    4 +-
 .../org/apache/wiki/auth/user/package.svg          |  224 +--
 .../WikiBootstrapServletContextListener.svg        |    4 +-
 .../org/apache/wiki/bootstrap/package.svg          |    4 +-
 .../org/apache/wiki/cache/CacheInfo.svg            |    4 +-
 .../org/apache/wiki/cache/CachingManager.svg       |    4 +-
 .../apache/wiki/cache/EhcacheCachingManager.svg    |    4 +-
 .../org/apache/wiki/cache/package.svg              |   40 +-
 .../org/apache/wiki/content/DefaultPageRenamer.svg |    4 +-
 .../org/apache/wiki/content/PageRenamer.svg        |    4 +-
 .../org/apache/wiki/content/package.svg            |   22 +-
 .../apache/wiki/diff/ContextualDiffProvider.svg    |    4 +-
 .../apache/wiki/diff/DefaultDifferenceManager.svg  |    4 +-
 .../wiki/diff/DiffProvider.NullDiffProvider.svg    |    4 +-
 .../org/apache/wiki/diff/DiffProvider.svg          |    4 +-
 .../org/apache/wiki/diff/DifferenceManager.svg     |    4 +-
 .../org/apache/wiki/diff/ExternalDiffProvider.svg  |    4 +-
 .../apache/wiki/diff/TraditionalDiffProvider.svg   |    4 +-
 .../org/apache/wiki/diff/package.svg               |   64 +-
 .../org/apache/wiki/event/WikiEngineEvent.svg      |    4 +-
 .../org/apache/wiki/event/WikiEvent.svg            |    4 +-
 .../org/apache/wiki/event/WikiEventEmitter.svg     |    4 +-
 .../org/apache/wiki/event/WikiEventListener.svg    |    4 +-
 .../org/apache/wiki/event/WikiEventManager.svg     |    4 +-
 .../org/apache/wiki/event/WikiPageEvent.svg        |    4 +-
 .../org/apache/wiki/event/WikiPageRenameEvent.svg  |    4 +-
 .../org/apache/wiki/event/WikiSecurityEvent.svg    |    4 +-
 .../org/apache/wiki/event/WorkflowEvent.svg        |    4 +-
 .../org/apache/wiki/event/package.svg              |  152 +-
 .../org/apache/wiki/filters/CreoleFilter.svg       |    4 +-
 .../apache/wiki/filters/DefaultFilterManager.svg   |    4 +-
 .../org/apache/wiki/filters/FilterManager.svg      |    4 +-
 .../org/apache/wiki/filters/PageEventFilter.svg    |    4 +-
 .../apache/wiki/filters/PingWeblogsComFilter.svg   |    4 +-
 .../org/apache/wiki/filters/ProfanityFilter.svg    |    4 +-
 .../org/apache/wiki/filters/SpamFilter.svg         |    4 +-
 .../org/apache/wiki/filters/package.svg            |  122 +-
 .../org/apache/wiki/forms/FormClose.svg            |    4 +-
 .../org/apache/wiki/forms/FormElement.svg          |    4 +-
 .../org/apache/wiki/forms/FormHandler.svg          |    4 +-
 .../org/apache/wiki/forms/FormInfo.svg             |    4 +-
 .../org/apache/wiki/forms/FormInput.svg            |    4 +-
 .../org/apache/wiki/forms/FormOpen.svg             |    4 +-
 .../org/apache/wiki/forms/FormOutput.svg           |    4 +-
 .../org/apache/wiki/forms/FormSelect.svg           |    4 +-
 .../org/apache/wiki/forms/FormSet.svg              |    4 +-
 .../org/apache/wiki/forms/FormTextarea.svg         |    4 +-
 .../org/apache/wiki/forms/package.svg              |   86 +-
 .../wiki/htmltowiki/HtmlStringToWikiTranslator.svg |    4 +-
 .../org/apache/wiki/htmltowiki/SyntaxDecorator.svg |    4 +-
 .../wiki/htmltowiki/WhitespaceTrimWriter.svg       |    4 +-
 ...lementToWikiTranslator.ElementDecoratorData.svg |    4 +-
 .../htmltowiki/XHtmlElementToWikiTranslator.svg    |    4 +-
 .../apache/wiki/htmltowiki/XHtmlToWikiConfig.svg   |    4 +-
 .../org/apache/wiki/htmltowiki/package.svg         |  104 +-
 .../apache/wiki/htmltowiki/syntax/ADecorator.svg   |    4 +-
 .../apache/wiki/htmltowiki/syntax/BrDecorator.svg  |    4 +-
 .../wiki/htmltowiki/syntax/CodeDecorator.svg       |    4 +-
 .../apache/wiki/htmltowiki/syntax/DdDecorator.svg  |    4 +-
 .../apache/wiki/htmltowiki/syntax/DlDecorator.svg  |    4 +-
 .../apache/wiki/htmltowiki/syntax/DtDecorator.svg  |    4 +-
 .../wiki/htmltowiki/syntax/FormDecorator.svg       |    4 +-
 .../apache/wiki/htmltowiki/syntax/H1Decorator.svg  |    4 +-
 .../apache/wiki/htmltowiki/syntax/H2Decorator.svg  |    4 +-
 .../apache/wiki/htmltowiki/syntax/H3Decorator.svg  |    4 +-
 .../apache/wiki/htmltowiki/syntax/H4Decorator.svg  |    4 +-
 .../apache/wiki/htmltowiki/syntax/HrDecorator.svg  |    4 +-
 .../wiki/htmltowiki/syntax/ImageDecorator.svg      |    4 +-
 .../wiki/htmltowiki/syntax/InputDecorator.svg      |    4 +-
 .../apache/wiki/htmltowiki/syntax/LiDecorator.svg  |    4 +-
 .../apache/wiki/htmltowiki/syntax/MarkupHelper.svg |    4 +-
 .../apache/wiki/htmltowiki/syntax/OlDecorator.svg  |    4 +-
 .../wiki/htmltowiki/syntax/OptionDecorator.svg     |    4 +-
 .../apache/wiki/htmltowiki/syntax/PDecorator.svg   |    4 +-
 .../htmltowiki/syntax/PlainTextBoldDecorator.svg   |    4 +-
 .../htmltowiki/syntax/PlainTextCssDecorator.svg    |    4 +-
 .../syntax/PlainTextCssSpecialDecorator.svg        |    4 +-
 .../wiki/htmltowiki/syntax/PlainTextDecorator.svg  |    4 +-
 .../htmltowiki/syntax/PlainTextItalicDecorator.svg |    4 +-
 .../syntax/PlainTextMonospaceDecorator.svg         |    4 +-
 .../wiki/htmltowiki/syntax/SelectDecorator.svg     |    4 +-
 .../wiki/htmltowiki/syntax/StrikeDecorator.svg     |    4 +-
 .../apache/wiki/htmltowiki/syntax/SubDecorator.svg |    4 +-
 .../apache/wiki/htmltowiki/syntax/SupDecorator.svg |    4 +-
 .../wiki/htmltowiki/syntax/TableDecorator.svg      |    4 +-
 .../wiki/htmltowiki/syntax/TbodyDecorator.svg      |    4 +-
 .../apache/wiki/htmltowiki/syntax/TdDecorator.svg  |    4 +-
 .../wiki/htmltowiki/syntax/TextAreaDecorator.svg   |    4 +-
 .../htmltowiki/syntax/TextElementDecorator.svg     |    4 +-
 .../apache/wiki/htmltowiki/syntax/ThDecorator.svg  |    4 +-
 .../wiki/htmltowiki/syntax/TheadDecorator.svg      |    4 +-
 .../apache/wiki/htmltowiki/syntax/TrDecorator.svg  |    4 +-
 .../apache/wiki/htmltowiki/syntax/UlDecorator.svg  |    4 +-
 .../wiki/htmltowiki/syntax/UnderlineDecorator.svg  |    4 +-
 .../wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg |    4 +-
 .../syntax/jspwiki/JSPWikiSyntaxDecorator.svg      |    4 +-
 .../wiki/htmltowiki/syntax/jspwiki/package.svg     |    4 +-
 .../syntax/markdown/MarkdownSyntaxDecorator.svg    |    4 +-
 .../wiki/htmltowiki/syntax/markdown/package.svg    |    4 +-
 .../org/apache/wiki/htmltowiki/syntax/package.svg  |  520 +++---
 .../wiki/http/filter/CsrfProtectionFilter.svg      |    4 +-
 .../org/apache/wiki/http/filter/package.svg        |    4 +-
 .../i18n/DefaultInternationalizationManager.svg    |    4 +-
 .../wiki/i18n/InternationalizationManager.svg      |    4 +-
 .../org/apache/wiki/i18n/package.svg               |    4 +-
 .../org/apache/wiki/its/AnonymousViewIT.svg        |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/its/EditIT.svg |    4 +-
 .../org/apache/wiki/its/LoginIT.svg                |    4 +-
 .../org/apache/wiki/its/SearchIT.svg               |    4 +-
 .../apache/wiki/its/WithIntegrationTestSetup.svg   |    4 +-
 .../org/apache/wiki/its/environment/Env.svg        |    4 +-
 .../org/apache/wiki/its/environment/package.svg    |    4 +-
 .../org/apache/wiki/its/package.svg                |   36 +-
 .../org/apache/wiki/management/SimpleMBean.svg     |    4 +-
 .../org/apache/wiki/management/package.svg         |    4 +-
 .../wiki/markdown/MarkdownForJSPWikiExtension.svg  |    4 +-
 .../MarkdownSetupEngineLifecycleExtension.svg      |    4 +-
 .../ExternalLinkAttributeProviderState.svg         |    4 +-
 .../ImageLinkAttributeProviderState.svg            |    4 +-
 .../InterWikiLinkAttributeProviderState.svg        |    4 +-
 .../JSPWikiLinkAttributeProvider.svg               |    4 +-
 .../JSPWikiLinkAttributeProviderFactory.svg        |    4 +-
 .../LocalEditLinkAttributeProviderState.svg        |    4 +-
 .../LocalFootnoteLinkAttributeProviderState.svg    |    4 +-
 .../LocalFootnoteRefLinkAttributeProviderState.svg |    4 +-
 .../LocalLinkAttributeProviderState.svg            |    4 +-
 .../LocalReadLinkAttributeProviderState.svg        |    4 +-
 .../NodeAttributeProviderState.svg                 |    4 +-
 .../WysiwygEditingAttributeProviderState.svg       |    4 +-
 .../jspwikilinks/attributeprovider/package.svg     |  132 +-
 .../AccessRuleLinkNodePostProcessorState.svg       |    4 +-
 .../ExternalLinkNodePostProcessorState.svg         |    4 +-
 .../ImageLinkNodePostProcessorState.svg            |    4 +-
 .../InterWikiLinkNodePostProcessorState.svg        |    4 +-
 .../postprocessor/JSPWikiLinkNodePostProcessor.svg |    4 +-
 .../JSPWikiNodePostProcessorFactory.svg            |    4 +-
 .../LocalFootnoteLinkNodePostProcessorState.svg    |    4 +-
 .../LocalFootnoteRefLinkNodePostProcessorState.svg |    4 +-
 .../LocalLinkNodePostProcessorState.svg            |    4 +-
 .../MetadataLinkNodePostProcessorState.svg         |    4 +-
 .../postprocessor/NodePostProcessorState.svg       |    4 +-
 .../PluginLinkNodePostProcessorState.svg           |    4 +-
 .../VariableLinkNodePostProcessorState.svg         |    4 +-
 .../jspwikilinks/postprocessor/package.svg         |  138 +-
 .../org/apache/wiki/markdown/nodes/JSPWikiLink.svg |    4 +-
 .../org/apache/wiki/markdown/nodes/package.svg     |    4 +-
 .../org/apache/wiki/markdown/package.svg           |    4 +-
 .../wiki/markdown/renderer/JSPWikiLinkRenderer.svg |    4 +-
 .../renderer/JSPWikiNodeRendererFactory.svg        |    4 +-
 .../org/apache/wiki/markdown/renderer/package.svg  |   36 +-
 .../org/apache/wiki/modules/BaseModuleManager.svg  |    4 +-
 .../org/apache/wiki/modules/InternalModule.svg     |    4 +-
 .../org/apache/wiki/modules/ModuleManager.svg      |    4 +-
 .../org/apache/wiki/modules/WikiModuleInfo.svg     |    4 +-
 .../org/apache/wiki/modules/package.svg            |   40 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/package.svg    |  416 ++---
 .../org/apache/wiki/pages/DefaultPageManager.svg   |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/pages/Page.svg |    4 +-
 .../org/apache/wiki/pages/PageBuilder.svg          |    4 +-
 .../org/apache/wiki/pages/PageLock.svg             |    4 +-
 .../org/apache/wiki/pages/PageManager.svg          |    4 +-
 .../org/apache/wiki/pages/PageSorter.svg           |    4 +-
 .../org/apache/wiki/pages/PageTimeComparator.svg   |    4 +-
 .../org/apache/wiki/pages/haddock/EditWikiPage.svg |    4 +-
 .../org/apache/wiki/pages/haddock/HaddockPage.svg  |    4 +-
 .../org/apache/wiki/pages/haddock/LoginPage.svg    |    4 +-
 .../wiki/pages/haddock/SearchResultsPage.svg       |    4 +-
 .../org/apache/wiki/pages/haddock/ViewWikiPage.svg |    4 +-
 .../org/apache/wiki/pages/haddock/package.svg      |   76 +-
 .../org/apache/wiki/pages/package.svg              |   78 +-
 .../wiki/parser/CreoleToJSPWikiTranslator.svg      |    4 +-
 .../org/apache/wiki/parser/Heading.svg             |    4 +-
 .../org/apache/wiki/parser/HeadingListener.svg     |    4 +-
 .../org/apache/wiki/parser/JSPWikiMarkupParser.svg |    4 +-
 .../org/apache/wiki/parser/LinkParser.Link.svg     |    4 +-
 .../org/apache/wiki/parser/LinkParser.svg          |    4 +-
 .../apache/wiki/parser/LinkParsingOperations.svg   |    4 +-
 .../org/apache/wiki/parser/MarkupParser.svg        |    4 +-
 .../org/apache/wiki/parser/ParseException.svg      |    4 +-
 .../org/apache/wiki/parser/PluginContent.svg       |    4 +-
 .../org/apache/wiki/parser/VariableContent.svg     |    4 +-
 .../org/apache/wiki/parser/WikiDocument.svg        |    4 +-
 .../wiki/parser/markdown/MarkdownDocument.svg      |    4 +-
 .../apache/wiki/parser/markdown/MarkdownParser.svg |    4 +-
 .../org/apache/wiki/parser/markdown/package.svg    |    4 +-
 .../org/apache/wiki/parser/package.svg             |  264 ++--
 .../apache/wiki/plugin/AbstractReferralPlugin.svg  |    4 +-
 .../org/apache/wiki/plugin/BugReportHandler.svg    |    4 +-
 .../org/apache/wiki/plugin/Counter.svg             |    4 +-
 .../org/apache/wiki/plugin/CurrentTimePlugin.svg   |    4 +-
 .../plugin/DefaultPluginManager.WikiPluginInfo.svg |    4 +-
 .../apache/wiki/plugin/DefaultPluginManager.svg    |    4 +-
 .../org/apache/wiki/plugin/Denounce.svg            |    4 +-
 .../org/apache/wiki/plugin/Groups.svg              |    4 +-
 .../org/apache/wiki/plugin/IfPlugin.svg            |    4 +-
 .../org/apache/wiki/plugin/Image.svg               |    4 +-
 .../org/apache/wiki/plugin/IndexPlugin.svg         |    4 +-
 .../org/apache/wiki/plugin/InsertPage.svg          |    4 +-
 .../org/apache/wiki/plugin/ListLocksPlugin.svg     |    4 +-
 .../org/apache/wiki/plugin/Note.svg                |    4 +-
 .../wiki/plugin/PageViewPlugin.PageViewManager.svg |    4 +-
 .../org/apache/wiki/plugin/PageViewPlugin.svg      |    4 +-
 .../org/apache/wiki/plugin/PluginManager.svg       |    4 +-
 .../org/apache/wiki/plugin/RecentChangesPlugin.svg |    4 +-
 .../org/apache/wiki/plugin/ReferredPagesPlugin.svg |    4 +-
 .../apache/wiki/plugin/ReferringPagesPlugin.svg    |    4 +-
 .../wiki/plugin/ReferringUndefinedPagesPlugin.svg  |    4 +-
 .../org/apache/wiki/plugin/SampleAjaxPlugin.svg    |    4 +-
 .../org/apache/wiki/plugin/Search.svg              |    4 +-
 .../org/apache/wiki/plugin/SessionsPlugin.svg      |    4 +-
 .../org/apache/wiki/plugin/TableOfContents.svg     |    4 +-
 .../apache/wiki/plugin/UndefinedPagesPlugin.svg    |    4 +-
 .../org/apache/wiki/plugin/UnusedPagesPlugin.svg   |    4 +-
 .../org/apache/wiki/plugin/WeblogArchivePlugin.svg |    4 +-
 .../org/apache/wiki/plugin/WeblogEntryPlugin.svg   |    4 +-
 .../org/apache/wiki/plugin/WeblogPlugin.svg        |    4 +-
 .../org/apache/wiki/plugin/package.svg             |  572 +++----
 .../wiki/preferences/Preferences.TimeFormat.svg    |    4 +-
 .../org/apache/wiki/preferences/Preferences.svg    |    4 +-
 .../org/apache/wiki/preferences/package.svg        |    4 +-
 .../AbstractFileProvider.WikiFileFilter.svg        |    4 +-
 .../apache/wiki/providers/AbstractFileProvider.svg |    4 +-
 .../BasicAttachmentProvider.AttachmentFilter.html  |    6 +-
 .../BasicAttachmentProvider.AttachmentFilter.svg   |    4 +-
 ...AttachmentProvider.AttachmentVersionFilter.html |    6 +-
 ...cAttachmentProvider.AttachmentVersionFilter.svg |    4 +-
 .../wiki/providers/BasicAttachmentProvider.html    |   22 +-
 .../wiki/providers/BasicAttachmentProvider.svg     |    4 +-
 .../wiki/providers/CachingAttachmentProvider.svg   |    4 +-
 .../org/apache/wiki/providers/CachingProvider.svg  |    4 +-
 .../org/apache/wiki/providers/FastSearch.svg       |    4 +-
 .../apache/wiki/providers/FileSystemProvider.svg   |    4 +-
 .../wiki/providers/NoSuchVersionException.svg      |    4 +-
 .../wiki/providers/RepositoryModifiedException.svg |    4 +-
 .../wiki/providers/VersioningFileProvider.svg      |    4 +-
 .../apache/wiki/providers/VersioningProvider.svg   |    4 +-
 .../providers/WikiAttachmentAdapterProvider.svg    |    4 +-
 .../wiki/providers/WikiAttachmentProvider.svg      |    4 +-
 .../wiki/providers/WikiPageAdapterProvider.svg     |    4 +-
 .../org/apache/wiki/providers/WikiPageProvider.svg |    4 +-
 .../org/apache/wiki/providers/package.svg          |  332 ++--
 .../wiki/references/DefaultReferenceManager.svg    |    4 +-
 .../apache/wiki/references/ReferenceManager.svg    |    4 +-
 .../org/apache/wiki/references/package.svg         |    4 +-
 .../org/apache/wiki/render/CleanTextRenderer.svg   |    4 +-
 .../org/apache/wiki/render/CreoleRenderer.svg      |    4 +-
 .../wiki/render/CustomXMLOutputProcessor.svg       |    4 +-
 .../apache/wiki/render/DefaultRenderingManager.svg |    4 +-
 .../org/apache/wiki/render/RenderingManager.svg    |    4 +-
 .../org/apache/wiki/render/WikiRenderer.svg        |    4 +-
 .../apache/wiki/render/WysiwygEditingRenderer.svg  |    4 +-
 .../org/apache/wiki/render/XHTMLRenderer.svg       |    4 +-
 .../wiki/render/markdown/MarkdownRenderer.svg      |    4 +-
 .../org/apache/wiki/render/markdown/package.svg    |    4 +-
 .../org/apache/wiki/render/package.svg             |  130 +-
 .../org/apache/wiki/rpc/atom/AtomAPIServlet.svg    |    4 +-
 .../org/apache/wiki/rpc/atom/package.svg           |    4 +-
 .../org/apache/wiki/rss/AtomFeed.svg               |    4 +-
 .../org/apache/wiki/rss/DefaultRSSGenerator.svg    |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/rss/Entry.svg  |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/rss/Feed.svg   |    4 +-
 .../org/apache/wiki/rss/RSS10Feed.svg              |    4 +-
 .../org/apache/wiki/rss/RSS20Feed.svg              |    4 +-
 .../org/apache/wiki/rss/RSSGenerator.svg           |    4 +-
 .../org/apache/wiki/rss/RSSThread.svg              |    4 +-
 .../org/apache/wiki/rss/package.svg                |  180 +--
 .../org/apache/wiki/search/BasicSearchProvider.svg |    4 +-
 .../search/DefaultSearchManager.JSONSearch.svg     |    4 +-
 .../apache/wiki/search/DefaultSearchManager.svg    |    4 +-
 .../apache/wiki/search/LuceneSearchProvider.svg    |    4 +-
 .../org/apache/wiki/search/QueryItem.svg           |    4 +-
 .../org/apache/wiki/search/SearchManager.svg       |    4 +-
 .../wiki/search/SearchMatcher.SearchResultImpl.svg |    4 +-
 .../org/apache/wiki/search/SearchMatcher.svg       |    4 +-
 .../org/apache/wiki/search/SearchProvider.svg      |    4 +-
 .../org/apache/wiki/search/SearchResult.svg        |    4 +-
 .../apache/wiki/search/SearchResultComparator.svg  |    4 +-
 .../wiki/search/kendra/KendraSearchProvider.svg    |    4 +-
 .../org/apache/wiki/search/kendra/package.svg      |    4 +-
 .../org/apache/wiki/search/package.svg             |  220 +--
 .../apache/wiki/search/tika/TikaSearchProvider.svg |    4 +-
 .../org/apache/wiki/search/tika/package.svg        |    4 +-
 .../org/apache/wiki/spi/AclsSPIDefaultImpl.svg     |    4 +-
 .../org/apache/wiki/spi/ContentsSPIDefaultImpl.svg |    4 +-
 .../org/apache/wiki/spi/ContextSPIDefaultImpl.svg  |    4 +-
 .../org/apache/wiki/spi/EngineSPIDefaultImpl.svg   |    4 +-
 .../org/apache/wiki/spi/SessionSPIDefaultImpl.svg  |    4 +-
 .../org/apache/wiki/spi/package.svg                |   78 +-
 .../org/apache/wiki/tags/AdminBeanIteratorInfo.svg |    4 +-
 .../org/apache/wiki/tags/AdminBeanIteratorTag.svg  |    4 +-
 .../apache/wiki/tags/AttachmentsIteratorInfo.svg   |    4 +-
 .../apache/wiki/tags/AttachmentsIteratorTag.svg    |    4 +-
 .../org/apache/wiki/tags/AuthorTag.svg             |    4 +-
 .../org/apache/wiki/tags/BaseURLTag.svg            |    4 +-
 .../apache/wiki/tags/BreadcrumbsTag.FixedQueue.svg |    4 +-
 .../org/apache/wiki/tags/BreadcrumbsTag.svg        |    4 +-
 .../org/apache/wiki/tags/CalendarTag.svg           |    4 +-
 .../org/apache/wiki/tags/CheckLockInfo.svg         |    4 +-
 .../org/apache/wiki/tags/CheckLockTag.svg          |    4 +-
 .../apache/wiki/tags/CheckRequestContextTag.svg    |    4 +-
 .../org/apache/wiki/tags/CheckVersionTag.svg       |    4 +-
 .../org/apache/wiki/tags/CommentLinkTag.svg        |    4 +-
 .../org/apache/wiki/tags/ContentEncodingTag.svg    |    4 +-
 .../org/apache/wiki/tags/ContentTag.svg            |    4 +-
 .../org/apache/wiki/tags/CookieTag.svg             |    4 +-
 .../org/apache/wiki/tags/CsrfProtectionTag.svg     |    4 +-
 .../org/apache/wiki/tags/DiffLinkTag.svg           |    4 +-
 .../org/apache/wiki/tags/EditLinkTag.svg           |    4 +-
 .../org/apache/wiki/tags/EditorIteratorInfo.svg    |    4 +-
 .../org/apache/wiki/tags/EditorIteratorTag.svg     |    4 +-
 .../org/apache/wiki/tags/EditorTag.svg             |    4 +-
 .../org/apache/wiki/tags/FeedDiscoveryTag.svg      |    4 +-
 .../org/apache/wiki/tags/HasAttachmentsTag.svg     |    4 +-
 .../org/apache/wiki/tags/HistoryIteratorInfo.svg   |    4 +-
 .../org/apache/wiki/tags/HistoryIteratorTag.svg    |    4 +-
 .../org/apache/wiki/tags/IfNoSearchResultsTag.svg  |    4 +-
 .../org/apache/wiki/tags/IncludeResourcesTag.svg   |    4 +-
 .../org/apache/wiki/tags/IncludeTag.svg            |    4 +-
 .../org/apache/wiki/tags/InsertDiffTag.svg         |    4 +-
 .../org/apache/wiki/tags/InsertPageTag.svg         |    4 +-
 .../org/apache/wiki/tags/IteratorTag.svg           |    4 +-
 .../org/apache/wiki/tags/LinkTag.svg               |    4 +-
 .../org/apache/wiki/tags/LinkToParentTag.svg       |    4 +-
 .../org/apache/wiki/tags/LinkToTag.svg             |    4 +-
 .../org/apache/wiki/tags/MessagesTag.svg           |    4 +-
 .../org/apache/wiki/tags/NextVersionTag.svg        |    4 +-
 .../org/apache/wiki/tags/NoSuchPageTag.svg         |    4 +-
 .../org/apache/wiki/tags/PageDateTag.svg           |    4 +-
 .../org/apache/wiki/tags/PageExistsTag.svg         |    4 +-
 .../org/apache/wiki/tags/PageInfoLinkTag.svg       |    4 +-
 .../org/apache/wiki/tags/PageNameTag.svg           |    4 +-
 .../org/apache/wiki/tags/PageSizeTag.svg           |    4 +-
 .../org/apache/wiki/tags/PageTypeTag.svg           |    4 +-
 .../org/apache/wiki/tags/PageVersionTag.svg        |    4 +-
 .../org/apache/wiki/tags/ParamHandler.svg          |    4 +-
 .../org/apache/wiki/tags/ParamTag.svg              |    4 +-
 .../org/apache/wiki/tags/ParentPageNameTag.svg     |    4 +-
 .../org/apache/wiki/tags/PermissionTag.svg         |    4 +-
 .../org/apache/wiki/tags/PluginTag.svg             |    4 +-
 .../org/apache/wiki/tags/PreviousVersionTag.svg    |    4 +-
 .../org/apache/wiki/tags/RSSImageLinkTag.svg       |    4 +-
 .../org/apache/wiki/tags/RequestResourceTag.svg    |    4 +-
 .../apache/wiki/tags/SearchResultIteratorInfo.svg  |    4 +-
 .../apache/wiki/tags/SearchResultIteratorTag.svg   |    4 +-
 .../org/apache/wiki/tags/SearchResultsSizeTag.svg  |    4 +-
 .../org/apache/wiki/tags/SearchResultsTag.svg      |    4 +-
 .../org/apache/wiki/tags/SetPaginationTag.svg      |    4 +-
 .../org/apache/wiki/tags/SpamFilterInputsTag.svg   |    4 +-
 .../org/apache/wiki/tags/TabTag.svg                |    4 +-
 .../org/apache/wiki/tags/TabbedSectionTag.svg      |    4 +-
 .../org/apache/wiki/tags/TemplateDirTag.svg        |    4 +-
 .../org/apache/wiki/tags/TranslateTag.svg          |    4 +-
 .../org/apache/wiki/tags/UploadLinkTag.svg         |    4 +-
 .../org/apache/wiki/tags/UserCheckTag.svg          |    4 +-
 .../org/apache/wiki/tags/UserNameTag.svg           |    4 +-
 .../org/apache/wiki/tags/UserProfileTag.svg        |    4 +-
 .../org/apache/wiki/tags/VariableTag.svg           |    4 +-
 .../org/apache/wiki/tags/WikiBodyTag.svg           |    4 +-
 .../org/apache/wiki/tags/WikiLinkTag.svg           |    4 +-
 .../org/apache/wiki/tags/WikiTagBase.svg           |    4 +-
 .../org/apache/wiki/tags/package.svg               | 1038 ++++++------
 .../org/apache/wiki/tasks/DefaultTasksManager.svg  |    4 +-
 .../org/apache/wiki/tasks/TasksManager.svg         |    4 +-
 .../apache/wiki/tasks/auth/SaveUserProfileTask.svg |    4 +-
 .../org/apache/wiki/tasks/auth/package.svg         |    4 +-
 .../org/apache/wiki/tasks/package.svg              |   24 +-
 .../wiki/tasks/pages/PreSaveWikiPageTask.svg       |    4 +-
 .../apache/wiki/tasks/pages/SaveWikiPageTask.svg   |    4 +-
 .../org/apache/wiki/tasks/pages/package.svg        |   26 +-
 .../org/apache/wiki/ui/AbstractCommand.svg         |    4 +-
 .../org/apache/wiki/ui/AllCommands.svg             |    4 +-
 .../org/apache/wiki/ui/CommandResolver.svg         |    4 +-
 .../org/apache/wiki/ui/DefaultCommandResolver.svg  |    4 +-
 .../org/apache/wiki/ui/DefaultEditorManager.svg    |    4 +-
 .../org/apache/wiki/ui/DefaultTemplateManager.svg  |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/ui/Editor.svg  |    4 +-
 .../org/apache/wiki/ui/EditorManager.svg           |    4 +-
 .../org/apache/wiki/ui/GenericHTTPHandler.svg      |    4 +-
 .../org/apache/wiki/ui/GroupCommand.svg            |    4 +-
 .../org/apache/wiki/ui/InputValidator.svg          |    4 +-
 .../org/apache/wiki/ui/Installer.svg               |    4 +-
 .../org/apache/wiki/ui/PageCommand.svg             |    4 +-
 .../org/apache/wiki/ui/RedirectCommand.svg         |    4 +-
 .../org/apache/wiki/ui/TemplateManager.svg         |    4 +-
 .../org/apache/wiki/ui/WikiCommand.svg             |    4 +-
 .../org/apache/wiki/ui/WikiJSPFilter.svg           |    4 +-
 .../org/apache/wiki/ui/WikiRequestWrapper.svg      |    4 +-
 .../org/apache/wiki/ui/WikiServletFilter.svg       |    4 +-
 .../org/apache/wiki/ui/admin/AdminBean.svg         |    4 +-
 .../org/apache/wiki/ui/admin/AdminBeanManager.svg  |    4 +-
 .../wiki/ui/admin/DefaultAdminBeanManager.svg      |    4 +-
 .../org/apache/wiki/ui/admin/SimpleAdminBean.svg   |    4 +-
 .../org/apache/wiki/ui/admin/WikiFormAdminBean.svg |    4 +-
 .../org/apache/wiki/ui/admin/beans/CoreBean.svg    |    4 +-
 .../org/apache/wiki/ui/admin/beans/FilterBean.svg  |    4 +-
 .../org/apache/wiki/ui/admin/beans/ModuleBean.svg  |    4 +-
 .../wiki/ui/admin/beans/PlainEditorAdminBean.svg   |    4 +-
 .../org/apache/wiki/ui/admin/beans/PluginBean.svg  |    4 +-
 .../wiki/ui/admin/beans/SearchManagerBean.svg      |    4 +-
 .../org/apache/wiki/ui/admin/beans/UserBean.svg    |    4 +-
 .../org/apache/wiki/ui/admin/beans/package.svg     |  110 +-
 .../org/apache/wiki/ui/admin/package.svg           |   68 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/ui/package.svg |  378 ++---
 .../DefaultProgressManager.JSONTracker.svg         |    4 +-
 .../wiki/ui/progress/DefaultProgressManager.svg    |    4 +-
 .../org/apache/wiki/ui/progress/ProgressItem.svg   |    4 +-
 .../apache/wiki/ui/progress/ProgressManager.svg    |    4 +-
 .../org/apache/wiki/ui/progress/package.svg        |   42 +-
 .../org/apache/wiki/url/DefaultURLConstructor.svg  |    4 +-
 .../org/apache/wiki/url/ShortURLConstructor.svg    |    4 +-
 .../apache/wiki/url/ShortViewURLConstructor.svg    |    4 +-
 .../org/apache/wiki/url/URLConstructor.svg         |    4 +-
 .../org/apache/wiki/url/package.svg                |   42 +-
 .../org/apache/wiki/util/ByteUtils.svg             |    4 +-
 .../org/apache/wiki/util/CheckedSupplier.svg       |    4 +-
 .../org/apache/wiki/util/ClassUtil.svg             |    4 +-
 .../org/apache/wiki/util/CommentedProperties.svg   |    4 +-
 .../org/apache/wiki/util/CryptoUtil.svg            |    4 +-
 .../org/apache/wiki/util/FileUtil.svg              |    4 +-
 .../org/apache/wiki/util/FormUtil.svg              |    4 +-
 .../org/apache/wiki/util/HttpUtil.svg              |    4 +-
 .../wiki/util/MailUtil.SmtpAuthenticator.html      |    8 +-
 .../wiki/util/MailUtil.SmtpAuthenticator.svg       |    4 +-
 .../org/apache/wiki/util/MailUtil.html             |    4 +-
 .../org/apache/wiki/util/MailUtil.svg              |    4 +-
 .../org/apache/wiki/util/PriorityList.svg          |    4 +-
 .../org/apache/wiki/util/PropertiesUtils.svg       |    4 +-
 .../org/apache/wiki/util/PropertyReader.html       |   60 +-
 .../org/apache/wiki/util/PropertyReader.svg        |    7 +-
 .../org/apache/wiki/util/Serializer.svg            |    4 +-
 .../org/apache/wiki/util/TextUtil.svg              |    4 +-
 .../org/apache/wiki/util/TimedCounterList.svg      |    4 +-
 .../org/apache/wiki/util/URIScheme.svg             |    4 +-
 .../2.12.2-SNAPSHOT/org/apache/wiki/util/XHTML.svg |    4 +-
 .../org/apache/wiki/util/XhtmlUtil.svg             |    4 +-
 .../org/apache/wiki/util/XmlUtil.svg               |    4 +-
 .../wiki/util/comparators/CollatorComparator.svg   |    4 +-
 .../util/comparators/HumanComparator.CharType.svg  |    4 +-
 .../wiki/util/comparators/HumanComparator.svg      |    4 +-
 .../util/comparators/JavaNaturalComparator.svg     |    4 +-
 .../wiki/util/comparators/LocaleComparator.svg     |    4 +-
 .../wiki/util/comparators/PrincipalComparator.svg  |    4 +-
 .../org/apache/wiki/util/comparators/package.svg   |   34 +-
 .../org/apache/wiki/util/package.svg               |  407 ++---
 .../wiki/variables/DefaultVariableManager.svg      |    4 +-
 .../org/apache/wiki/variables/VariableManager.svg  |    4 +-
 .../org/apache/wiki/variables/package.svg          |   30 +-
 .../org/apache/wiki/workflow/AbstractStep.svg      |    4 +-
 .../org/apache/wiki/workflow/Decision.svg          |    4 +-
 .../org/apache/wiki/workflow/DecisionQueue.svg     |    4 +-
 .../wiki/workflow/DecisionRequiredException.svg    |    4 +-
 .../wiki/workflow/DefaultWorkflowManager.svg       |    4 +-
 .../org/apache/wiki/workflow/Fact.svg              |    4 +-
 .../wiki/workflow/NoSuchOutcomeException.svg       |    4 +-
 .../org/apache/wiki/workflow/Outcome.svg           |    4 +-
 .../org/apache/wiki/workflow/SimpleDecision.svg    |    4 +-
 .../apache/wiki/workflow/SimpleNotification.svg    |    4 +-
 .../org/apache/wiki/workflow/Step.svg              |    4 +-
 .../org/apache/wiki/workflow/SystemPrincipal.svg   |    4 +-
 .../org/apache/wiki/workflow/Task.svg              |    4 +-
 .../org/apache/wiki/workflow/Workflow.svg          |    4 +-
 .../org/apache/wiki/workflow/WorkflowBuilder.svg   |    4 +-
 .../org/apache/wiki/workflow/WorkflowManager.svg   |    4 +-
 .../org/apache/wiki/workflow/package.svg           |  308 ++--
 .../org/apache/wiki/xmlrpc/AbstractRPCHandler.svg  |    4 +-
 .../org/apache/wiki/xmlrpc/MetaWeblogHandler.svg   |    4 +-
 .../org/apache/wiki/xmlrpc/RPCHandler.svg          |    4 +-
 .../org/apache/wiki/xmlrpc/RPCHandlerUTF8.svg      |    4 +-
 .../org/apache/wiki/xmlrpc/RPCServlet.svg          |    4 +-
 .../org/apache/wiki/xmlrpc/WikiRPCHandler.svg      |    4 +-
 .../org/apache/wiki/xmlrpc/package.svg             |   96 +-
 apidocs/2.12.2-SNAPSHOT/package-dependencies.svg   | 1654 ++++++++++----------
 apidocs/2.12.2-SNAPSHOT/package-search-index.zip   |  Bin 631 -> 631 bytes
 .../src-html/org/apache/wiki/api/Release.html      |    2 +-
 .../BasicAttachmentProvider.AttachmentFilter.html  |  632 ++++----
 ...AttachmentProvider.AttachmentVersionFilter.html |  632 ++++----
 .../wiki/providers/BasicAttachmentProvider.html    |  632 ++++----
 .../wiki/util/MailUtil.SmtpAuthenticator.html      |  860 +++++-----
 .../src-html/org/apache/wiki/util/MailUtil.html    |  860 +++++-----
 .../org/apache/wiki/util/PropertyReader.html       |  613 ++++----
 apidocs/2.12.2-SNAPSHOT/type-search-index.zip      |  Bin 4569 -> 4569 bytes
 development/changelog.html                         |   55 +
 .../2.12.2-SNAPSHOT/cmp-jspwiki-210-adapters.html  |    2 +-
 .../cmp-jspwiki-210-test-adaptees.html             |    2 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-api.html       |    2 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-bootstrap.html |    2 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-cache.html     |    2 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-event.html     |    2 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-http.html      |    2 +-
 .../cmp-jspwiki-kendra-searchprovider.html         |    2 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-main.html      |   32 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-markdown.html  |    2 +-
 .../cmp-jspwiki-tika-searchprovider.html           |    2 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-util.diff      |    3 +-
 japicmp/2.12.2-SNAPSHOT/cmp-jspwiki-util.html      |   51 +-
 641 files changed, 8522 insertions(+), 8331 deletions(-)

diff --git a/apidocs/2.12.2-SNAPSHOT/constant-values.html b/apidocs/2.12.2-SNAPSHOT/constant-values.html
index 63c609a0fa..9ed6470dce 100644
--- a/apidocs/2.12.2-SNAPSHOT/constant-values.html
+++ b/apidocs/2.12.2-SNAPSHOT/constant-values.html
@@ -128,7 +128,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <th class="colSecond" scope="row"><code><a href="org/apache/wiki/api/Release.html#BUILD">BUILD</a></code></th>
-<td class="colLast"><code>"11"</code></td>
+<td class="colLast"><code>"13"</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a id="org.apache.wiki.api.Release.MINORREVISION">
@@ -156,7 +156,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <th class="colSecond" scope="row"><code><a href="org/apache/wiki/api/Release.html#VERSTR">VERSTR</a></code></th>
-<td class="colLast"><code>"2.12.2-git-11"</code></td>
+<td class="colLast"><code>"2.12.2-git-13"</code></td>
 </tr>
 </tbody>
 </table>
diff --git a/apidocs/2.12.2-SNAPSHOT/index-all.html b/apidocs/2.12.2-SNAPSHOT/index-all.html
index 877f58add9..2bb148771c 100644
--- a/apidocs/2.12.2-SNAPSHOT/index-all.html
+++ b/apidocs/2.12.2-SNAPSHOT/index-all.html
@@ -2411,8 +2411,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/util/PropertyReader.html#DEFAULT_JSPWIKI_CONFIG">DEFAULT_JSPWIKI_CONFIG</a></span> - Static variable in class org.apache.wiki.util.<a href="org/apache/wiki/util/PropertyReader.html" title="class in org.apache.wiki.util">PropertyReader</a></dt>
 <dd>
-<div class="block">Path to the base property file, usually overridden by values provided in
- a jspwiki-custom.properties file "/ini/jspwiki.properties"</div>
+<div class="block">Path to the base property file, "/ini/jspwiki.properties", usually overridden by values provided in
+ a jspwiki-custom.properties file.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/util/comparators/CollatorComparator.html#DEFAULT_LOCALE_COMPARATOR">DEFAULT_LOCALE_COMPARATOR</a></span> - Static variable in class org.apache.wiki.util.comparators.<a href="org/apache/wiki/util/comparators/CollatorComparator.html" title="class in org.apache.wiki.util.comparators">CollatorComparator</a></dt>
 <dd>&nbsp;</dd>
@@ -4054,7 +4054,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/util/PropertyReader.html#expandVars(java.util.Properties)">expandVars(Properties)</a></span> - Static method in class org.apache.wiki.util.<a href="org/apache/wiki/util/PropertyReader.html" title="class in org.apache.wiki.util">PropertyReader</a></dt>
 <dd>
-<div class="block">You define a property variable by using the prefix "var.x" as a property.</div>
+<div class="block">You define a property variable by using the prefix <code>var.x</code> as a property.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/markdown/MarkdownForJSPWikiExtension.html#extend(com.vladsch.flexmark.html.HtmlRenderer.Builder,java.lang.String)">extend(HtmlRenderer.Builder, String)</a></span> - Method in class org.apache.wiki.markdown.<a href="org/apache/wiki/markdown/MarkdownForJSPWikiExtension.html" title="class in org.apache.wiki.markdown">MarkdownForJSPWikiExtension</a></dt>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/markdown/MarkdownForJSPWikiExtension.html#extend(com.vladsch.flexmark.parser.Parser.Builder)">extend(Parser.Builder)</a></span> - Method in class org.apache.wiki.markdown.<a href="org/apache/wiki/markdown/MarkdownForJSPWikiExtension.html" title="class in org.apache.wiki.markdown">MarkdownForJSPWikiExtension</a></dt>
@@ -13317,6 +13317,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">The name of the property file.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/wiki/util/PropertyReader.html#propertyExpansion(java.util.Properties)">propertyExpansion(Properties)</a></span> - Static method in class org.apache.wiki.util.<a href="org/apache/wiki/util/PropertyReader.html" title="class in org.apache.wiki.util">PropertyReader</a></dt>
+<dd>
+<div class="block">Try to resolve properties whose value is something like <code>${SOME_VALUE}</code> from a system property first and,
+ if not found, from a system environment variable.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/wiki/providers/VersioningFileProvider.html#PROPERTYFILE">PROPERTYFILE</a></span> - Static variable in class org.apache.wiki.providers.<a href="org/apache/wiki/providers/VersioningFileProvider.html" title="class in org.apache.wiki.providers">VersioningFileProvider</a></dt>
 <dd>
 <div class="block">Name of the property file which stores the metadata.</div>
diff --git a/apidocs/2.12.2-SNAPSHOT/member-search-index.js b/apidocs/2.12.2-SNAPSHOT/member-search-index.js
index fa16dfa0d4..fc04656c1c 100644
--- a/apidocs/2.12.2-SNAPSHOT/member-search-index.js
+++ b/apidocs/2.12.2-SNAPSHOT/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"org.apache.wiki.htmltowiki.syntax","c":"WikiSyntaxDecorator","l":"a"},{"p":"org.apache.wiki.util","c":"XHTML","l":"a"},{"p":"org.apache.wiki.htmltowiki","c":"SyntaxDecorator","l":"a(Element, String)","url":"a(org.jdom2.Element,java.lang.String)"},{"p":"org.apache.wiki.htmltowiki.syntax","c":"WikiSyntaxDecorator","l":"a(Element, String)","url":"a(org.jdom2.Element,java.lang.String)"},{"p":"org.apache.wiki.util","c":"XHTML","l":"abbr"},{"p":"org.apache.wiki.auth. [...]
\ No newline at end of file
+memberSearchIndex = [{"p":"org.apache.wiki.htmltowiki.syntax","c":"WikiSyntaxDecorator","l":"a"},{"p":"org.apache.wiki.util","c":"XHTML","l":"a"},{"p":"org.apache.wiki.htmltowiki","c":"SyntaxDecorator","l":"a(Element, String)","url":"a(org.jdom2.Element,java.lang.String)"},{"p":"org.apache.wiki.htmltowiki.syntax","c":"WikiSyntaxDecorator","l":"a(Element, String)","url":"a(org.jdom2.Element,java.lang.String)"},{"p":"org.apache.wiki.util","c":"XHTML","l":"abbr"},{"p":"org.apache.wiki.auth. [...]
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/member-search-index.zip b/apidocs/2.12.2-SNAPSHOT/member-search-index.zip
index 52490f1343..11c3a98b1f 100644
Binary files a/apidocs/2.12.2-SNAPSHOT/member-search-index.zip and b/apidocs/2.12.2-SNAPSHOT/member-search-index.zip differ
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/InternalWikiException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/InternalWikiException.svg
index 0a62a3aab9..2f0948c5b5 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/InternalWikiException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/InternalWikiException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="220px" preserveAspectRatio="none" style="width:274px;height:220px;background:#FFFFFF;" version="1.1" viewBox="0 0 274 220" width="274px" zoomAndPan="magnify"><defs><filter height="300%" id="f1ajxdi1ch8r7o" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.InternalWikiException--><a href="InternalWikiException.html" target="_top" title="InternalWikiException.html" xlink:actuate="onRequest" xlink:href="InternalWikiException.html" xlink:show="new" xlink:title="InternalWikiException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1ajxdi1ch8r7o)" height="84.3516" id="org.apache.wiki.InternalWikiException" style="stroke:#A80036;stroke-width:1.5;" width="253" x="7" y="105"/><ellipse cx="56.25" cy=" [...]
 class java.lang.RuntimeException--><rect codeLine="11" fill="#FEFECE" filter="url(#f1ajxdi1ch8r7o)" height="37.9375" id="java.lang.RuntimeException" style="stroke:#A80036;stroke-width:1.5;" width="158" x="54.5" y="7"/><ellipse cx="69.5" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M72.4688,31.6094 Q71.8906,31.9063 71.25,32.0469 Q70.6094,32.2031 69.9063,32.2031 Q67.4063,32.2031 66.0781,30.5625 Q64.7656,28.9063 64.7656,25.7813 Q64.7656,22.6 [...]
-reverse link java.lang.RuntimeException to org.apache.wiki.InternalWikiException--><path codeLine="13" d="M133.5,65.54 C133.5,78.08 133.5,92.05 133.5,104.78 " fill="none" id="java.lang.RuntimeException-backto-org.apache.wiki.InternalWikiException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="126.5,65.07,133.5,45.07,140.5,65.07,126.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing [...]
+reverse link java.lang.RuntimeException to org.apache.wiki.InternalWikiException--><path codeLine="13" d="M133.5,65.54 C133.5,78.08 133.5,92.05 133.5,104.78 " fill="none" id="java.lang.RuntimeException-backto-org.apache.wiki.InternalWikiException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="126.5,65.07,133.5,45.07,140.5,65.07,126.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/LinkCollector.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/LinkCollector.svg
index b3a31394e6..39f61bca19 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/LinkCollector.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/LinkCollector.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="228px" preserveAspectRatio="none" style="width:222px;height:228px;background:#FFFFFF;" version="1.1" viewBox="0 0 222 228" width="222px" zoomAndPan="magnify"><defs><filter height="300%" id="f1rogeqa7ylou4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.LinkCollector--><a href="LinkCollector.html" target="_top" title="LinkCollector.html" xlink:actuate="onRequest" xlink:href="LinkCollector.html" xlink:show="new" xlink:title="LinkCollector.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1rogeqa7ylou4)" height="71.5469" id="org.apache.wiki.LinkCollector" style="stroke:#A80036;stroke-width:1.5;" width="201" x="7" y="126"/><ellipse cx="59.25" cy="144.9688" fill="#ADD1B2" rx="11" ry="11" style=" [...]
 class org.apache.wiki.StringTransmutator--><a href="StringTransmutator.html" target="_top" title="StringTransmutator.html" xlink:actuate="onRequest" xlink:href="StringTransmutator.html" xlink:show="new" xlink:title="StringTransmutator.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1rogeqa7ylou4)" height="58.7422" id="org.apache.wiki.StringTransmutator" style="stroke:#A80036;stroke-width:1.5;" width="200" x="7.5" y="7"/><ellipse cx="38.7" cy="25.9688" fill="#B4 [...]
-reverse link org.apache.wiki.StringTransmutator to org.apache.wiki.LinkCollector--><path codeLine="14" d="M107.5,86.46 C107.5,99.64 107.5,113.64 107.5,125.9 " fill="none" id="org.apache.wiki.StringTransmutator-backto-org.apache.wiki.LinkCollector" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="100.5,86.14,107.5,66.14,114.5,86.14,100.5,86.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size=" [...]
+reverse link org.apache.wiki.StringTransmutator to org.apache.wiki.LinkCollector--><path codeLine="14" d="M107.5,86.46 C107.5,99.64 107.5,113.64 107.5,125.9 " fill="none" id="org.apache.wiki.StringTransmutator-backto-org.apache.wiki.LinkCollector" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="100.5,86.14,107.5,66.14,114.5,86.14,100.5,86.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/StringTransmutator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/StringTransmutator.svg
index b88925a735..f20dbe79cd 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/StringTransmutator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/StringTransmutator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:221px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 221 90" width="221px" zoomAndPan="magnify"><defs><filter height="300%" id="f19elfk4sw4iko" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation= [...]
-class org.apache.wiki.StringTransmutator--><a href="StringTransmutator.html" target="_top" title="StringTransmutator.html" xlink:actuate="onRequest" xlink:href="StringTransmutator.html" xlink:show="new" xlink:title="StringTransmutator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f19elfk4sw4iko)" height="58.7422" id="org.apache.wiki.StringTransmutator" style="stroke:#A80036;stroke-width:1.5;" width="200" x="7" y="7"/><ellipse cx="38.2" cy="25.9688" fill="#B4A7E [...]
+class org.apache.wiki.StringTransmutator--><a href="StringTransmutator.html" target="_top" title="StringTransmutator.html" xlink:actuate="onRequest" xlink:href="StringTransmutator.html" xlink:show="new" xlink:title="StringTransmutator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f19elfk4sw4iko)" height="58.7422" id="org.apache.wiki.StringTransmutator" style="stroke:#A80036;stroke-width:1.5;" width="200" x="7" y="7"/><ellipse cx="38.2" cy="25.9688" fill="#B4A7E [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/TranslationsCheck.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/TranslationsCheck.svg
index 4f96c5202e..56bd99ef8b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/TranslationsCheck.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/TranslationsCheck.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="116px" preserveAspectRatio="none" style="width:280px;height:116px;background:#FFFFFF;" version="1.1" viewBox="0 0 280 116" width="280px" zoomAndPan="magnify"><defs><filter height="300%" id="f14w2u7ymfwuk0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.TranslationsCheck--><a href="TranslationsCheck.html" target="_top" title="TranslationsCheck.html" xlink:actuate="onRequest" xlink:href="TranslationsCheck.html" xlink:show="new" xlink:title="TranslationsCheck.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f14w2u7ymfwuk0)" height="84.3516" id="org.apache.wiki.TranslationsCheck" style="stroke:#A80036;stroke-width:1.5;" width="259" x="7" y="7"/><ellipse cx="68.25" cy="25.9688" fill="#ADD1B2" rx [...]
+class org.apache.wiki.TranslationsCheck--><a href="TranslationsCheck.html" target="_top" title="TranslationsCheck.html" xlink:actuate="onRequest" xlink:href="TranslationsCheck.html" xlink:show="new" xlink:title="TranslationsCheck.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f14w2u7ymfwuk0)" height="84.3516" id="org.apache.wiki.TranslationsCheck" style="stroke:#A80036;stroke-width:1.5;" width="259" x="7" y="7"/><ellipse cx="68.25" cy="25.9688" fill="#ADD1B2" rx [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WatchDog.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WatchDog.svg
index 6e5c463fa8..ab9aad295d 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WatchDog.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WatchDog.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="218px" preserveAspectRatio="none" style="width:272px;height:218px;background:#FFFFFF;" version="1.1" viewBox="0 0 272 218" width="272px" zoomAndPan="magnify"><defs><filter height="300%" id="fz7m94nnmjcem" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.WatchDog--><a href="WatchDog.html" target="_top" title="WatchDog.html" xlink:actuate="onRequest" xlink:href="WatchDog.html" xlink:show="new" xlink:title="WatchDog.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fz7m94nnmjcem)" height="186.7891" id="org.apache.wiki.WatchDog" style="stroke:#A80036;stroke-width:1.5;" width="251" x="7" y="7"/><ellipse cx="91.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;" [...]
+class org.apache.wiki.WatchDog--><a href="WatchDog.html" target="_top" title="WatchDog.html" xlink:actuate="onRequest" xlink:href="WatchDog.html" xlink:show="new" xlink:title="WatchDog.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fz7m94nnmjcem)" height="186.7891" id="org.apache.wiki.WatchDog" style="stroke:#A80036;stroke-width:1.5;" width="251" x="7" y="7"/><ellipse cx="91.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/Watchable.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/Watchable.svg
index cb67ef4c0e..66a87d99c2 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/Watchable.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/Watchable.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="116px" preserveAspectRatio="none" style="width:218px;height:116px;background:#FFFFFF;" version="1.1" viewBox="0 0 218 116" width="218px" zoomAndPan="magnify"><defs><filter height="300%" id="fftygwu9m4fg7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.Watchable--><a href="Watchable.html" target="_top" title="Watchable.html" xlink:actuate="onRequest" xlink:href="Watchable.html" xlink:show="new" xlink:title="Watchable.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fftygwu9m4fg7)" height="84.3516" id="org.apache.wiki.Watchable" style="stroke:#A80036;stroke-width:1.5;" width="197" x="7" y="7"/><ellipse cx="62.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width: [...]
+class org.apache.wiki.Watchable--><a href="Watchable.html" target="_top" title="Watchable.html" xlink:actuate="onRequest" xlink:href="Watchable.html" xlink:show="new" xlink:title="Watchable.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fftygwu9m4fg7)" height="84.3516" id="org.apache.wiki.Watchable" style="stroke:#A80036;stroke-width:1.5;" width="197" x="7" y="7"/><ellipse cx="62.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width: [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiBackgroundThread.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiBackgroundThread.svg
index 48d1c7df66..d91defdeaa 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiBackgroundThread.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiBackgroundThread.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.WikiBackgroundThread--><a href="WikiBackgroundThread.html"
 class java.lang.Thread--><rect codeLine="16" fill="#FEFECE" filter="url(#fylius8ezyzfx)" height="37.9375" id="java.lang.Thread" style="stroke:#A80036;stroke-width:1.5;" width="81" x="7" y="17.5"/><ellipse cx="22" cy="36.4688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M24.9688,42.1094 Q24.3906,42.4063 23.75,42.5469 Q23.1094,42.7031 22.4063,42.7031 Q19.9063,42.7031 18.5781,41.0625 Q17.2656,39.4063 17.2656,36.2813 Q17.2656,33.1563 18.5781,31.5 Q19.906 [...]
 class org.apache.wiki.event.WikiEventListener--><a href="event/WikiEventListener.html" target="_top" title="event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="event/WikiEventListener.html" xlink:show="new" xlink:title="event/WikiEventListener.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#fylius8ezyzfx)" height="58.7422" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x="123" y="7"/><ellipse cx= [...]
 reverse link java.lang.Thread to org.apache.wiki.WikiBackgroundThread--><path codeLine="21" d="M67.71,73.37 C76.47,88.91 87.06,107.7 97.35,125.96 " fill="none" id="java.lang.Thread-backto-org.apache.wiki.WikiBackgroundThread" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="61.48,76.57,57.76,55.71,73.68,69.7,61.48,76.57" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a32900858a04e074183e10eee056ba2a]
-reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.WikiBackgroundThread--><path codeLine="22" d="M204.34,83.42 C196.83,96.6 188.45,111.31 180.26,125.7 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.WikiBackgroundThread" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="198.28,79.91,214.26,66,210.45,86.84,198.28,79.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-fam [...]
+reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.WikiBackgroundThread--><path codeLine="22" d="M204.34,83.42 C196.83,96.6 188.45,111.31 180.26,125.7 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.WikiBackgroundThread" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="198.28,79.91,214.26,66,210.45,86.84,198.28,79.91" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-fam [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -37,5 +37,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiContext.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiContext.svg
index 130531fc99..cb78423917 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiContext.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiContext.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.WikiContext--><a href="WikiContext.html" target="_top" tit
 class org.apache.wiki.api.core.Context--><a href="api/core/Context.html" target="_top" title="api/core/Context.html" xlink:actuate="onRequest" xlink:href="api/core/Context.html" xlink:show="new" xlink:title="api/core/Context.html" xlink:type="simple"><rect codeLine="74" fill="#FEFECE" filter="url(#f6whbw3y7vbdj)" height="302.0313" id="org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.5;" width="309" x="7" y="7"/><ellipse cx="96.75" cy="25.9688" fill="#B4A7E5" rx="11" [...]
 class org.apache.wiki.api.core.Command--><a href="api/core/Command.html" target="_top" title="api/core/Command.html" xlink:actuate="onRequest" xlink:href="api/core/Command.html" xlink:show="new" xlink:title="api/core/Command.html" xlink:type="simple"><rect codeLine="96" fill="#FEFECE" filter="url(#f6whbw3y7vbdj)" height="148.375" id="org.apache.wiki.api.core.Command" style="stroke:#A80036;stroke-width:1.5;" width="242" x="350.5" y="84"/><ellipse cx="406.75" cy="102.9688" fill="#B4A7E5" r [...]
 reverse link org.apache.wiki.api.core.Context to org.apache.wiki.WikiContext--><path codeLine="107" d="M201.54,329.11 C204.57,341.98 207.7,355.28 210.9,368.89 " fill="none" id="org.apache.wiki.api.core.Context-backto-org.apache.wiki.WikiContext" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="194.63,330.32,196.87,309.25,208.26,327.11,194.63,330.32" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7d6138be006bdf77b6ba17747121bcef]
-reverse link org.apache.wiki.api.core.Command to org.apache.wiki.WikiContext--><path codeLine="108" d="M449.58,252.13 C441.74,285.44 432.3,325.55 422.1,368.85 " fill="none" id="org.apache.wiki.api.core.Command-backto-org.apache.wiki.WikiContext" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="442.85,250.17,454.25,232.3,456.48,253.38,442.85,250.17" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-s [...]
+reverse link org.apache.wiki.api.core.Command to org.apache.wiki.WikiContext--><path codeLine="108" d="M449.58,252.13 C441.74,285.44 432.3,325.55 422.1,368.85 " fill="none" id="org.apache.wiki.api.core.Command-backto-org.apache.wiki.WikiContext" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="442.85,250.17,454.25,232.3,456.48,253.38,442.85,250.17" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-s [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -123,5 +123,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiEngine.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiEngine.svg
index 2157f7bee3..285be8d3b6 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiEngine.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiEngine.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1375px" preserveAspectRatio="none" style="width:395px;height:1375px;background:#FFFFFF;" version="1.1" viewBox="0 0 395 1375" width="395px" zoomAndPan="magnify"><defs><filter height="300%" id="f1sn1o0lv44jpx" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
 class org.apache.wiki.WikiEngine--><a href="WikiEngine.html" target="_top" title="WikiEngine.html" xlink:actuate="onRequest" xlink:href="WikiEngine.html" xlink:show="new" xlink:title="WikiEngine.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1sn1o0lv44jpx)" height="860.6328" id="org.apache.wiki.WikiEngine" style="stroke:#A80036;stroke-width:1.5;" width="372" x="9" y="484"/><ellipse cx="153.25" cy="502.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;s [...]
 class org.apache.wiki.api.core.Engine--><a href="api/core/Engine.html" target="_top" title="api/core/Engine.html" xlink:actuate="onRequest" xlink:href="api/core/Engine.html" xlink:show="new" xlink:title="api/core/Engine.html" xlink:type="simple"><rect codeLine="71" fill="#FEFECE" filter="url(#f1sn1o0lv44jpx)" height="417.2734" id="org.apache.wiki.api.core.Engine" style="stroke:#A80036;stroke-width:1.5;" width="310" x="40" y="7"/><ellipse cx="130.25" cy="25.9688" fill="#B4A7E5" rx="11" ry [...]
-reverse link org.apache.wiki.api.core.Engine to org.apache.wiki.WikiEngine--><path codeLine="103" d="M195,444.3 C195,457.23 195,470.4 195,483.75 " fill="none" id="org.apache.wiki.api.core.Engine-backto-org.apache.wiki.WikiEngine" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="188,444.21,195,424.21,202,444.21,188,444.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spac [...]
+reverse link org.apache.wiki.api.core.Engine to org.apache.wiki.WikiEngine--><path codeLine="103" d="M195,444.3 C195,457.23 195,470.4 195,483.75 " fill="none" id="org.apache.wiki.api.core.Engine-backto-org.apache.wiki.WikiEngine" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="188,444.21,195,424.21,202,444.21,188,444.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spac [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -116,5 +116,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiPage.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiPage.svg
index ed03be4be6..8ec294093f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiPage.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiPage.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="727px" preserveAspectRatio="none" style="width:255px;height:727px;background:#FFFFFF;" version="1.1" viewBox="0 0 255 727" width="255px" zoomAndPan="magnify"><defs><filter height="300%" id="f13rydk5r9p7b5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.WikiPage--><a href="WikiPage.html" target="_top" title="WikiPage.html" xlink:actuate="onRequest" xlink:href="WikiPage.html" xlink:show="new" xlink:title="WikiPage.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f13rydk5r9p7b5)" height="340.4453" id="org.apache.wiki.WikiPage" style="stroke:#A80036;stroke-width:1.5;" width="234" x="7" y="356"/><ellipse cx="82.75" cy="374.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1 [...]
 class org.apache.wiki.api.core.Page--><a href="api/core/Page.html" target="_top" title="api/core/Page.html" xlink:actuate="onRequest" xlink:href="api/core/Page.html" xlink:show="new" xlink:title="api/core/Page.html" xlink:type="simple"><rect codeLine="31" fill="#FEFECE" filter="url(#f13rydk5r9p7b5)" height="289.2266" id="org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.5;" width="233" x="7.5" y="7"/><ellipse cx="59.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style= [...]
-reverse link org.apache.wiki.api.core.Page to org.apache.wiki.WikiPage--><path codeLine="53" d="M124,316.62 C124,329.69 124,342.9 124,355.99 " fill="none" id="org.apache.wiki.api.core.Page-backto-org.apache.wiki.WikiPage" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="117,316.25,124,296.25,131,316.25,117,316.25" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" tex [...]
+reverse link org.apache.wiki.api.core.Page to org.apache.wiki.WikiPage--><path codeLine="53" d="M124,316.62 C124,329.69 124,342.9 124,355.99 " fill="none" id="org.apache.wiki.api.core.Page-backto-org.apache.wiki.WikiPage" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="117,316.25,124,296.25,131,316.25,117,316.25" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" tex [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -66,5 +66,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiProvider.svg
index 39d78f2cfd..e9a58b21b8 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiProvider.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="255px" preserveAspectRatio="none" style="width:257px;height:255px;background:#FFFFFF;" version="1.1" viewBox="0 0 257 255" width="257px" zoomAndPan="magnify"><defs><filter height="300%" id="fb991vbokcw4y" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.WikiProvider--><a href="WikiProvider.html" target="_top" title="WikiProvider.html" xlink:actuate="onRequest" xlink:href="WikiProvider.html" xlink:show="new" xlink:title="WikiProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fb991vbokcw4y)" height="85.5156" id="org.apache.wiki.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="236" x="7" y="139"/><ellipse cx="78.75" cy="164.9531" fill="#B4A7E5" rx="11" ry="11" style="stroke: [...]
 class org.apache.wiki.api.providers.WikiProvider--><a href="api/providers/WikiProvider.html" target="_top" title="api/providers/WikiProvider.html" xlink:actuate="onRequest" xlink:href="api/providers/WikiProvider.html" xlink:show="new" xlink:title="api/providers/WikiProvider.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#fb991vbokcw4y)" height="71.5469" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="216" x="17" y= [...]
-reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.WikiProvider--><path codeLine="15" d="M125,99.54 C125,112.54 125,126.19 125,138.51 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.WikiProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118,99.28,125,79.28,132,99.28,118,99.28" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing [...]
+reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.WikiProvider--><path codeLine="15" d="M125,99.54 C125,112.54 125,126.19 125,138.51 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.WikiProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118,99.28,125,79.28,132,99.28,118,99.28" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiServlet.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiServlet.svg
index face20939b..f74cee7b33 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiServlet.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiServlet.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="232px" preserveAspectRatio="none" style="width:361px;height:232px;background:#FFFFFF;" version="1.1" viewBox="0 0 361 232" width="361px" zoomAndPan="magnify"><defs><filter height="300%" id="f8yajdowgov5t" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.WikiServlet--><a href="WikiServlet.html" target="_top" title="WikiServlet.html" xlink:actuate="onRequest" xlink:href="WikiServlet.html" xlink:show="new" xlink:title="WikiServlet.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f8yajdowgov5t)" height="97.1563" id="org.apache.wiki.WikiServlet" style="stroke:#A80036;stroke-width:1.5;" width="340" x="7" y="105"/><ellipse cx="135.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A800 [...]
 class javax.servlet.http.HttpServlet--><rect codeLine="12" fill="#FEFECE" filter="url(#f8yajdowgov5t)" height="37.9375" id="javax.servlet.http.HttpServlet" style="stroke:#A80036;stroke-width:1.5;" width="119" x="117.5" y="7"/><ellipse cx="132.5" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M132.6094,21.3125 L131.4531,26.3906 L133.7813,26.3906 L132.6094,21.3125 Z M131.125,19.0781 L134.1094,19.0781 L137.4688,31.4688 L135.0156,31.4688 L134.2 [...]
-reverse link javax.servlet.http.HttpServlet to org.apache.wiki.WikiServlet--><path codeLine="14" d="M177,65.52 C177,77.97 177,91.93 177,104.96 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.WikiServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="170,65.25,177,45.25,184,65.25,170,65.25" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="78" y= [...]
+reverse link javax.servlet.http.HttpServlet to org.apache.wiki.WikiServlet--><path codeLine="14" d="M177,65.52 C177,77.97 177,91.93 177,104.96 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.WikiServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="170,65.25,177,45.25,184,65.25,170,65.25" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="78" y= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiSession.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiSession.svg
index d1a3eed47b..0d9bc2db46 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiSession.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/WikiSession.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="791px" preserveAspectRatio="none" style="width:353px;height:791px;background:#FFFFFF;" version="1.1" viewBox="0 0 353 791" width="353px" zoomAndPan="magnify"><defs><filter height="300%" id="f19ur3z71ds82a" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.WikiSession--><a href="WikiSession.html" target="_top" title="WikiSession.html" xlink:actuate="onRequest" xlink:href="WikiSession.html" xlink:show="new" xlink:title="WikiSession.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f19ur3z71ds82a)" height="404.4688" id="org.apache.wiki.WikiSession" style="stroke:#A80036;stroke-width:1.5;" width="330" x="9" y="356"/><ellipse cx="128.75" cy="374.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A8 [...]
 class org.apache.wiki.api.core.Session--><a href="api/core/Session.html" target="_top" title="api/core/Session.html" xlink:actuate="onRequest" xlink:href="api/core/Session.html" xlink:show="new" xlink:title="api/core/Session.html" xlink:type="simple"><rect codeLine="36" fill="#FEFECE" filter="url(#f19ur3z71ds82a)" height="289.2266" id="org.apache.wiki.api.core.Session" style="stroke:#A80036;stroke-width:1.5;" width="210" x="69" y="7"/><ellipse cx="109.65" cy="25.9688" fill="#B4A7E5" rx=" [...]
-reverse link org.apache.wiki.api.core.Session to org.apache.wiki.WikiSession--><path codeLine="58" d="M174,316.4 C174,329.36 174,342.53 174,355.7 " fill="none" id="org.apache.wiki.api.core.Session-backto-org.apache.wiki.WikiSession" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="167,316.25,174,296.25,181,316.25,167,316.25" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="s [...]
+reverse link org.apache.wiki.api.core.Session to org.apache.wiki.WikiSession--><path codeLine="58" d="M174,316.4 C174,329.36 174,342.53 174,355.7 " fill="none" id="org.apache.wiki.api.core.Session-backto-org.apache.wiki.WikiSession" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="167,316.25,174,296.25,181,316.25,167,316.25" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="s [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -71,5 +71,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/AjaxUtil.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/AjaxUtil.svg
index 4f3b7e559d..ff5ae185cd 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/AjaxUtil.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/AjaxUtil.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:264px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 264 207" width="264px" zoomAndPan="magnify"><defs><filter height="300%" id="f13iqbaetu61d3" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.ajax.AjaxUtil--><a href="AjaxUtil.html" target="_top" title="AjaxUtil.html" xlink:actuate="onRequest" xlink:href="AjaxUtil.html" xlink:show="new" xlink:title="AjaxUtil.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f13iqbaetu61d3)" height="71.5469" id="org.apache.wiki.ajax.AjaxUtil" style="stroke:#A80036;stroke-width:1.5;" width="243" x="7" y="105"/><ellipse cx="75.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;strok [...]
 class javax.servlet.http.HttpServlet--><rect codeLine="10" fill="#FEFECE" filter="url(#f13iqbaetu61d3)" height="37.9375" id="javax.servlet.http.HttpServlet" style="stroke:#A80036;stroke-width:1.5;" width="119" x="69" y="7"/><ellipse cx="84" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M84.1094,21.3125 L82.9531,26.3906 L85.2813,26.3906 L84.1094,21.3125 Z M82.625,19.0781 L85.6094,19.0781 L88.9688,31.4688 L86.5156,31.4688 L85.75,28.4063 L82. [...]
-reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.AjaxUtil--><path codeLine="12" d="M128.5,65.3 C128.5,78 128.5,92.08 128.5,104.56 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.ajax.AjaxUtil" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="121.5,65.16,128.5,45.16,135.5,65.16,121.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength [...]
+reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.AjaxUtil--><path codeLine="12" d="M128.5,65.3 C128.5,78 128.5,92.08 128.5,104.56 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.ajax.AjaxUtil" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="121.5,65.16,128.5,45.16,135.5,65.16,121.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.svg
index 258932aec1..f7aeb8df03 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="284px" preserveAspectRatio="none" style="width:369px;height:284px;background:#FFFFFF;" version="1.1" viewBox="0 0 369 284" width="369px" zoomAndPan="magnify"><defs><filter height="300%" id="fge6mqtaksf3z" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.ajax.WikiAjaxDispatcherServlet--><a href="WikiAjaxDispatcherServlet.html" target="_top" title="WikiAjaxDispatcherServlet.html" xlink:actuate="onRequest" xlink:href="WikiAjaxDispatcherServlet.html" xlink:show="new" xlink:title="WikiAjaxDispatcherServlet.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fge6mqtaksf3z)" height="148.375" id="org.apache.wiki.ajax.WikiAjaxDispatcherServlet" style="stroke:#A80036;stroke-width:1.5;" width="348" x="7"  [...]
 class javax.servlet.http.HttpServlet--><rect codeLine="16" fill="#FEFECE" filter="url(#fge6mqtaksf3z)" height="37.9375" id="javax.servlet.http.HttpServlet" style="stroke:#A80036;stroke-width:1.5;" width="119" x="121.5" y="7"/><ellipse cx="136.5" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M136.6094,21.3125 L135.4531,26.3906 L137.7813,26.3906 L136.6094,21.3125 Z M135.125,19.0781 L138.1094,19.0781 L141.4688,31.4688 L139.0156,31.4688 L138.2 [...]
-reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.WikiAjaxDispatcherServlet--><path codeLine="18" d="M181,65.32 C181,77.41 181,91.2 181,104.88 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.ajax.WikiAjaxDispatcherServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="174,65.21,181,45.21,188,65.21,174,65.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust [...]
+reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.WikiAjaxDispatcherServlet--><path codeLine="18" d="M181,65.32 C181,77.41 181,91.2 181,104.88 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.ajax.WikiAjaxDispatcherServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="174,65.21,181,45.21,188,65.21,174,65.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/WikiAjaxServlet.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/WikiAjaxServlet.svg
index aba19458fb..7eebc1775a 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/WikiAjaxServlet.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/WikiAjaxServlet.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="103px" preserveAspectRatio="none" style="width:482px;height:103px;background:#FFFFFF;" version="1.1" viewBox="0 0 482 103" width="482px" zoomAndPan="magnify"><defs><filter height="300%" id="f11qtczb0fonjh" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.ajax.WikiAjaxServlet--><a href="WikiAjaxServlet.html" target="_top" title="WikiAjaxServlet.html" xlink:actuate="onRequest" xlink:href="WikiAjaxServlet.html" xlink:show="new" xlink:title="WikiAjaxServlet.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f11qtczb0fonjh)" height="71.5469" id="org.apache.wiki.ajax.WikiAjaxServlet" style="stroke:#A80036;stroke-width:1.5;" width="461" x="7" y="7"/><ellipse cx="180.75" cy="25.9688" fill="#B4A7E5" rx= [...]
+class org.apache.wiki.ajax.WikiAjaxServlet--><a href="WikiAjaxServlet.html" target="_top" title="WikiAjaxServlet.html" xlink:actuate="onRequest" xlink:href="WikiAjaxServlet.html" xlink:show="new" xlink:title="WikiAjaxServlet.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f11qtczb0fonjh)" height="71.5469" id="org.apache.wiki.ajax.WikiAjaxServlet" style="stroke:#A80036;stroke-width:1.5;" width="461" x="7" y="7"/><ellipse cx="180.75" cy="25.9688" fill="#B4A7E5" rx= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -19,5 +19,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/package.svg
index bf661476cd..45682b0c9c 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/ajax/package.svg
@@ -1,20 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="353px" preserveAspectRatio="none" style="width:1189px;height:353px;background:#FFFFFF;" version="1.1" viewBox="0 0 1189 353" width="1189px" zoomAndPan="magnify"><defs><filter height="300%" id="f1dl6olxmabfme" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
-cluster org.apache.wiki.ajax--><polygon fill="#FFFFFF" filter="url(#f1dl6olxmabfme)" points="16,129,183,129,190,151.2969,1172,151.2969,1172,330,16,330,16,129" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="190" y1="151.2969" y2="151.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="161" x="20" y="143.9951">org.apache.wiki.ajax</text><!--MD5=[737c6b32201ecf86b9d7c6 [...]
-cluster javax.servlet.http--><polygon fill="#FFFFFF" filter="url(#f1dl6olxmabfme)" points="243,6,386,6,393,28.2969,396,28.2969,396,105,243,105,243,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="243" x2="393" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="137" x="247" y="20.9951">javax.servlet.http</text><!--MD5=[4ac7a03e112f65afcaa5464e714c35da]
-class org.apache.wiki.ajax.WikiAjaxServlet--><a href="WikiAjaxServlet.html" target="_top" title="WikiAjaxServlet.html" xlink:actuate="onRequest" xlink:href="WikiAjaxServlet.html" xlink:show="new" xlink:title="WikiAjaxServlet.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1dl6olxmabfme)" height="73.6094" id="org.apache.wiki.ajax.WikiAjaxServlet" style="stroke:#A80036;stroke-width:1.5;" width="461" x="694.5" y="202"/><ellipse cx="873.75" cy="218" fill="#B4A7E5" r [...]
-class org.apache.wiki.ajax.WikiAjaxDispatcherServlet--><a href="WikiAjaxDispatcherServlet.html" target="_top" title="WikiAjaxDispatcherServlet.html" xlink:actuate="onRequest" xlink:href="WikiAjaxDispatcherServlet.html" xlink:show="new" xlink:title="WikiAjaxDispatcherServlet.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#f1dl6olxmabfme)" height="150.4375" id="org.apache.wiki.ajax.WikiAjaxDispatcherServlet" style="stroke:#A80036;stroke-width:1.5;" width="348" x="3 [...]
-class org.apache.wiki.ajax.AjaxUtil--><a href="AjaxUtil.html" target="_top" title="AjaxUtil.html" xlink:actuate="onRequest" xlink:href="AjaxUtil.html" xlink:show="new" xlink:title="AjaxUtil.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#f1dl6olxmabfme)" height="73.6094" id="org.apache.wiki.ajax.AjaxUtil" style="stroke:#A80036;stroke-width:1.5;" width="243" x="32.5" y="202"/><ellipse cx="127.25" cy="218" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;strok [...]
-class javax.servlet.http.HttpServlet--><rect codeLine="29" fill="#FEFECE" filter="url(#f1dl6olxmabfme)" height="48" id="javax.servlet.http.HttpServlet" style="stroke:#A80036;stroke-width:1.5;" width="102" x="268" y="41"/><ellipse cx="283" cy="57" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M283.1094,52.3438 L281.9531,57.4219 L284.2813,57.4219 L283.1094,52.3438 Z M281.625,50.1094 L284.6094,50.1094 L287.9688,62.5 L285.5156,62.5 L284.75,59.4375 L281.468 [...]
-reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.WikiAjaxDispatcherServlet--><path codeLine="24" d="M355.53,103.85 C372.57,121.5 393.46,143.15 413.45,163.86 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.ajax.WikiAjaxDispatcherServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="350.24,108.45,341.39,89.2,360.31,98.73,350.24,108.45" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[9903cd2d02b1c07df356b476156fa676]
-reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.AjaxUtil--><path codeLine="25" d="M282.82,103.72 C254.87,132.85 216.43,172.92 188.83,201.69 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.ajax.AjaxUtil" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="277.85,98.78,296.75,89.2,287.95,108.48,277.85,98.78" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spac [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="353px" preserveAspectRatio="none" style="width:1188px;height:353px;background:#FFFFFF;" version="1.1" viewBox="0 0 1188 353" width="1188px" zoomAndPan="magnify"><defs><filter height="300%" id="f1tpzzwpb04qxi" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
+cluster org.apache.wiki.ajax--><polygon fill="#FFFFFF" filter="url(#f1tpzzwpb04qxi)" points="16,129,183,129,190,151.2969,1171,151.2969,1171,330,16,330,16,129" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="190" y1="151.2969" y2="151.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="161" x="20" y="143.9951">org.apache.wiki.ajax</text><!--MD5=[737c6b32201ecf86b9d7c6 [...]
+cluster javax.servlet.http--><polygon fill="#FFFFFF" filter="url(#f1tpzzwpb04qxi)" points="739,6,882,6,889,28.2969,892,28.2969,892,105,739,105,739,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="739" x2="889" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="137" x="743" y="20.9951">javax.servlet.http</text><!--MD5=[4d4260c68bc295508de4ba8d26f64362]
+class org.apache.wiki.ajax.WikiAjaxDispatcherServlet--><a href="WikiAjaxDispatcherServlet.html" target="_top" title="WikiAjaxDispatcherServlet.html" xlink:actuate="onRequest" xlink:href="WikiAjaxDispatcherServlet.html" xlink:show="new" xlink:title="WikiAjaxDispatcherServlet.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1tpzzwpb04qxi)" height="150.4375" id="org.apache.wiki.ajax.WikiAjaxDispatcherServlet" style="stroke:#A80036;stroke-width:1.5;" width="348" x="8 [...]
+class org.apache.wiki.ajax.AjaxUtil--><a href="AjaxUtil.html" target="_top" title="AjaxUtil.html" xlink:actuate="onRequest" xlink:href="AjaxUtil.html" xlink:show="new" xlink:title="AjaxUtil.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#f1tpzzwpb04qxi)" height="73.6094" id="org.apache.wiki.ajax.AjaxUtil" style="stroke:#A80036;stroke-width:1.5;" width="243" x="528.5" y="202"/><ellipse cx="623.25" cy="218" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stro [...]
+class org.apache.wiki.ajax.WikiAjaxServlet--><a href="WikiAjaxServlet.html" target="_top" title="WikiAjaxServlet.html" xlink:actuate="onRequest" xlink:href="WikiAjaxServlet.html" xlink:show="new" xlink:title="WikiAjaxServlet.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#f1tpzzwpb04qxi)" height="73.6094" id="org.apache.wiki.ajax.WikiAjaxServlet" style="stroke:#A80036;stroke-width:1.5;" width="461" x="32.5" y="202"/><ellipse cx="211.75" cy="218" fill="#B4A7E5" r [...]
+class javax.servlet.http.HttpServlet--><rect codeLine="29" fill="#FEFECE" filter="url(#f1tpzzwpb04qxi)" height="48" id="javax.servlet.http.HttpServlet" style="stroke:#A80036;stroke-width:1.5;" width="102" x="764" y="41"/><ellipse cx="779" cy="57" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M779.1094,52.3438 L777.9531,57.4219 L780.2813,57.4219 L779.1094,52.3438 Z M777.625,50.1094 L780.6094,50.1094 L783.9688,62.5 L781.5156,62.5 L780.75,59.4375 L777.468 [...]
+reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.WikiAjaxDispatcherServlet--><path codeLine="24" d="M851.53,103.85 C868.57,121.5 889.46,143.15 909.45,163.86 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.ajax.WikiAjaxDispatcherServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="846.24,108.45,837.39,89.2,856.31,98.73,846.24,108.45" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[9903cd2d02b1c07df356b476156fa676]
+reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.AjaxUtil--><path codeLine="25" d="M778.82,103.72 C750.87,132.85 712.43,172.92 684.83,201.69 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.ajax.AjaxUtil" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="773.85,98.78,792.75,89.2,783.95,108.48,773.85,98.78" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spac [...]
 @startuml
     namespace org.apache.wiki.ajax {
 
-        interface WikiAjaxServlet [[WikiAjaxServlet.html]] {
-            {abstract} +getServletMapping(): String
-            {abstract} +service(HttpServletRequest, HttpServletResponse, String, List<String>): void
-        }
-
         class WikiAjaxDispatcherServlet [[WikiAjaxDispatcherServlet.html]] {
             +init(ServletConfig): void
             {static} +registerServlet(WikiAjaxServlet): void
@@ -31,6 +26,11 @@ reverse link javax.servlet.http.HttpServlet to org.apache.wiki.ajax.AjaxUtil--><
             {static} +getNextPathPart(String, String): String
         }
 
+        interface WikiAjaxServlet [[WikiAjaxServlet.html]] {
+            {abstract} +getServletMapping(): String
+            {abstract} +service(HttpServletRequest, HttpServletResponse, String, List<String>): void
+        }
+
         javax.servlet.http.HttpServlet <|- - WikiAjaxDispatcherServlet
         javax.servlet.http.HttpServlet <|- - AjaxUtil
     }
@@ -49,5 +49,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/Release.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/Release.svg
index 98a2e0aa68..34040ad6f0 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/Release.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/Release.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:233px;height:213px;background:#FFFFFF;" version="1.1" viewBox="0 0 233 213" width="233px" zoomAndPan="magnify"><defs><filter height="300%" id="f1qoznkcczpt0f" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.Release--><a href="Release.html" target="_top" title="Release.html" xlink:actuate="onRequest" xlink:href="Release.html" xlink:show="new" xlink:title="Release.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1qoznkcczpt0f)" height="181.9844" id="org.apache.wiki.api.Release" style="stroke:#A80036;stroke-width:1.5;" width="212" x="7" y="7"/><ellipse cx="63.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1. [...]
+class org.apache.wiki.api.Release--><a href="Release.html" target="_top" title="Release.html" xlink:actuate="onRequest" xlink:href="Release.html" xlink:show="new" xlink:title="Release.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1qoznkcczpt0f)" height="181.9844" id="org.apache.wiki.api.Release" style="stroke:#A80036;stroke-width:1.5;" width="212" x="7" y="7"/><ellipse cx="63.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1. [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Acl.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Acl.svg
index 1d71a108c6..0481a87320 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Acl.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Acl.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="154px" preserveAspectRatio="none" style="width:256px;height:154px;background:#FFFFFF;" version="1.1" viewBox="0 0 256 154" width="256px" zoomAndPan="magnify"><defs><filter height="300%" id="fnifobakktbql" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.core.Acl--><a href="Acl.html" target="_top" title="Acl.html" xlink:actuate="onRequest" xlink:href="Acl.html" xlink:show="new" xlink:title="Acl.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fnifobakktbql)" height="122.7656" id="org.apache.wiki.api.core.Acl" style="stroke:#A80036;stroke-width:1.5;" width="235" x="7" y="7"/><ellipse cx="59.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M [...]
+class org.apache.wiki.api.core.Acl--><a href="Acl.html" target="_top" title="Acl.html" xlink:actuate="onRequest" xlink:href="Acl.html" xlink:show="new" xlink:title="Acl.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fnifobakktbql)" height="122.7656" id="org.apache.wiki.api.core.Acl" style="stroke:#A80036;stroke-width:1.5;" width="235" x="7" y="7"/><ellipse cx="59.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/AclEntry.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/AclEntry.svg
index 8dbcd1e873..20250a3073 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/AclEntry.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/AclEntry.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="154px" preserveAspectRatio="none" style="width:283px;height:154px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 154" width="283px" zoomAndPan="magnify"><defs><filter height="300%" id="fvguycpqqgjkm" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.core.AclEntry--><a href="AclEntry.html" target="_top" title="AclEntry.html" xlink:actuate="onRequest" xlink:href="AclEntry.html" xlink:show="new" xlink:title="AclEntry.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fvguycpqqgjkm)" height="122.7656" id="org.apache.wiki.api.core.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="262" x="7" y="7"/><ellipse cx="73.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036; [...]
+class org.apache.wiki.api.core.AclEntry--><a href="AclEntry.html" target="_top" title="AclEntry.html" xlink:actuate="onRequest" xlink:href="AclEntry.html" xlink:show="new" xlink:title="AclEntry.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fvguycpqqgjkm)" height="122.7656" id="org.apache.wiki.api.core.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="262" x="7" y="7"/><ellipse cx="73.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036; [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Attachment.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Attachment.svg
index 0b10db04d2..b7cf333dff 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Attachment.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Attachment.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="496px" preserveAspectRatio="none" style="width:254px;height:496px;background:#FFFFFF;" version="1.1" viewBox="0 0 254 496" width="254px" zoomAndPan="magnify"><defs><filter height="300%" id="fdo1jhddzuj9a" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.core.Attachment--><a href="Attachment.html" target="_top" title="Attachment.html" xlink:actuate="onRequest" xlink:href="Attachment.html" xlink:show="new" xlink:title="Attachment.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fdo1jhddzuj9a)" height="109.9609" id="org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="187" x="30" y="356"/><ellipse cx="60.3" cy="374.9688" fill="#B4A7E5" rx="11" ry="11" style=" [...]
 class org.apache.wiki.api.core.Page--><a href="Page.html" target="_top" title="Page.html" xlink:actuate="onRequest" xlink:href="Page.html" xlink:show="new" xlink:title="Page.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#fdo1jhddzuj9a)" height="289.2266" id="org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.5;" width="233" x="7" y="7"/><ellipse cx="58.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><pa [...]
-reverse link org.apache.wiki.api.core.Page to org.apache.wiki.api.core.Attachment--><path codeLine="35" d="M123.5,316.43 C123.5,330.43 123.5,343.84 123.5,355.9 " fill="none" id="org.apache.wiki.api.core.Page-backto-org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="116.5,316.31,123.5,296.31,130.5,316.31,116.5,316.31" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust= [...]
+reverse link org.apache.wiki.api.core.Page to org.apache.wiki.api.core.Attachment--><path codeLine="35" d="M123.5,316.43 C123.5,330.43 123.5,343.84 123.5,355.9 " fill="none" id="org.apache.wiki.api.core.Page-backto-org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="116.5,316.31,123.5,296.31,130.5,316.31,116.5,316.31" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -48,5 +48,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Command.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Command.svg
index 810a602b2d..8657e2369e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Command.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Command.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="180px" preserveAspectRatio="none" style="width:263px;height:180px;background:#FFFFFF;" version="1.1" viewBox="0 0 263 180" width="263px" zoomAndPan="magnify"><defs><filter height="300%" id="f1tsj8gbo0m4ep" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.core.Command--><a href="Command.html" target="_top" title="Command.html" xlink:actuate="onRequest" xlink:href="Command.html" xlink:show="new" xlink:title="Command.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1tsj8gbo0m4ep)" height="148.375" id="org.apache.wiki.api.core.Command" style="stroke:#A80036;stroke-width:1.5;" width="242" x="7" y="7"/><ellipse cx="63.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke [...]
+class org.apache.wiki.api.core.Command--><a href="Command.html" target="_top" title="Command.html" xlink:actuate="onRequest" xlink:href="Command.html" xlink:show="new" xlink:title="Command.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1tsj8gbo0m4ep)" height="148.375" id="org.apache.wiki.api.core.Command" style="stroke:#A80036;stroke-width:1.5;" width="242" x="7" y="7"/><ellipse cx="63.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Context.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Context.svg
index 08f2d4b5e4..a2b3225a2f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Context.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Context.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.api.core.Context--><a href="Context.html" target="_top" ti
 class java.lang.Cloneable--><rect codeLine="34" fill="#FEFECE" filter="url(#freeccjjgbdxb)" height="37.9375" id="java.lang.Cloneable" style="stroke:#A80036;stroke-width:1.5;" width="101" x="8" y="62"/><ellipse cx="23" cy="80.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M18.9219,76.7344 L18.9219,74.5781 L26.3125,74.5781 L26.3125,76.7344 L23.8438,76.7344 L23.8438,84.8125 L26.3125,84.8125 L26.3125,86.9688 L18.9219,86.9688 L18.9219,84.8125 L21.3906, [...]
 class org.apache.wiki.api.core.Command--><a href="Command.html" target="_top" title="Command.html" xlink:actuate="onRequest" xlink:href="Command.html" xlink:show="new" xlink:title="Command.html" xlink:type="simple"><rect codeLine="35" fill="#FEFECE" filter="url(#freeccjjgbdxb)" height="148.375" id="org.apache.wiki.api.core.Command" style="stroke:#A80036;stroke-width:1.5;" width="242" x="144.5" y="7"/><ellipse cx="200.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;s [...]
 reverse link java.lang.Cloneable to org.apache.wiki.api.core.Context--><path codeLine="46" d="M70.46,119.78 C78.25,144.42 89.08,178.65 100.56,214.92 " fill="none" id="java.lang.Cloneable-backto-org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="63.69,121.61,64.33,100.43,77.04,117.39,63.69,121.61" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[cc6b7c4b7fc80b6942d9909e546c5914]
-reverse link org.apache.wiki.api.core.Command to org.apache.wiki.api.core.Context--><path codeLine="47" d="M236.06,174.15 C231.9,187.16 227.51,200.9 223.02,214.96 " fill="none" id="org.apache.wiki.api.core.Command-backto-org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="229.41,171.97,242.16,155.05,242.74,176.23,229.41,171.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" length [...]
+reverse link org.apache.wiki.api.core.Command to org.apache.wiki.api.core.Context--><path codeLine="47" d="M236.06,174.15 C231.9,187.16 227.51,200.9 223.02,214.96 " fill="none" id="org.apache.wiki.api.core.Command-backto-org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="229.41,171.97,242.16,155.05,242.74,176.23,229.41,171.97" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" length [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -62,5 +62,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/ContextEnum.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/ContextEnum.svg
index d68d808e2c..9f382fa263 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/ContextEnum.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/ContextEnum.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="469px" preserveAspectRatio="none" style="width:212px;height:469px;background:#FFFFFF;" version="1.1" viewBox="0 0 212 469" width="212px" zoomAndPan="magnify"><defs><filter height="300%" id="f14vbsuegwtbtt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.core.ContextEnum--><a href="ContextEnum.html" target="_top" title="ContextEnum.html" xlink:actuate="onRequest" xlink:href="ContextEnum.html" xlink:show="new" xlink:title="ContextEnum.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f14vbsuegwtbtt)" height="438.0781" id="org.apache.wiki.api.core.ContextEnum" style="stroke:#A80036;stroke-width:1.5;" width="191" x="7" y="7"/><ellipse cx="41.8" cy="25.9688" fill="#EB937F" rx="11" ry="11" styl [...]
+class org.apache.wiki.api.core.ContextEnum--><a href="ContextEnum.html" target="_top" title="ContextEnum.html" xlink:actuate="onRequest" xlink:href="ContextEnum.html" xlink:show="new" xlink:title="ContextEnum.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f14vbsuegwtbtt)" height="438.0781" id="org.apache.wiki.api.core.ContextEnum" style="stroke:#A80036;stroke-width:1.5;" width="191" x="7" y="7"/><ellipse cx="41.8" cy="25.9688" fill="#EB937F" rx="11" ry="11" styl [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -47,5 +47,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Engine.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Engine.svg
index ce20f3600e..fd2989aca3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Engine.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Engine.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="751px" preserveAspectRatio="none" style="width:341px;height:751px;background:#FFFFFF;" version="1.1" viewBox="0 0 341 751" width="341px" zoomAndPan="magnify"><defs><filter height="300%" id="fj02jmx5pvku6" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.core.Engine--><a href="Engine.html" target="_top" title="Engine.html" xlink:actuate="onRequest" xlink:href="Engine.html" xlink:show="new" xlink:title="Engine.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fj02jmx5pvku6)" height="719.7813" id="org.apache.wiki.api.core.Engine" style="stroke:#A80036;stroke-width:1.5;" width="320" x="7" y="7"/><ellipse cx="102.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-widt [...]
+class org.apache.wiki.api.core.Engine--><a href="Engine.html" target="_top" title="Engine.html" xlink:actuate="onRequest" xlink:href="Engine.html" xlink:show="new" xlink:title="Engine.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fj02jmx5pvku6)" height="719.7813" id="org.apache.wiki.api.core.Engine" style="stroke:#A80036;stroke-width:1.5;" width="320" x="7" y="7"/><ellipse cx="102.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-widt [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -69,5 +69,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Page.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Page.svg
index 48fc45b79b..01c130448e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Page.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Page.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.api.core.Page--><a href="Page.html" target="_top" title="P
 class java.lang.Cloneable--><rect codeLine="33" fill="#FEFECE" filter="url(#f143g240xv5hs0)" height="37.9375" id="java.lang.Cloneable" style="stroke:#A80036;stroke-width:1.5;" width="101" x="7" y="20.5"/><ellipse cx="22" cy="39.4688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M17.9219,35.2344 L17.9219,33.0781 L25.3125,33.0781 L25.3125,35.2344 L22.8438,35.2344 L22.8438,43.3125 L25.3125,43.3125 L25.3125,45.4688 L17.9219,45.4688 L17.9219,43.3125 L20.39 [...]
 class java.lang.Comparable--><rect codeLine="34" fill="#FEFECE" filter="url(#f143g240xv5hs0)" height="58.7422" id="java.lang.Comparable" style="stroke:#A80036;stroke-width:1.5;" width="150" x="143.5" y="10"/><ellipse cx="158.5" cy="28.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M154.4219,24.7344 L154.4219,22.5781 L161.8125,22.5781 L161.8125,24.7344 L159.3438,24.7344 L159.3438,32.8125 L161.8125,32.8125 L161.8125,34.9688 L154.4219,34.9688 L154.42 [...]
 reverse link java.lang.Cloneable to org.apache.wiki.api.core.Page--><path codeLine="38" d="M68.41,77.93 C72.59,92.29 77.7,109.82 83.23,128.79 " fill="none" id="java.lang.Cloneable-backto-org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="61.62,79.67,62.75,58.51,75.07,75.75,61.62,79.67" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[04516322384a5dd4d9bce00113326595]
-reverse link java.lang.Comparable to org.apache.wiki.api.core.Page--><path codeLine="39" d="M204.37,88.39 C200.79,100.52 196.72,114.3 192.41,128.92 " fill="none" id="java.lang.Comparable-backto-org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="197.69,86.3,210.06,69.1,211.11,90.26,197.69,86.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x=" [...]
+reverse link java.lang.Comparable to org.apache.wiki.api.core.Page--><path codeLine="39" d="M204.37,88.39 C200.79,100.52 196.72,114.3 192.41,128.92 " fill="none" id="java.lang.Comparable-backto-org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="197.69,86.3,210.06,69.1,211.11,90.26,197.69,86.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -54,5 +54,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Session.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Session.svg
index 9e4e922ded..634a97f91a 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Session.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/Session.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="505px" preserveAspectRatio="none" style="width:335px;height:505px;background:#FFFFFF;" version="1.1" viewBox="0 0 335 505" width="335px" zoomAndPan="magnify"><defs><filter height="300%" id="fuzwpd5kejehi" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.core.Session--><a href="Session.html" target="_top" title="Session.html" xlink:actuate="onRequest" xlink:href="Session.html" xlink:show="new" xlink:title="Session.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fuzwpd5kejehi)" height="348.4453" id="org.apache.wiki.api.core.Session" style="stroke:#A80036;stroke-width:1.5;" width="314" x="7" y="126"/><ellipse cx="99.25" cy="144.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;str [...]
 class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventListener.html" target="_top" title="../../event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="../../event/WikiEventListener.html" xlink:show="new" xlink:title="../../event/WikiEventListener.html" xlink:type="simple"><rect codeLine="31" fill="#FEFECE" filter="url(#fuzwpd5kejehi)" height="58.7422" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x=" [...]
-reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.api.core.Session--><path codeLine="35" d="M164,86.39 C164,98.25 164,111.62 164,125.73 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.api.core.Session" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="157,86.23,164,66.23,171,86.23,157,86.23" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacin [...]
+reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.api.core.Session--><path codeLine="35" d="M164,86.39 C164,98.25 164,111.62 164,125.73 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.api.core.Session" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="157,86.23,164,66.23,171,86.23,157,86.23" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacin [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -48,5 +48,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/package.svg
index 9069ac8b61..6b434712b5 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/core/package.svg
@@ -1,31 +1,102 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1422px" preserveAspectRatio="none" style="width:1646px;height:1422px;background:#FFFFFF;" version="1.1" viewBox="0 0 1646 1422" width="1646px" zoomAndPan="magnify"><defs><filter height="300%" id="f1cdctzrqx9u5w" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdD [...]
-cluster org.apache.wiki.api.core--><polygon fill="#FFFFFF" filter="url(#f1cdctzrqx9u5w)" points="111.65,142,311.65,142,318.65,164.2969,1629.65,164.2969,1629.65,1399,111.65,1399,111.65,142" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="111.65" x2="318.65" y1="164.2969" y2="164.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="194" x="115.65" y="156.9951">org.apache.wiki.a [...]
-cluster java.lang--><polygon fill="#FFFFFF" filter="url(#f1cdctzrqx9u5w)" points="312.65,6,387.65,6,394.65,28.2969,601.65,28.2969,601.65,118,312.65,118,312.65,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="312.65" x2="394.65" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69" x="316.65" y="20.9951">java.lang</text><!--MD5=[73faa91e05492c377d11153 [...]
-cluster org.apache.wiki.event--><polygon fill="#FFFFFF" filter="url(#f1cdctzrqx9u5w)" points="706.65,6,887.65,6,894.65,28.2969,954.65,28.2969,954.65,118,706.65,118,706.65,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="706.65" x2="894.65" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="175" x="710.65" y="20.9951">org.apache.wiki.event</text><!--MD5 [...]
-class org.apache.wiki.api.core.Command--><a href="Command.html" target="_top" title="Command.html" xlink:actuate="onRequest" xlink:href="Command.html" xlink:show="new" xlink:title="Command.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="150.4375" id="org.apache.wiki.api.core.Command" style="stroke:#A80036;stroke-width:1.5;" width="242" x="127.65" y="459"/><ellipse cx="213.4" cy="475" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;st [...]
-class org.apache.wiki.api.core.Acl--><a href="Acl.html" target="_top" title="Acl.html" xlink:actuate="onRequest" xlink:href="Acl.html" xlink:show="new" xlink:title="Acl.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="124.8281" id="org.apache.wiki.api.core.Acl" style="stroke:#A80036;stroke-width:1.5;" width="235" x="1023.15" y="471.5"/><ellipse cx="1127.4" cy="487.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/ [...]
-class org.apache.wiki.api.core.Engine--><a href="Engine.html" target="_top" title="Engine.html" xlink:actuate="onRequest" xlink:href="Engine.html" xlink:show="new" xlink:title="Engine.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="713.8438" id="org.apache.wiki.api.core.Engine" style="stroke:#A80036;stroke-width:1.5;" width="320" x="1293.65" y="177"/><ellipse cx="1427.9" cy="193" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;strok [...]
-class org.apache.wiki.api.core.Attachment--><a href="Attachment.html" target="_top" title="Attachment.html" xlink:actuate="onRequest" xlink:href="Attachment.html" xlink:show="new" xlink:title="Attachment.html" xlink:type="simple"><rect codeLine="78" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="112.0234" id="org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="187" x="471.15" y="1111"/><ellipse cx="523.9" cy="1127" fill="#B4A7E5" rx="11" ry="11" sty [...]
-class org.apache.wiki.api.core.Context--><a href="Context.html" target="_top" title="Context.html" xlink:actuate="onRequest" xlink:href="Context.html" xlink:show="new" xlink:title="Context.html" xlink:type="simple"><rect codeLine="86" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="380.9219" id="org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.5;" width="309" x="127.15" y="976.5"/><ellipse cx="252.9" cy="992.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A800 [...]
-class org.apache.wiki.api.core.AclEntry--><a href="AclEntry.html" target="_top" title="AclEntry.html" xlink:actuate="onRequest" xlink:href="AclEntry.html" xlink:show="new" xlink:title="AclEntry.html" xlink:type="simple"><rect codeLine="115" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="124.8281" id="org.apache.wiki.api.core.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="262" x="1009.65" y="1104.5"/><ellipse cx="1110.9" cy="1120.5" fill="#B4A7E5" rx="11" ry="11" style="s [...]
-class org.apache.wiki.api.core.ContextEnum--><a href="ContextEnum.html" target="_top" title="ContextEnum.html" xlink:actuate="onRequest" xlink:href="ContextEnum.html" xlink:show="new" xlink:title="ContextEnum.html" xlink:type="simple"><rect codeLine="124" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="432.1406" id="org.apache.wiki.api.core.ContextEnum" style="stroke:#A80036;stroke-width:1.5;" width="191" x="1307.15" y="951"/><ellipse cx="1356.9" cy="967" fill="#EB937F" rx="11" ry=" [...]
-class org.apache.wiki.api.core.Page--><a href="Page.html" target="_top" title="Page.html" xlink:actuate="onRequest" xlink:href="Page.html" xlink:show="new" xlink:title="Page.html" xlink:type="simple"><rect codeLine="157" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="368.1172" id="org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.5;" width="233" x="405.15" y="350"/><ellipse cx="501.9" cy="366" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;" [...]
-class org.apache.wiki.api.core.Session--><a href="Session.html" target="_top" title="Session.html" xlink:actuate="onRequest" xlink:href="Session.html" xlink:show="new" xlink:title="Session.html" xlink:type="simple"><rect codeLine="185" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="342.5078" id="org.apache.wiki.api.core.Session" style="stroke:#A80036;stroke-width:1.5;" width="314" x="673.65" y="362.5"/><ellipse cx="802.9" cy="378.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80 [...]
-class java.lang.Cloneable--><rect codeLine="220" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="48" id="java.lang.Cloneable" style="stroke:#A80036;stroke-width:1.5;" width="94" x="328.65" y="47.5"/><ellipse cx="343.65" cy="63.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M339.5719,59.2656 L339.5719,57.1094 L346.9625,57.1094 L346.9625,59.2656 L344.4938,59.2656 L344.4938,67.3438 L346.9625,67.3438 L346.9625,69.5 L339.5719,69.5 L339.5719,67.3438 L [...]
-class java.lang.Comparable--><rect codeLine="221" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="60.8047" id="java.lang.Comparable" style="stroke:#A80036;stroke-width:1.5;" width="127" x="458.15" y="41"/><ellipse cx="477.2" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M473.1219,52.7656 L473.1219,50.6094 L480.5125,50.6094 L480.5125,52.7656 L478.0438,52.7656 L478.0438,60.8438 L480.5125,60.8438 L480.5125,63 L473.1219,63 L473.1219,60.8438 L4 [...]
-class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventListener.html" target="_top" title="../../event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="../../event/WikiEventListener.html" xlink:show="new" xlink:title="../../event/WikiEventListener.html" xlink:type="simple"><rect codeLine="227" fill="#FEFECE" filter="url(#f1cdctzrqx9u5w)" height="60.8047" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x [...]
-reverse link org.apache.wiki.api.core.Page to org.apache.wiki.api.core.Attachment--><path codeLine="211" d="M535.52,738.58 C544.4,868.83 555.27,1028.32 560.88,1110.76 " fill="none" id="org.apache.wiki.api.core.Page-backto-org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="528.52,738.79,534.14,718.36,542.49,737.84,528.52,738.79" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c447a0a60ab8a57de3e59d6a2cd977e9]
-reverse link java.lang.Cloneable to org.apache.wiki.api.core.Context--><path codeLine="212" d="M308.27,78.71 C238.05,86.75 134.9,103.48 110.65,134 C6,265.71 64.46,729.24 110.65,891 C118.91,919.92 131.18,948.77 145.43,976.3 " fill="none" id="java.lang.Cloneable-backto-org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="307.81,71.72,328.44,76.54,309.31,85.64,307.81,71.72" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[cc6b7c4b7fc80b6 [...]
-reverse link org.apache.wiki.api.core.Command to org.apache.wiki.api.core.Context--><path codeLine="213" d="M253.58,629.37 C258.36,720.73 265.74,861.87 271.74,976.48 " fill="none" id="org.apache.wiki.api.core.Command-backto-org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="246.59,629.58,252.53,609.24,260.57,628.85,246.59,629.58" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[abee0a9c52865bc1aaa0cc428ae6afc7]
-reverse link java.lang.Cloneable to org.apache.wiki.api.core.Page--><path codeLine="214" d="M389.1,114.92 C406.05,168.4 436.29,263.76 463.6,349.92 " fill="none" id="java.lang.Cloneable-backto-org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="382.36,116.83,382.99,95.65,395.71,112.6,382.36,116.83" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[04516322384a5dd4d9bce00113326595]
-reverse link java.lang.Comparable to org.apache.wiki.api.core.Page--><path codeLine="215" d="M521.65,122.01 C521.65,176.51 521.65,267.33 521.65,349.75 " fill="none" id="java.lang.Comparable-backto-org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="514.65,122.01,521.65,102.01,528.65,122.01,514.65,122.01" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5457cc28490aa9fc92acb289d7220e64]
-reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.api.core.Session--><path codeLine="216" d="M830.65,122.25 C830.65,179.55 830.65,276.79 830.65,362.28 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.api.core.Session" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="823.65,122.01,830.65,102.01,837.65,122.01,823.65,122.01" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3fd19a5de215e38eeba8ee71d75aff7e]
-link org.apache.wiki.api.core.Acl to org.apache.wiki.api.core.Engine--><!--MD5=[ef55adac95338a890dbfcba34374bb75]
-link org.apache.wiki.api.core.Acl to org.apache.wiki.api.core.AclEntry--><!--MD5=[aa8e482980a225f055bd026869eb9abc]
-link org.apache.wiki.api.core.AclEntry to org.apache.wiki.api.core.ContextEnum--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="720.825" y="1414.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[d7a50528d6fac3d9a64f8d731094fa80]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1422px" preserveAspectRatio="none" style="width:1556px;height:1422px;background:#FFFFFF;" version="1.1" viewBox="0 0 1556 1422" width="1556px" zoomAndPan="magnify"><defs><filter height="300%" id="f17iejd6grp7z2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdD [...]
+cluster org.apache.wiki.api.core--><polygon fill="#FFFFFF" filter="url(#f17iejd6grp7z2)" points="16,142,216,142,223,164.2969,1405,164.2969,1405,1399,16,1399,16,142" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="223" y1="164.2969" y2="164.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="194" x="20" y="156.9951">org.apache.wiki.api.core</text><!--MD5=[aa8f7b917213 [...]
+cluster java.lang--><polygon fill="#FFFFFF" filter="url(#f17iejd6grp7z2)" points="418,6,493,6,500,28.2969,707,28.2969,707,118,418,118,418,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="418" x2="500" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69" x="422" y="20.9951">java.lang</text><!--MD5=[73faa91e05492c377d111539776da6fd]
+cluster org.apache.wiki.event--><polygon fill="#FFFFFF" filter="url(#f17iejd6grp7z2)" points="65,6,246,6,253,28.2969,313,28.2969,313,118,65,118,65,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="65" x2="253" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="175" x="69" y="20.9951">org.apache.wiki.event</text><!--MD5=[07c66f7fa7c432145e668262fdfa9f38]
+class org.apache.wiki.api.core.Acl--><a href="Acl.html" target="_top" title="Acl.html" xlink:actuate="onRequest" xlink:href="Acl.html" xlink:show="new" xlink:title="Acl.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="124.8281" id="org.apache.wiki.api.core.Acl" style="stroke:#A80036;stroke-width:1.5;" width="235" x="649.5" y="330.5"/><ellipse cx="753.75" cy="346.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><p [...]
+class org.apache.wiki.api.core.Page--><a href="Page.html" target="_top" title="Page.html" xlink:actuate="onRequest" xlink:href="Page.html" xlink:show="new" xlink:title="Page.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="368.1172" id="org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.5;" width="233" x="381.5" y="209"/><ellipse cx="478.25" cy="225" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/ [...]
+class org.apache.wiki.api.core.Session--><a href="Session.html" target="_top" title="Session.html" xlink:actuate="onRequest" xlink:href="Session.html" xlink:show="new" xlink:title="Session.html" xlink:type="simple"><rect codeLine="40" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="342.5078" id="org.apache.wiki.api.core.Session" style="stroke:#A80036;stroke-width:1.5;" width="314" x="32" y="221.5"/><ellipse cx="161.25" cy="237.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036; [...]
+class org.apache.wiki.api.core.Attachment--><a href="Attachment.html" target="_top" title="Attachment.html" xlink:actuate="onRequest" xlink:href="Attachment.html" xlink:show="new" xlink:title="Attachment.html" xlink:type="simple"><rect codeLine="66" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="112.0234" id="org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="187" x="205.5" y="970"/><ellipse cx="258.25" cy="986" fill="#B4A7E5" rx="11" ry="11" style [...]
+class org.apache.wiki.api.core.Command--><a href="Command.html" target="_top" title="Command.html" xlink:actuate="onRequest" xlink:href="Command.html" xlink:show="new" xlink:title="Command.html" xlink:type="simple"><rect codeLine="74" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="150.4375" id="org.apache.wiki.api.core.Command" style="stroke:#A80036;stroke-width:1.5;" width="242" x="920" y="318"/><ellipse cx="1005.75" cy="334" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;st [...]
+class org.apache.wiki.api.core.ContextEnum--><a href="ContextEnum.html" target="_top" title="ContextEnum.html" xlink:actuate="onRequest" xlink:href="ContextEnum.html" xlink:show="new" xlink:title="ContextEnum.html" xlink:type="simple"><rect codeLine="85" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="432.1406" id="org.apache.wiki.api.core.ContextEnum" style="stroke:#A80036;stroke-width:1.5;" width="191" x="1197.5" y="177"/><ellipse cx="1247.25" cy="193" fill="#EB937F" rx="11" ry="1 [...]
+class org.apache.wiki.api.core.Context--><a href="Context.html" target="_top" title="Context.html" xlink:actuate="onRequest" xlink:href="Context.html" xlink:show="new" xlink:title="Context.html" xlink:type="simple"><rect codeLine="118" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="380.9219" id="org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.5;" width="309" x="1080.5" y="835.5"/><ellipse cx="1206.25" cy="851.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A [...]
+class org.apache.wiki.api.core.Engine--><a href="Engine.html" target="_top" title="Engine.html" xlink:actuate="onRequest" xlink:href="Engine.html" xlink:show="new" xlink:title="Engine.html" xlink:type="simple"><rect codeLine="147" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="713.8438" id="org.apache.wiki.api.core.Engine" style="stroke:#A80036;stroke-width:1.5;" width="320" x="428" y="669"/><ellipse cx="562.25" cy="685" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-w [...]
+class org.apache.wiki.api.core.AclEntry--><a href="AclEntry.html" target="_top" title="AclEntry.html" xlink:actuate="onRequest" xlink:href="AclEntry.html" xlink:show="new" xlink:title="AclEntry.html" xlink:type="simple"><rect codeLine="202" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="124.8281" id="org.apache.wiki.api.core.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="262" x="783" y="963.5"/><ellipse cx="884.25" cy="979.5" fill="#B4A7E5" rx="11" ry="11" style="stroke: [...]
+class java.lang.Cloneable--><rect codeLine="220" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="48" id="java.lang.Cloneable" style="stroke:#A80036;stroke-width:1.5;" width="94" x="597" y="47.5"/><ellipse cx="612" cy="63.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M607.9219,59.2656 L607.9219,57.1094 L615.3125,57.1094 L615.3125,59.2656 L612.8438,59.2656 L612.8438,67.3438 L615.3125,67.3438 L615.3125,69.5 L607.9219,69.5 L607.9219,67.3438 L610.39 [...]
+class java.lang.Comparable--><rect codeLine="221" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="60.8047" id="java.lang.Comparable" style="stroke:#A80036;stroke-width:1.5;" width="127" x="434.5" y="41"/><ellipse cx="453.55" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M449.4719,52.7656 L449.4719,50.6094 L456.8625,50.6094 L456.8625,52.7656 L454.3938,52.7656 L454.3938,60.8438 L456.8625,60.8438 L456.8625,63 L449.4719,63 L449.4719,60.8438 L4 [...]
+class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventListener.html" target="_top" title="../../event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="../../event/WikiEventListener.html" xlink:show="new" xlink:title="../../event/WikiEventListener.html" xlink:type="simple"><rect codeLine="227" fill="#FEFECE" filter="url(#f17iejd6grp7z2)" height="60.8047" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x [...]
+reverse link java.lang.Cloneable to org.apache.wiki.api.core.Page--><path codeLine="211" d="M624.92,114.26 C613.42,139.42 597.89,173.4 581.64,208.96 " fill="none" id="java.lang.Cloneable-backto-org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="618.7,111.02,633.38,95.74,631.44,116.84,618.7,111.02" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[04516322384a5dd4d9bce00113326595]
+reverse link java.lang.Comparable to org.apache.wiki.api.core.Page--><path codeLine="212" d="M498,122.41 C498,146.47 498,176.97 498,208.74 " fill="none" id="java.lang.Comparable-backto-org.apache.wiki.api.core.Page" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="491,122.27,498,102.27,505,122.27,491,122.27" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5457cc28490aa9fc92acb289d7220e64]
+reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.api.core.Session--><path codeLine="213" d="M189,122.58 C189,149.75 189,185.1 189,221.21 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.api.core.Session" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="182,122.27,189,102.27,196,122.27,182,122.27" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[805e02b0a1697296907965da1db9c938]
+reverse link org.apache.wiki.api.core.Page to org.apache.wiki.api.core.Attachment--><path codeLine="214" d="M433.03,596.45 C425.24,620.88 417.42,645.5 410,669 C376.41,775.34 337.77,899.75 316.08,969.77 " fill="none" id="org.apache.wiki.api.core.Page-backto-org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="426.37,594.29,439.11,577.37,439.71,598.55,426.37,594.29" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c447a0a60ab8a57de3e [...]
+reverse link java.lang.Cloneable to org.apache.wiki.api.core.Context--><path codeLine="215" d="M711.42,72.84 C889.04,74.45 1359.38,83.47 1406,134 C1549.15,289.17 1446.91,401.89 1406,609 C1390.85,685.7 1361.39,766.04 1331.14,835.44 " fill="none" id="java.lang.Cloneable-backto-org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="711.21,79.84,691.26,72.68,711.32,65.84,711.21,79.84" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[cc6b7c4 [...]
+reverse link org.apache.wiki.api.core.Command to org.apache.wiki.api.core.Context--><path codeLine="216" d="M1069.75,487.5 C1097.83,578.84 1141.39,720.51 1176.73,835.48 " fill="none" id="org.apache.wiki.api.core.Command-backto-org.apache.wiki.api.core.Context" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1063.01,489.41,1063.82,468.24,1076.39,485.3,1063.01,489.41" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[acf9567c07885cd35bb5c52f0b43921a]
+link org.apache.wiki.api.core.Acl to org.apache.wiki.api.core.ContextEnum--><!--MD5=[3fd19a5de215e38eeba8ee71d75aff7e]
+link org.apache.wiki.api.core.Acl to org.apache.wiki.api.core.Engine--><!--MD5=[5118edd54c2801b15afdcb8d28980a05]
+link org.apache.wiki.api.core.Engine to org.apache.wiki.api.core.AclEntry--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="675.575" y="1414.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[7cc2fd1234d57cce5e79ca48968cca67]
 @startuml
     namespace org.apache.wiki.api.core {
 
+        interface Acl [[Acl.html]] {
+            {abstract} +addEntry(AclEntry): boolean
+            {abstract} +aclEntries(): Enumeration<AclEntry>
+            {abstract} +isEmpty(): boolean
+            {abstract} +findPrincipals(Permission): Principal[]
+            {abstract} +getAclEntry(Principal): AclEntry
+            {abstract} +removeEntry(AclEntry): boolean
+        }
+
+        interface Page [[Page.html]] {
+            {static} +DESCRIPTION: String
+            {static} +ALIAS: String
+            {static} +REDIRECT: String
+            {static} +AUTHOR: String
+            {static} +CHANGENOTE: String
+            {static} +VIEWCOUNT: String
+            {abstract} +getName(): String
+            {abstract} +getLastModified(): Date
+            {abstract} +setLastModified(Date): void
+            {abstract} +setVersion(int): void
+            {abstract} +getVersion(): int
+            {abstract} +getSize(): long
+            {abstract} +setSize(long): void
+            {abstract} +setAuthor(String): void
+            {abstract} +getAuthor(): String
+            {abstract} +getWiki(): String
+            {abstract} +invalidateMetadata(): void
+            {abstract} +hasMetadata(): boolean
+            {abstract} +setHasMetadata(): void
+            {abstract} +getAttribute(String): T
+            {abstract} +setAttribute(String, Object): void
+            {abstract} +removeAttribute(String): T
+            {abstract} +getAttributes(): Map<String, Object>
+            {abstract} +getAcl(): Acl
+            {abstract} +setAcl(Acl): void
+        }
+
+        interface Session [[Session.html]] {
+            {static} +ANONYMOUS: String
+            {static} +ASSERTED: String
+            {static} +AUTHENTICATED: String
+            {abstract} +isAsserted(): boolean
+            {abstract} +isAuthenticated(): boolean
+            {abstract} +isAnonymous(): boolean
+            {abstract} +getLoginPrincipal(): Principal
+            {abstract} +getUserPrincipal(): Principal
+            {abstract} +antiCsrfToken(): String
+            {abstract} +getLocale(): Locale
+            {abstract} +addMessage(String): void
+            {abstract} +addMessage(String, String): void
+            {abstract} +clearMessages(): void
+            {abstract} +clearMessages(String): void
+            {abstract} +getMessages(): String[]
+            {abstract} +getMessages(String): String[]
+            {abstract} +getPrincipals(): Principal[]
+            {abstract} +getRoles(): Principal[]
+            {abstract} +hasPrincipal(Principal): boolean
+            {abstract} +invalidate(): void
+            {abstract} +getStatus(): String
+            {abstract} +getSubject(): Subject
+            {static} +doPrivileged(Session, PrivilegedAction<?>): Object
+        }
+
+        interface Attachment [[Attachment.html]] {
+            {abstract} +getFileName(): String
+            {abstract} +setFileName(String): void
+            {abstract} +getParentName(): String
+            {abstract} +isCacheable(): boolean
+            {abstract} +setCacheable(boolean): void
+        }
+
         interface Command [[Command.html]] {
             {abstract} +targetedCommand(Object): Command
             {abstract} +getContentTemplate(): String
@@ -37,13 +108,66 @@ link org.apache.wiki.api.core.AclEntry to org.apache.wiki.api.core.ContextEnum--
             {abstract} +getURLPattern(): String
         }
 
-        interface Acl [[Acl.html]] {
-            {abstract} +addEntry(AclEntry): boolean
-            {abstract} +aclEntries(): Enumeration<AclEntry>
-            {abstract} +isEmpty(): boolean
-            {abstract} +findPrincipals(Permission): Principal[]
-            {abstract} +getAclEntry(Principal): AclEntry
-            {abstract} +removeEntry(AclEntry): boolean
+        enum ContextEnum [[ContextEnum.html]] {
+            {static} +GROUP_DELETE
+            {static} +GROUP_EDIT
+            {static} +GROUP_VIEW
+            {static} +PAGE_ATTACH
+            {static} +PAGE_COMMENT
+            {static} +PAGE_CONFLICT
+            {static} +PAGE_DELETE
+            {static} +PAGE_DIFF
+            {static} +PAGE_EDIT
+            {static} +PAGE_INFO
+            {static} +PAGE_NONE
+            {static} +PAGE_PREVIEW
+            {static} +PAGE_RENAME
+            {static} +PAGE_RSS
+            {static} +PAGE_UPLOAD
+            {static} +PAGE_VIEW
+            {static} +REDIRECT
+            {static} +WIKI_ADMIN
+            {static} +WIKI_CREATE_GROUP
+            {static} +WIKI_ERROR
+            {static} +WIKI_FIND
+            {static} +WIKI_INSTALL
+            {static} +WIKI_LOGIN
+            {static} +WIKI_LOGOUT
+            {static} +WIKI_MESSAGE
+            {static} +WIKI_PREFS
+            {static} +WIKI_WORKFLOW
+            +getContentTemplate(): String
+            +getRequestContext(): String
+            +getUrlPattern(): String
+        }
+
+        interface Context [[Context.html]] {
+            {static} +ATTR_CONTEXT: String
+            {static} +VAR_EXECUTE_PLUGINS: String
+            {static} +VAR_WYSIWYG_EDITOR_MODE: String
+            {abstract} +getPage(): Page
+            {abstract} +setPage(Page): void
+            {abstract} +getRealPage(): Page
+            {abstract} +setRealPage(Page): Page
+            {abstract} +getEngine(): Engine
+            {abstract} +setRequestContext(String): void
+            {abstract} +getVariable(String): T
+            {abstract} +setVariable(String, Object): void
+            {abstract} +getBooleanWikiProperty(String, boolean): boolean
+            {abstract} +getHttpParameter(String): String
+            {abstract} +getHttpRequest(): HttpServletRequest
+            {abstract} +setTemplate(String): void
+            {abstract} +getTemplate(): String
+            {abstract} +getWikiSession(): Session
+            {abstract} +getCurrentUser(): Principal
+            {abstract} +hasAdminPermissions(): boolean
+            {abstract} +getViewURL(String): String
+            {abstract} +getRedirectURL(): String
+            {abstract} +getCommand(): Command
+            +getURL(String, String): String
+            +getURL(String, String, String): String
+            {abstract} +deepClone(): Context
+            {static} +findContext(PageContext): Context
         }
 
         interface Engine [[Engine.html]] {
@@ -101,43 +225,6 @@ link org.apache.wiki.api.core.AclEntry to org.apache.wiki.api.core.ContextEnum--
             {abstract} +shutdown(): void
         }
 
-        interface Attachment [[Attachment.html]] {
-            {abstract} +getFileName(): String
-            {abstract} +setFileName(String): void
-            {abstract} +getParentName(): String
-            {abstract} +isCacheable(): boolean
-            {abstract} +setCacheable(boolean): void
-        }
-
-        interface Context [[Context.html]] {
-            {static} +ATTR_CONTEXT: String
-            {static} +VAR_EXECUTE_PLUGINS: String
-            {static} +VAR_WYSIWYG_EDITOR_MODE: String
-            {abstract} +getPage(): Page
-            {abstract} +setPage(Page): void
-            {abstract} +getRealPage(): Page
-            {abstract} +setRealPage(Page): Page
-            {abstract} +getEngine(): Engine
-            {abstract} +setRequestContext(String): void
-            {abstract} +getVariable(String): T
-            {abstract} +setVariable(String, Object): void
-            {abstract} +getBooleanWikiProperty(String, boolean): boolean
-            {abstract} +getHttpParameter(String): String
-            {abstract} +getHttpRequest(): HttpServletRequest
-            {abstract} +setTemplate(String): void
-            {abstract} +getTemplate(): String
-            {abstract} +getWikiSession(): Session
-            {abstract} +getCurrentUser(): Principal
-            {abstract} +hasAdminPermissions(): boolean
-            {abstract} +getViewURL(String): String
-            {abstract} +getRedirectURL(): String
-            {abstract} +getCommand(): Command
-            +getURL(String, String): String
-            +getURL(String, String, String): String
-            {abstract} +deepClone(): Context
-            {static} +findContext(PageContext): Context
-        }
-
         interface AclEntry [[AclEntry.html]] {
             {abstract} +addPermission(Permission): boolean
             {abstract} +checkPermission(Permission): boolean
@@ -147,99 +234,12 @@ link org.apache.wiki.api.core.AclEntry to org.apache.wiki.api.core.ContextEnum--
             {abstract} +setPrincipal(Principal): boolean
         }
 
-        enum ContextEnum [[ContextEnum.html]] {
-            {static} +GROUP_DELETE
-            {static} +GROUP_EDIT
-            {static} +GROUP_VIEW
-            {static} +PAGE_ATTACH
-            {static} +PAGE_COMMENT
-            {static} +PAGE_CONFLICT
-            {static} +PAGE_DELETE
-            {static} +PAGE_DIFF
-            {static} +PAGE_EDIT
-            {static} +PAGE_INFO
-            {static} +PAGE_NONE
-            {static} +PAGE_PREVIEW
-            {static} +PAGE_RENAME
-            {static} +PAGE_RSS
-            {static} +PAGE_UPLOAD
-            {static} +PAGE_VIEW
-            {static} +REDIRECT
-            {static} +WIKI_ADMIN
-            {static} +WIKI_CREATE_GROUP
-            {static} +WIKI_ERROR
-            {static} +WIKI_FIND
-            {static} +WIKI_INSTALL
-            {static} +WIKI_LOGIN
-            {static} +WIKI_LOGOUT
-            {static} +WIKI_MESSAGE
-            {static} +WIKI_PREFS
-            {static} +WIKI_WORKFLOW
-            +getContentTemplate(): String
-            +getRequestContext(): String
-            +getUrlPattern(): String
-        }
-
-        interface Page [[Page.html]] {
-            {static} +DESCRIPTION: String
-            {static} +ALIAS: String
-            {static} +REDIRECT: String
-            {static} +AUTHOR: String
-            {static} +CHANGENOTE: String
-            {static} +VIEWCOUNT: String
-            {abstract} +getName(): String
-            {abstract} +getLastModified(): Date
-            {abstract} +setLastModified(Date): void
-            {abstract} +setVersion(int): void
-            {abstract} +getVersion(): int
-            {abstract} +getSize(): long
-            {abstract} +setSize(long): void
-            {abstract} +setAuthor(String): void
-            {abstract} +getAuthor(): String
-            {abstract} +getWiki(): String
-            {abstract} +invalidateMetadata(): void
-            {abstract} +hasMetadata(): boolean
-            {abstract} +setHasMetadata(): void
-            {abstract} +getAttribute(String): T
-            {abstract} +setAttribute(String, Object): void
-            {abstract} +removeAttribute(String): T
-            {abstract} +getAttributes(): Map<String, Object>
-            {abstract} +getAcl(): Acl
-            {abstract} +setAcl(Acl): void
-        }
-
-        interface Session [[Session.html]] {
-            {static} +ANONYMOUS: String
-            {static} +ASSERTED: String
-            {static} +AUTHENTICATED: String
-            {abstract} +isAsserted(): boolean
-            {abstract} +isAuthenticated(): boolean
-            {abstract} +isAnonymous(): boolean
-            {abstract} +getLoginPrincipal(): Principal
-            {abstract} +getUserPrincipal(): Principal
-            {abstract} +antiCsrfToken(): String
-            {abstract} +getLocale(): Locale
-            {abstract} +addMessage(String): void
-            {abstract} +addMessage(String, String): void
-            {abstract} +clearMessages(): void
-            {abstract} +clearMessages(String): void
-            {abstract} +getMessages(): String[]
-            {abstract} +getMessages(String): String[]
-            {abstract} +getPrincipals(): Principal[]
-            {abstract} +getRoles(): Principal[]
-            {abstract} +hasPrincipal(Principal): boolean
-            {abstract} +invalidate(): void
-            {abstract} +getStatus(): String
-            {abstract} +getSubject(): Subject
-            {static} +doPrivileged(Session, PrivilegedAction<?>): Object
-        }
-
-        Page <|- - Attachment
-        java.lang.Cloneable <|- - Context
-        Command <|- - Context
         java.lang.Cloneable <|- - Page
         java.lang.Comparable <|- - Page
         org.apache.wiki.event.WikiEventListener <|- - Session
+        Page <|- - Attachment
+        java.lang.Cloneable <|- - Context
+        Command <|- - Context
     }
 
     namespace java.lang {
@@ -264,5 +264,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/EngineLifecycleExtension.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/EngineLifecycleExtension.svg
index 6c4a8542ea..a645f0f305 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/EngineLifecycleExtension.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/EngineLifecycleExtension.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="116px" preserveAspectRatio="none" style="width:261px;height:116px;background:#FFFFFF;" version="1.1" viewBox="0 0 261 116" width="261px" zoomAndPan="magnify"><defs><filter height="300%" id="ftgwir3p14n4t" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.engine.EngineLifecycleExtension--><a href="EngineLifecycleExtension.html" target="_top" title="EngineLifecycleExtension.html" xlink:actuate="onRequest" xlink:href="EngineLifecycleExtension.html" xlink:show="new" xlink:title="EngineLifecycleExtension.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ftgwir3p14n4t)" height="84.3516" id="org.apache.wiki.api.engine.EngineLifecycleExtension" style="stroke:#A80036;stroke-width:1.5;" width="240"  [...]
+class org.apache.wiki.api.engine.EngineLifecycleExtension--><a href="EngineLifecycleExtension.html" target="_top" title="EngineLifecycleExtension.html" xlink:actuate="onRequest" xlink:href="EngineLifecycleExtension.html" xlink:show="new" xlink:title="EngineLifecycleExtension.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ftgwir3p14n4t)" height="84.3516" id="org.apache.wiki.api.engine.EngineLifecycleExtension" style="stroke:#A80036;stroke-width:1.5;" width="240"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/Initializable.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/Initializable.svg
index 786539da81..de29b6193d 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/Initializable.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/Initializable.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:237px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 237 90" width="237px" zoomAndPan="magnify"><defs><filter height="300%" id="f11voigahqcyz8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation= [...]
-class org.apache.wiki.api.engine.Initializable--><a href="Initializable.html" target="_top" title="Initializable.html" xlink:actuate="onRequest" xlink:href="Initializable.html" xlink:show="new" xlink:title="Initializable.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f11voigahqcyz8)" height="58.7422" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="7" y="7"/><ellipse cx="45.4" cy="25.9688" fill="#B4A7E5" rx="1 [...]
+class org.apache.wiki.api.engine.Initializable--><a href="Initializable.html" target="_top" title="Initializable.html" xlink:actuate="onRequest" xlink:href="Initializable.html" xlink:show="new" xlink:title="Initializable.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f11voigahqcyz8)" height="58.7422" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="7" y="7"/><ellipse cx="45.4" cy="25.9688" fill="#B4A7E5" rx="1 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/RenderApi.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/RenderApi.svg
index 7a790072e4..ec2273b594 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/RenderApi.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/RenderApi.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:247px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 247 90" width="247px" zoomAndPan="magnify"><defs><filter height="300%" id="ffc7hx50drp5g" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation=" [...]
-class org.apache.wiki.api.engine.RenderApi--><a href="RenderApi.html" target="_top" title="RenderApi.html" xlink:actuate="onRequest" xlink:href="RenderApi.html" xlink:show="new" xlink:title="RenderApi.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ffc7hx50drp5g)" height="58.7422" id="org.apache.wiki.api.engine.RenderApi" style="stroke:#A80036;stroke-width:1.5;" width="226" x="7" y="7"/><ellipse cx="49.9" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke: [...]
+class org.apache.wiki.api.engine.RenderApi--><a href="RenderApi.html" target="_top" title="RenderApi.html" xlink:actuate="onRequest" xlink:href="RenderApi.html" xlink:show="new" xlink:title="RenderApi.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ffc7hx50drp5g)" height="58.7422" id="org.apache.wiki.api.engine.RenderApi" style="stroke:#A80036;stroke-width:1.5;" width="226" x="7" y="7"/><ellipse cx="49.9" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke: [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/package.svg
index 6c075355e0..dab0cbc20b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/engine/package.svg
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="287px" preserveAspectRatio="none" style="width:556px;height:287px;background:#FFFFFF;" version="1.1" viewBox="0 0 556 287" width="556px" zoomAndPan="magnify"><defs><filter height="300%" id="fjjmsppzeevcp" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#fjjmsppzeevcp)" points="16,6,234,6,241,28.2969,539,28.2969,539,264,16,264,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="241" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="20" y="20.9951">org.apache.wiki.api.engine</text><!--MD5=[b42cfcd16e39a0fd6a37261d [...]
-class org.apache.wiki.api.engine.Initializable--><a href="Initializable.html" target="_top" title="Initializable.html" xlink:actuate="onRequest" xlink:href="Initializable.html" xlink:show="new" xlink:title="Initializable.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fjjmsppzeevcp)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="32" y="53.5"/><ellipse cx="100.75" cy="69.5" fill="#B4A7E5" rx= [...]
-class org.apache.wiki.api.engine.EngineLifecycleExtension--><a href="EngineLifecycleExtension.html" target="_top" title="EngineLifecycleExtension.html" xlink:actuate="onRequest" xlink:href="EngineLifecycleExtension.html" xlink:show="new" xlink:title="EngineLifecycleExtension.html" xlink:type="simple"><rect codeLine="7" fill="#FEFECE" filter="url(#fjjmsppzeevcp)" height="86.4141" id="org.apache.wiki.api.engine.EngineLifecycleExtension" style="stroke:#A80036;stroke-width:1.5;" width="240"  [...]
-class org.apache.wiki.api.engine.RenderApi--><a href="RenderApi.html" target="_top" title="RenderApi.html" xlink:actuate="onRequest" xlink:href="RenderApi.html" xlink:show="new" xlink:title="RenderApi.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#fjjmsppzeevcp)" height="60.8047" id="org.apache.wiki.api.engine.RenderApi" style="stroke:#A80036;stroke-width:1.5;" width="226" x="32" y="187"/><ellipse cx="108.75" cy="203" fill="#B4A7E5" rx="11" ry="11" style="strok [...]
-link org.apache.wiki.api.engine.Initializable to org.apache.wiki.api.engine.EngineLifecycleExtension--><!--MD5=[c234d20238c456149159dec5a79da5dd]
-link org.apache.wiki.api.engine.Initializable to org.apache.wiki.api.engine.RenderApi--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="175.5" y="279.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[ad36d15e2bfadf37d23a3c43d522e9d7]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="287px" preserveAspectRatio="none" style="width:556px;height:287px;background:#FFFFFF;" version="1.1" viewBox="0 0 556 287" width="556px" zoomAndPan="magnify"><defs><filter height="300%" id="f1t9qv6bb01z33" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#f1t9qv6bb01z33)" points="16,6,234,6,241,28.2969,539,28.2969,539,264,16,264,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="241" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="20" y="20.9951">org.apache.wiki.api.engine</text><!--MD5=[66016f6e0be98eb33bea034 [...]
+class org.apache.wiki.api.engine.EngineLifecycleExtension--><a href="EngineLifecycleExtension.html" target="_top" title="EngineLifecycleExtension.html" xlink:actuate="onRequest" xlink:href="EngineLifecycleExtension.html" xlink:show="new" xlink:title="EngineLifecycleExtension.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1t9qv6bb01z33)" height="86.4141" id="org.apache.wiki.api.engine.EngineLifecycleExtension" style="stroke:#A80036;stroke-width:1.5;" width="240" [...]
+class org.apache.wiki.api.engine.Initializable--><a href="Initializable.html" target="_top" title="Initializable.html" xlink:actuate="onRequest" xlink:href="Initializable.html" xlink:show="new" xlink:title="Initializable.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1t9qv6bb01z33)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="307" y="53.5"/><ellipse cx="375.75" cy="69.5" fill="#B4A7E5" r [...]
+class org.apache.wiki.api.engine.RenderApi--><a href="RenderApi.html" target="_top" title="RenderApi.html" xlink:actuate="onRequest" xlink:href="RenderApi.html" xlink:show="new" xlink:title="RenderApi.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#f1t9qv6bb01z33)" height="60.8047" id="org.apache.wiki.api.engine.RenderApi" style="stroke:#A80036;stroke-width:1.5;" width="226" x="39" y="187"/><ellipse cx="115.75" cy="203" fill="#B4A7E5" rx="11" ry="11" style="stro [...]
+link org.apache.wiki.api.engine.EngineLifecycleExtension to org.apache.wiki.api.engine.Initializable--><!--MD5=[775ed6056af401e28f76fb2d324f65e4]
+link org.apache.wiki.api.engine.EngineLifecycleExtension to org.apache.wiki.api.engine.RenderApi--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="175.5" y="279.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[c184cb330be1d8f231c2b1e55b693d39]
 @startuml
     namespace org.apache.wiki.api.engine {
 
-        interface Initializable [[Initializable.html]] {
-            {abstract} +initialize(Engine, Properties): void
-        }
-
         interface EngineLifecycleExtension [[EngineLifecycleExtension.html]] {
             +onInit(Properties): void
             +onStart(Engine, Properties): void
             +onShutdown(Engine, Properties): void
         }
 
+        interface Initializable [[Initializable.html]] {
+            {abstract} +initialize(Engine, Properties): void
+        }
+
         interface RenderApi [[RenderApi.html]] {
             {abstract} +textToHTML(Context, String): String
         }
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/events/CustomWikiEventListener.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/events/CustomWikiEventListener.svg
index 326e72a1ad..9583016598 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/events/CustomWikiEventListener.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/events/CustomWikiEventListener.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.api.events.CustomWikiEventListener--><a href="CustomWikiEv
 class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventListener.html" target="_top" title="../../event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="../../event/WikiEventListener.html" xlink:show="new" xlink:title="../../event/WikiEventListener.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1by33w9g20hm5)" height="58.7422" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x= [...]
 class org.apache.wiki.api.engine.Initializable--><a href="../engine/Initializable.html" target="_top" title="../engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../engine/Initializable.html" xlink:show="new" xlink:title="../engine/Initializable.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#f1by33w9g20hm5)" height="58.7422" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="257.5" y="7"/><ellips [...]
 reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.api.events.CustomWikiEventListener--><path codeLine="17" d="M156.78,80.63 C171.14,95.27 187.08,111.54 201.11,125.85 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.api.events.CustomWikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="151.56,85.3,142.55,66.11,161.55,75.49,151.56,85.3" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[47c43021a73be0 [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.api.events.CustomWikiEventListener--><path codeLine="18" d="M322.88,80.63 C308.41,95.27 292.34,111.54 278.19,125.85 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.api.events.CustomWikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="318.19,75.42,337.22,66.11,328.14,85.26,318.19,75.42" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888 [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.api.events.CustomWikiEventListener--><path codeLine="18" d="M322.88,80.63 C308.41,95.27 292.34,111.54 278.19,125.85 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.api.events.CustomWikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="318.19,75.42,337.22,66.11,328.14,85.26,318.19,75.42" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/events/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/events/package.svg
index 4798c2881f..ff7ae045e7 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/events/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/events/package.svg
@@ -7,7 +7,7 @@ class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventLi
 class org.apache.wiki.api.engine.Initializable--><a href="../engine/Initializable.html" target="_top" title="../engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../engine/Initializable.html" xlink:show="new" xlink:title="../engine/Initializable.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#f106ko4ih4h8uh)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="304" y="41"/><ellipse [...]
 reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.api.events.CustomWikiEventListener--><path codeLine="7" d="M181.89,116.87 C203.09,139.33 228.25,165.98 247.06,185.91 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.api.events.CustomWikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="176.61,121.48,167.97,102.13,186.79,111.87,176.61,121.48" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[47c4302 [...]
 reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.api.events.CustomWikiEventListener--><path codeLine="8" d="M369.49,116.87 C347.98,139.33 322.45,165.98 303.35,185.91 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.api.events.CustomWikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="364.72,111.73,383.61,102.13,374.83,121.41,364.72,111.73" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[85f7b [...]
-link org.apache.wiki.api.events.CustomWikiEventListener to org.apache.wiki.api.events.CustomWikiEventListener--><path codeLine="9" d="M374.71,201.71 C394.98,203.32 409.5,208.25 409.5,216.5 C409.5,224.04 397.37,228.81 379.81,230.8 " fill="none" id="org.apache.wiki.api.events.CustomWikiEventListener-to-org.apache.wiki.api.events.CustomWikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="374.71,231.29,384.0563,234.3959,379.6863,230.8038,383.2784,226.4 [...]
+link org.apache.wiki.api.events.CustomWikiEventListener to org.apache.wiki.api.events.CustomWikiEventListener--><path codeLine="9" d="M374.71,201.71 C394.98,203.32 409.5,208.25 409.5,216.5 C409.5,224.04 397.37,228.81 379.81,230.8 " fill="none" id="org.apache.wiki.api.events.CustomWikiEventListener-to-org.apache.wiki.api.events.CustomWikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="374.71,231.29,384.0563,234.3959,379.6863,230.8038,383.2784,226.4 [...]
 @startuml
     namespace org.apache.wiki.api.events {
 
@@ -41,5 +41,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/FilterException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/FilterException.svg
index 24cdffc841..260c85d727 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/FilterException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/FilterException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:202px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 202 194" width="202px" zoomAndPan="magnify"><defs><filter height="300%" id="fgnmff42acyaw" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.exceptions.FilterException--><a href="FilterException.html" target="_top" title="FilterException.html" xlink:actuate="onRequest" xlink:href="FilterException.html" xlink:show="new" xlink:title="FilterException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fgnmff42acyaw)" height="58.7422" id="org.apache.wiki.api.exceptions.FilterException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="10" y="105"/><ellipse cx="25" cy="123.9688" [...]
 class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#fgnmff42acyaw)" height="37.9375" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="10" y="7"/><ellipse cx="25" cy="25.9688" fill="#ADD1B2" [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.FilterException--><path codeLine="11" d="M99,65.22 C99,78.3 99,92.7 99,104.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.FilterException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="92,65.07,99,45.07,106,65.07,92,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-si [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.FilterException--><path codeLine="11" d="M99,65.22 C99,78.3 99,92.7 99,104.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.FilterException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="92,65.07,99,45.07,106,65.07,92,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-si [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/NoRequiredPropertyException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/NoRequiredPropertyException.svg
index 2bbb67645b..b99b98e065 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/NoRequiredPropertyException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/NoRequiredPropertyException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:298px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 298 194" width="298px" zoomAndPan="magnify"><defs><filter height="300%" id="f11g3txp0ler0a" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.api.exceptions.NoRequiredPropertyException--><a href="NoRequiredPropertyException.html" target="_top" title="NoRequiredPropertyException.html" xlink:actuate="onRequest" xlink:href="NoRequiredPropertyException.html" xlink:show="new" xlink:title="NoRequiredPropertyException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f11g3txp0ler0a)" height="58.7422" id="org.apache.wiki.api.exceptions.NoRequiredPropertyException" style="stroke:#A80036;stro [...]
 class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f11g3txp0ler0a)" height="37.9375" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="56.5" y="7"/><ellipse cx="71.5" cy="25.9688" fill="#AD [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.NoRequiredPropertyException--><path codeLine="11" d="M145.5,65.22 C145.5,78.3 145.5,92.7 145.5,104.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.NoRequiredPropertyException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="138.5,65.07,145.5,45.07,152.5,65.07,138.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text  [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.NoRequiredPropertyException--><path codeLine="11" d="M145.5,65.22 C145.5,78.3 145.5,92.7 145.5,104.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.NoRequiredPropertyException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="138.5,65.07,145.5,45.07,152.5,65.07,138.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/NoSuchVariableException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/NoSuchVariableException.svg
index c18c0403f0..4a549d148b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/NoSuchVariableException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/NoSuchVariableException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:232px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 232 194" width="232px" zoomAndPan="magnify"><defs><filter height="300%" id="fukh1jnxzxu30" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.exceptions.NoSuchVariableException--><a href="NoSuchVariableException.html" target="_top" title="NoSuchVariableException.html" xlink:actuate="onRequest" xlink:href="NoSuchVariableException.html" xlink:show="new" xlink:title="NoSuchVariableException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fukh1jnxzxu30)" height="58.7422" id="org.apache.wiki.api.exceptions.NoSuchVariableException" style="stroke:#A80036;stroke-width:1.5;" width="211 [...]
 class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#fukh1jnxzxu30)" height="37.9375" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="23.5" y="7"/><ellipse cx="38.5" cy="25.9688" fill="#ADD [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.NoSuchVariableException--><path codeLine="11" d="M112.5,65.22 C112.5,78.3 112.5,92.7 112.5,104.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.NoSuchVariableException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="105.5,65.07,112.5,45.07,119.5,65.07,105.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#8 [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.NoSuchVariableException--><path codeLine="11" d="M112.5,65.22 C112.5,78.3 112.5,92.7 112.5,104.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.NoSuchVariableException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="105.5,65.07,112.5,45.07,119.5,65.07,105.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#8 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/PluginException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/PluginException.svg
index 9c59bf7578..b4110d3d1f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/PluginException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/PluginException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="220px" preserveAspectRatio="none" style="width:244px;height:220px;background:#FFFFFF;" version="1.1" viewBox="0 0 244 220" width="244px" zoomAndPan="magnify"><defs><filter height="300%" id="f1pyt3a4ousxra" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.api.exceptions.PluginException--><a href="PluginException.html" target="_top" title="PluginException.html" xlink:actuate="onRequest" xlink:href="PluginException.html" xlink:show="new" xlink:title="PluginException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1pyt3a4ousxra)" height="84.3516" id="org.apache.wiki.api.exceptions.PluginException" style="stroke:#A80036;stroke-width:1.5;" width="223" x="7" y="105"/><ellipse cx="42.25" cy="123.96 [...]
 class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f1pyt3a4ousxra)" height="37.9375" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="29.5" y="7"/><ellipse cx="44.5" cy="25.9688" fill="#A [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.PluginException--><path codeLine="13" d="M118.5,65.54 C118.5,78.08 118.5,92.05 118.5,104.78 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.PluginException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="111.5,65.07,118.5,45.07,125.5,65.07,111.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-fa [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.PluginException--><path codeLine="13" d="M118.5,65.54 C118.5,78.08 118.5,92.05 118.5,104.78 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.PluginException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="111.5,65.07,118.5,45.07,125.5,65.07,111.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-fa [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/ProviderException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/ProviderException.svg
index 73e67feca0..5b16c6f022 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/ProviderException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/ProviderException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:202px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 202 194" width="202px" zoomAndPan="magnify"><defs><filter height="300%" id="f7xwvl7rkddl9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.exceptions.ProviderException--><a href="ProviderException.html" target="_top" title="ProviderException.html" xlink:actuate="onRequest" xlink:href="ProviderException.html" xlink:show="new" xlink:title="ProviderException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f7xwvl7rkddl9)" height="58.7422" id="org.apache.wiki.api.exceptions.ProviderException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="10" y="105"/><ellipse cx="25" c [...]
 class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f7xwvl7rkddl9)" height="37.9375" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="10" y="7"/><ellipse cx="25" cy="25.9688" fill="#ADD1B2" [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.ProviderException--><path codeLine="11" d="M99,65.22 C99,78.3 99,92.7 99,104.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.ProviderException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="92,65.07,99,45.07,106,65.07,92,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" fon [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.ProviderException--><path codeLine="11" d="M99,65.22 C99,78.3 99,92.7 99,104.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.ProviderException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="92,65.07,99,45.07,106,65.07,92,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" fon [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/RedirectException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/RedirectException.svg
index e608f2b708..16ded9d5a3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/RedirectException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/RedirectException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:231px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 231 207" width="231px" zoomAndPan="magnify"><defs><filter height="300%" id="f1grnxn6d6qk79" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.api.exceptions.RedirectException--><a href="RedirectException.html" target="_top" title="RedirectException.html" xlink:actuate="onRequest" xlink:href="RedirectException.html" xlink:show="new" xlink:title="RedirectException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1grnxn6d6qk79)" height="71.5469" id="org.apache.wiki.api.exceptions.RedirectException" style="stroke:#A80036;stroke-width:1.5;" width="210" x="7" y="105"/><ellipse cx="36.4" [...]
 class org.apache.wiki.api.exceptions.FilterException--><a href="FilterException.html" target="_top" title="FilterException.html" xlink:actuate="onRequest" xlink:href="FilterException.html" xlink:show="new" xlink:title="FilterException.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1grnxn6d6qk79)" height="37.9375" id="org.apache.wiki.api.exceptions.FilterException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="23" y="7"/><ellipse cx="38" cy="25.9688"  [...]
-reverse link org.apache.wiki.api.exceptions.FilterException to org.apache.wiki.api.exceptions.RedirectException--><path codeLine="12" d="M112,65.3 C112,78 112,92.08 112,104.56 " fill="none" id="org.apache.wiki.api.exceptions.FilterException-backto-org.apache.wiki.api.exceptions.RedirectException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="105,65.16,112,45.16,119,65.16,105,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-s [...]
+reverse link org.apache.wiki.api.exceptions.FilterException to org.apache.wiki.api.exceptions.RedirectException--><path codeLine="12" d="M112,65.3 C112,78 112,92.08 112,104.56 " fill="none" id="org.apache.wiki.api.exceptions.FilterException-backto-org.apache.wiki.api.exceptions.RedirectException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="105,65.16,112,45.16,119,65.16,105,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-s [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/WikiException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/WikiException.svg
index fb75b2c3f3..5235031e05 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/WikiException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/WikiException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:231px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 231 207" width="231px" zoomAndPan="magnify"><defs><filter height="300%" id="f1lmddbfqqrqij" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1lmddbfqqrqij)" height="71.5469" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="210" x="7" y="105"/><ellipse cx="36.4" cy="123.9688" fill="#AD [...]
 class java.lang.Exception--><rect codeLine="10" fill="#FEFECE" filter="url(#f1lmddbfqqrqij)" height="37.9375" id="java.lang.Exception" style="stroke:#A80036;stroke-width:1.5;" width="100" x="62" y="7"/><ellipse cx="77" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M79.9688,31.6094 Q79.3906,31.9063 78.75,32.0469 Q78.1094,32.2031 77.4063,32.2031 Q74.9063,32.2031 73.5781,30.5625 Q72.2656,28.9063 72.2656,25.7813 Q72.2656,22.6563 73.5781,21 Q74 [...]
-reverse link java.lang.Exception to org.apache.wiki.api.exceptions.WikiException--><path codeLine="12" d="M112,65.3 C112,78 112,92.08 112,104.56 " fill="none" id="java.lang.Exception-backto-org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="105,65.16,112,45.16,119,65.16,105,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x [...]
+reverse link java.lang.Exception to org.apache.wiki.api.exceptions.WikiException--><path codeLine="12" d="M112,65.3 C112,78 112,92.08 112,104.56 " fill="none" id="java.lang.Exception-backto-org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="105,65.16,112,45.16,119,65.16,105,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/WikiI18nException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/WikiI18nException.svg
index ef99482023..9cdc9f0c8e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/WikiI18nException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/WikiI18nException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="228px" preserveAspectRatio="none" style="width:246px;height:228px;background:#FFFFFF;" version="1.1" viewBox="0 0 246 228" width="246px" zoomAndPan="magnify"><defs><filter height="300%" id="f1hutkyptdt1we" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.api.exceptions.WikiI18nException--><a href="WikiI18nException.html" target="_top" title="WikiI18nException.html" xlink:actuate="onRequest" xlink:href="WikiI18nException.html" xlink:show="new" xlink:title="WikiI18nException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1hutkyptdt1we)" height="92.3516" id="org.apache.wiki.api.exceptions.WikiI18nException" style="stroke:#A80036;stroke-width:1.5;" width="223" x="9" y="105"/><ellipse cx="44.25 [...]
 class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f1hutkyptdt1we)" height="37.9375" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="178" x="31.5" y="7"/><ellipse cx="46.5" cy="25.9688" fill="#A [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.WikiI18nException--><path codeLine="13" d="M120.5,65.51 C120.5,78.01 120.5,91.99 120.5,104.93 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.WikiI18nException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="113.5,65.15,120.5,45.15,127.5,65.15,113.5,65.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" fon [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.WikiI18nException--><path codeLine="13" d="M120.5,65.51 C120.5,78.01 120.5,91.99 120.5,104.93 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.WikiI18nException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="113.5,65.15,120.5,45.15,127.5,65.15,113.5,65.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" fon [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/package.svg
index fc32925457..3068b5773b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/exceptions/package.svg
@@ -1,29 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="557px" preserveAspectRatio="none" style="width:1493px;height:557px;background:#FFFFFF;" version="1.1" viewBox="0 0 1493 557" width="1493px" zoomAndPan="magnify"><defs><filter height="300%" id="fpg3oj2r22bvt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
-cluster org.apache.wiki.api.exceptions--><polygon fill="#FFFFFF" filter="url(#fpg3oj2r22bvt)" points="16,129,267,129,274,151.2969,1476,151.2969,1476,534,16,534,16,129" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="274" y1="151.2969" y2="151.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="245" x="20" y="143.9951">org.apache.wiki.api.exceptions</text><!--MD5=[aa8 [...]
-cluster java.lang--><polygon fill="#FFFFFF" filter="url(#fpg3oj2r22bvt)" points="712,6,787,6,794,28.2969,836,28.2969,836,105,712,105,712,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="712" x2="794" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69" x="716" y="20.9951">java.lang</text><!--MD5=[51e0bd45a8d20f3becd765be19a9d68b]
-class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="73.6094" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="210" x="669" y="164"/><ellipse cx="727.25" cy="180" fill="#ADD1 [...]
-class org.apache.wiki.api.exceptions.PluginException--><a href="PluginException.html" target="_top" title="PluginException.html" xlink:actuate="onRequest" xlink:href="PluginException.html" xlink:show="new" xlink:title="PluginException.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="86.4141" id="org.apache.wiki.api.exceptions.PluginException" style="stroke:#A80036;stroke-width:1.5;" width="223" x="31.5" y="298"/><ellipse cx="89.25" cy="314" [...]
-class org.apache.wiki.api.exceptions.ProviderException--><a href="ProviderException.html" target="_top" title="ProviderException.html" xlink:actuate="onRequest" xlink:href="ProviderException.html" xlink:show="new" xlink:title="ProviderException.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="60.8047" id="org.apache.wiki.api.exceptions.ProviderException" style="stroke:#A80036;stroke-width:1.5;" width="169" x="289.5" y="310.5"/><ellipse cx= [...]
-class org.apache.wiki.api.exceptions.NoRequiredPropertyException--><a href="NoRequiredPropertyException.html" target="_top" title="NoRequiredPropertyException.html" xlink:actuate="onRequest" xlink:href="NoRequiredPropertyException.html" xlink:show="new" xlink:title="NoRequiredPropertyException.html" xlink:type="simple"><rect codeLine="18" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="60.8047" id="org.apache.wiki.api.exceptions.NoRequiredPropertyException" style="stroke:#A80036;stro [...]
-class org.apache.wiki.api.exceptions.WikiI18nException--><a href="WikiI18nException.html" target="_top" title="WikiI18nException.html" xlink:actuate="onRequest" xlink:href="WikiI18nException.html" xlink:show="new" xlink:title="WikiI18nException.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="86.4141" id="org.apache.wiki.api.exceptions.WikiI18nException" style="stroke:#A80036;stroke-width:1.5;" width="223" x="805.5" y="298"/><ellipse cx="8 [...]
-class org.apache.wiki.api.exceptions.RedirectException--><a href="RedirectException.html" target="_top" title="RedirectException.html" xlink:actuate="onRequest" xlink:href="RedirectException.html" xlink:show="new" xlink:title="RedirectException.html" xlink:type="simple"><rect codeLine="28" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="73.6094" id="org.apache.wiki.api.exceptions.RedirectException" style="stroke:#A80036;stroke-width:1.5;" width="210" x="1250" y="444"/><ellipse cx="12 [...]
-class org.apache.wiki.api.exceptions.NoSuchVariableException--><a href="NoSuchVariableException.html" target="_top" title="NoSuchVariableException.html" xlink:actuate="onRequest" xlink:href="NoSuchVariableException.html" xlink:show="new" xlink:title="NoSuchVariableException.html" xlink:type="simple"><rect codeLine="33" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="60.8047" id="org.apache.wiki.api.exceptions.NoSuchVariableException" style="stroke:#A80036;stroke-width:1.5;" width="21 [...]
-class org.apache.wiki.api.exceptions.FilterException--><a href="FilterException.html" target="_top" title="FilterException.html" xlink:actuate="onRequest" xlink:href="FilterException.html" xlink:show="new" xlink:title="FilterException.html" xlink:type="simple"><rect codeLine="37" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="60.8047" id="org.apache.wiki.api.exceptions.FilterException" style="stroke:#A80036;stroke-width:1.5;" width="150" x="1310" y="310.5"/><ellipse cx="1336.7" cy=" [...]
-class java.lang.Exception--><rect codeLine="52" fill="#FEFECE" filter="url(#fpg3oj2r22bvt)" height="48" id="java.lang.Exception" style="stroke:#A80036;stroke-width:1.5;" width="93" x="727.5" y="41"/><ellipse cx="742.5" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M745.4688,62.6406 Q744.8906,62.9375 744.25,63.0781 Q743.6094,63.2344 742.9063,63.2344 Q740.4063,63.2344 739.0781,61.5938 Q737.7656,59.9375 737.7656,56.8125 Q737.7656,53.6875 739.0781, [...]
-reverse link java.lang.Exception to org.apache.wiki.api.exceptions.WikiException--><path codeLine="41" d="M774,109.26 C774,126.9 774,147.07 774,163.91 " fill="none" id="java.lang.Exception-backto-org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="767,109.04,774,89.04,781,109.04,767,109.04" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6a69a9de40e333362dc32b7eb51cedcc]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.PluginException--><path codeLine="42" d="M649.03,221.41 C546.87,238.34 399.09,265.3 272,298 C266.3,299.47 260.48,301.05 254.62,302.71 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.PluginException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="647.96,214.49,668.83,218.15,650.23,228.3,647.96,214.49" style="stroke:#A80036 [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.ProviderException--><path codeLine="43" d="M649.52,239.69 C595.81,256.57 532.48,277.31 476,298 C465.48,301.85 454.44,306.14 443.67,310.46 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.ProviderException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="647.67,232.94,668.84,233.65,651.84,246.3,647.67,232.94" style="stroke:# [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.NoRequiredPropertyException--><path codeLine="44" d="M722.21,252.33 C702.11,271.87 679.78,293.56 662.37,310.49 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.NoRequiredPropertyException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="717.47,247.18,736.69,238.26,727.23,257.22,717.47,247.18" style="stroke:#A80036;stroke-wi [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.WikiI18nException--><path codeLine="45" d="M826.44,252.61 C841.86,267.48 858.54,283.59 873.35,297.87 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.WikiI18nException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="821.1,257.18,811.57,238.26,830.82,247.11,821.1,257.18" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[da [...]
-reverse link org.apache.wiki.api.exceptions.FilterException to org.apache.wiki.api.exceptions.RedirectException--><path codeLine="46" d="M1374.31,391.19 C1370.53,408.55 1366.36,427.74 1362.87,443.82 " fill="none" id="org.apache.wiki.api.exceptions.FilterException-backto-org.apache.wiki.api.exceptions.RedirectException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1367.48,389.66,1378.56,371.6,1381.16,392.64,1367.48,389.66" style="stroke:#A80036;stroke-width:1.0;" [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.NoSuchVariableException--><path codeLine="47" d="M896.22,244.7 C957.22,266.01 1029.48,291.26 1084.3,310.41 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.NoSuchVariableException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="893.84,251.28,877.27,238.08,898.46,238.07,893.84,251.28" style="stroke:#A80036;stroke-width:1.0; [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.FilterException--><path codeLine="48" d="M899.38,216.62 C1005.59,231.04 1161.02,256.95 1292,298 C1302.99,301.44 1314.39,305.85 1325.29,310.5 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.FilterException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="898.39,223.55,879.48,213.98,900.23,209.67,898.39,223.55" style="stroke [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="557px" preserveAspectRatio="none" style="width:1494px;height:557px;background:#FFFFFF;" version="1.1" viewBox="0 0 1494 557" width="1494px" zoomAndPan="magnify"><defs><filter height="300%" id="f1bywuqxvvevaj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
+cluster org.apache.wiki.api.exceptions--><polygon fill="#FFFFFF" filter="url(#f1bywuqxvvevaj)" points="16,129,267,129,274,151.2969,1477,151.2969,1477,534,16,534,16,129" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="274" y1="151.2969" y2="151.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="245" x="20" y="143.9951">org.apache.wiki.api.exceptions</text><!--MD5=[aa [...]
+cluster java.lang--><polygon fill="#FFFFFF" filter="url(#f1bywuqxvvevaj)" points="628,6,703,6,710,28.2969,752,28.2969,752,105,628,105,628,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="628" x2="710" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69" x="632" y="20.9951">java.lang</text><!--MD5=[7b3401d984463d04818fd1f6037aaa8a]
+class org.apache.wiki.api.exceptions.FilterException--><a href="FilterException.html" target="_top" title="FilterException.html" xlink:actuate="onRequest" xlink:href="FilterException.html" xlink:show="new" xlink:title="FilterException.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="60.8047" id="org.apache.wiki.api.exceptions.FilterException" style="stroke:#A80036;stroke-width:1.5;" width="150" x="32" y="310.5"/><ellipse cx="58.7" cy="326. [...]
+class org.apache.wiki.api.exceptions.NoSuchVariableException--><a href="NoSuchVariableException.html" target="_top" title="NoSuchVariableException.html" xlink:actuate="onRequest" xlink:href="NoSuchVariableException.html" xlink:show="new" xlink:title="NoSuchVariableException.html" xlink:type="simple"><rect codeLine="7" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="60.8047" id="org.apache.wiki.api.exceptions.NoSuchVariableException" style="stroke:#A80036;stroke-width:1.5;" width="21 [...]
+class org.apache.wiki.api.exceptions.PluginException--><a href="PluginException.html" target="_top" title="PluginException.html" xlink:actuate="onRequest" xlink:href="PluginException.html" xlink:show="new" xlink:title="PluginException.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="86.4141" id="org.apache.wiki.api.exceptions.PluginException" style="stroke:#A80036;stroke-width:1.5;" width="223" x="463.5" y="298"/><ellipse cx="521.25" cy=" [...]
+class org.apache.wiki.api.exceptions.RedirectException--><a href="RedirectException.html" target="_top" title="RedirectException.html" xlink:actuate="onRequest" xlink:href="RedirectException.html" xlink:show="new" xlink:title="RedirectException.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="73.6094" id="org.apache.wiki.api.exceptions.RedirectException" style="stroke:#A80036;stroke-width:1.5;" width="210" x="32" y="444"/><ellipse cx="76. [...]
+class org.apache.wiki.api.exceptions.ProviderException--><a href="ProviderException.html" target="_top" title="ProviderException.html" xlink:actuate="onRequest" xlink:href="ProviderException.html" xlink:show="new" xlink:title="ProviderException.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="60.8047" id="org.apache.wiki.api.exceptions.ProviderException" style="stroke:#A80036;stroke-width:1.5;" width="169" x="721.5" y="310.5"/><ellipse cx [...]
+class org.apache.wiki.api.exceptions.WikiI18nException--><a href="WikiI18nException.html" target="_top" title="WikiI18nException.html" xlink:actuate="onRequest" xlink:href="WikiI18nException.html" xlink:show="new" xlink:title="WikiI18nException.html" xlink:type="simple"><rect codeLine="26" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="86.4141" id="org.apache.wiki.api.exceptions.WikiI18nException" style="stroke:#A80036;stroke-width:1.5;" width="223" x="925.5" y="298"/><ellipse cx=" [...]
+class org.apache.wiki.api.exceptions.NoRequiredPropertyException--><a href="NoRequiredPropertyException.html" target="_top" title="NoRequiredPropertyException.html" xlink:actuate="onRequest" xlink:href="NoRequiredPropertyException.html" xlink:show="new" xlink:title="NoRequiredPropertyException.html" xlink:type="simple"><rect codeLine="32" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="60.8047" id="org.apache.wiki.api.exceptions.NoRequiredPropertyException" style="stroke:#A80036;str [...]
+class org.apache.wiki.api.exceptions.WikiException--><a href="WikiException.html" target="_top" title="WikiException.html" xlink:actuate="onRequest" xlink:href="WikiException.html" xlink:show="new" xlink:title="WikiException.html" xlink:type="simple"><rect codeLine="36" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="73.6094" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" width="210" x="585" y="164"/><ellipse cx="643.25" cy="180" fill="#AD [...]
+class java.lang.Exception--><rect codeLine="52" fill="#FEFECE" filter="url(#f1bywuqxvvevaj)" height="48" id="java.lang.Exception" style="stroke:#A80036;stroke-width:1.5;" width="93" x="643.5" y="41"/><ellipse cx="658.5" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M661.4688,62.6406 Q660.8906,62.9375 660.25,63.0781 Q659.6094,63.2344 658.9063,63.2344 Q656.4063,63.2344 655.0781,61.5938 Q653.7656,59.9375 653.7656,56.8125 Q653.7656,53.6875 655.0781 [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.FilterException--><path codeLine="41" d="M564.45,218.43 C464.26,233.49 321.11,259.36 200,298 C189.11,301.47 177.81,305.86 166.99,310.49 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.FilterException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="563.72,211.47,584.53,215.48,565.76,225.32,563.72,211.47" style="stroke:#A80 [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.NoSuchVariableException--><path codeLine="42" d="M574.97,245.25 C518.61,266.45 452.19,291.42 401.69,310.41 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.NoSuchVariableException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="572.87,238.56,594.05,238.08,577.8,251.67,572.87,238.56" style="stroke:#A80036;stroke-width:1.0;" [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.PluginException--><path codeLine="43" d="M646.72,253.94 C634.71,268.35 621.81,283.83 610.31,297.62 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.PluginException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="641.6,249.14,659.79,238.26,652.36,258.1,641.6,249.14" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[da79e22 [...]
+reverse link org.apache.wiki.api.exceptions.FilterException to org.apache.wiki.api.exceptions.RedirectException--><path codeLine="44" d="M117.69,391.19 C121.47,408.55 125.64,427.74 129.13,443.82 " fill="none" id="org.apache.wiki.api.exceptions.FilterException-backto-org.apache.wiki.api.exceptions.RedirectException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="110.84,392.64,113.44,371.6,124.52,389.66,110.84,392.64" style="stroke:#A80036;stroke-width:1.0;"/><!--MD [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.ProviderException--><path codeLine="45" d="M733.51,253.76 C749.62,272.92 767.31,293.98 781.19,310.49 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.ProviderException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="727.99,258.07,720.48,238.26,738.71,249.06,727.99,258.07" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.WikiI18nException--><path codeLine="46" d="M799.57,245.58 C841.6,262.29 889.45,281.32 931.12,297.89 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.WikiI18nException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="796.71,251.97,780.72,238.08,801.89,238.96,796.71,251.97" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3 [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api.exceptions.NoRequiredPropertyException--><path codeLine="47" d="M815.27,225 C911.54,243.22 1047.63,270.16 1166,298 C1182.11,301.79 1199.08,306.06 1215.66,310.4 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.api.exceptions.NoRequiredPropertyException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="813.71,231.83,795.35,221.24,816.3,218.07,813.71,23 [...]
+reverse link java.lang.Exception to org.apache.wiki.api.exceptions.WikiException--><path codeLine="48" d="M690,109.26 C690,126.9 690,147.07 690,163.91 " fill="none" id="java.lang.Exception-backto-org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="683,109.04,690,89.04,697,109.04,683,109.04" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLengt [...]
 @startuml
     namespace org.apache.wiki.api.exceptions {
 
-        class WikiException [[WikiException.html]] {
-            +WikiException(String)
-            +WikiException(String, Throwable)
+        class FilterException [[FilterException.html]] {
+            +FilterException(String)
+        }
+
+        class NoSuchVariableException [[NoSuchVariableException.html]] {
+            +NoSuchVariableException(String)
         }
 
         class PluginException [[PluginException.html]] {
@@ -32,12 +35,13 @@ reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api
             +getRootThrowable(): Throwable
         }
 
-        class ProviderException [[ProviderException.html]] {
-            +ProviderException(String)
+        class RedirectException [[RedirectException.html]] {
+            +RedirectException(String, String)
+            +getRedirect(): String
         }
 
-        class NoRequiredPropertyException [[NoRequiredPropertyException.html]] {
-            +NoRequiredPropertyException(String, String)
+        class ProviderException [[ProviderException.html]] {
+            +ProviderException(String)
         }
 
         class WikiI18nException [[WikiI18nException.html]] {
@@ -46,27 +50,23 @@ reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.api
             +getArgs(): Object[]
         }
 
-        class RedirectException [[RedirectException.html]] {
-            +RedirectException(String, String)
-            +getRedirect(): String
-        }
-
-        class NoSuchVariableException [[NoSuchVariableException.html]] {
-            +NoSuchVariableException(String)
+        class NoRequiredPropertyException [[NoRequiredPropertyException.html]] {
+            +NoRequiredPropertyException(String, String)
         }
 
-        class FilterException [[FilterException.html]] {
-            +FilterException(String)
+        class WikiException [[WikiException.html]] {
+            +WikiException(String)
+            +WikiException(String, Throwable)
         }
 
-        java.lang.Exception <|- - WikiException
+        WikiException <|- - FilterException
+        WikiException <|- - NoSuchVariableException
         WikiException <|- - PluginException
+        FilterException <|- - RedirectException
         WikiException <|- - ProviderException
-        WikiException <|- - NoRequiredPropertyException
         WikiException <|- - WikiI18nException
-        FilterException <|- - RedirectException
-        WikiException <|- - NoSuchVariableException
-        WikiException <|- - FilterException
+        WikiException <|- - NoRequiredPropertyException
+        java.lang.Exception <|- - WikiException
     }
 
     namespace java.lang {
@@ -83,5 +83,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/BasePageFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/BasePageFilter.svg
index 8d654b59b6..ca46347906 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/BasePageFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/BasePageFilter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="236px" preserveAspectRatio="none" style="width:238px;height:236px;background:#FFFFFF;" version="1.1" viewBox="0 0 238 236" width="238px" zoomAndPan="magnify"><defs><filter height="300%" id="f1drcx0po5hfkl" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.api.filters.BasePageFilter--><a href="BasePageFilter.html" target="_top" title="BasePageFilter.html" xlink:actuate="onRequest" xlink:href="BasePageFilter.html" xlink:show="new" xlink:title="BasePageFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1drcx0po5hfkl)" height="79.5469" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="215" x="9" y="126"/><ellipse cx="51.9" cy="144.9688" fill="#AD [...]
 class org.apache.wiki.api.filters.PageFilter--><a href="PageFilter.html" target="_top" title="PageFilter.html" xlink:actuate="onRequest" xlink:href="PageFilter.html" xlink:show="new" xlink:title="PageFilter.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1drcx0po5hfkl)" height="58.7422" id="org.apache.wiki.api.filters.PageFilter" style="stroke:#A80036;stroke-width:1.5;" width="216" x="8.5" y="7"/><ellipse cx="48.7" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" st [...]
-reverse link org.apache.wiki.api.filters.PageFilter to org.apache.wiki.api.filters.BasePageFilter--><path codeLine="14" d="M116.5,86.25 C116.5,99.35 116.5,113.34 116.5,125.85 " fill="none" id="org.apache.wiki.api.filters.PageFilter-backto-org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="109.5,86.11,116.5,66.11,123.5,86.11,109.5,86.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" f [...]
+reverse link org.apache.wiki.api.filters.PageFilter to org.apache.wiki.api.filters.BasePageFilter--><path codeLine="14" d="M116.5,86.25 C116.5,99.35 116.5,113.34 116.5,125.85 " fill="none" id="org.apache.wiki.api.filters.PageFilter-backto-org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="109.5,86.11,116.5,66.11,123.5,86.11,109.5,86.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" f [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/BasicPageFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/BasicPageFilter.svg
index 934ed2ad80..643f51bcfb 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/BasicPageFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/BasicPageFilter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="336px" preserveAspectRatio="none" style="width:282px;height:336px;background:#FFFFFF;" version="1.1" viewBox="0 0 282 336" width="282px" zoomAndPan="magnify"><defs><filter height="300%" id="frpl7xz4blyv6" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.filters.BasicPageFilter--><a href="BasicPageFilter.html" target="_top" title="BasicPageFilter.html" xlink:actuate="onRequest" xlink:href="BasicPageFilter.html" xlink:show="new" xlink:title="BasicPageFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#frpl7xz4blyv6)" height="200.7578" id="org.apache.wiki.api.filters.BasicPageFilter" style="stroke:#A80036;stroke-width:1.5;" width="261" x="7" y="105"/><ellipse cx="72.75" cy="130.9531" fi [...]
 class org.apache.wiki.api.filters.BasePageFilter--><a href="BasePageFilter.html" target="_top" title="BasePageFilter.html" xlink:actuate="onRequest" xlink:href="BasePageFilter.html" xlink:show="new" xlink:title="BasePageFilter.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#frpl7xz4blyv6)" height="37.9375" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="153" x="61" y="7"/><ellipse cx="76" cy="25.9688" fill="#ADD1B2 [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.api.filters.BasicPageFilter--><path codeLine="21" d="M137.5,65.48 C137.5,77.29 137.5,90.87 137.5,104.82 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.api.filters.BasicPageFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="130.5,65.33,137.5,45.33,144.5,65.33,130.5,65.33" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.api.filters.BasicPageFilter--><path codeLine="21" d="M137.5,65.48 C137.5,77.29 137.5,90.87 137.5,104.82 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.api.filters.BasicPageFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="130.5,65.33,137.5,45.33,144.5,65.33,130.5,65.33" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -34,5 +34,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/PageFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/PageFilter.svg
index e863ecfc5c..3215fc9ae3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/PageFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/PageFilter.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="154px" preserveAspectRatio="none" style="width:261px;height:154px;background:#FFFFFF;" version="1.1" viewBox="0 0 261 154" width="261px" zoomAndPan="magnify"><defs><filter height="300%" id="f1phqcl3cy69qu" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.filters.PageFilter--><a href="PageFilter.html" target="_top" title="PageFilter.html" xlink:actuate="onRequest" xlink:href="PageFilter.html" xlink:show="new" xlink:title="PageFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1phqcl3cy69qu)" height="122.7656" id="org.apache.wiki.api.filters.PageFilter" style="stroke:#A80036;stroke-width:1.5;" width="240" x="7" y="7"/><ellipse cx="58.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" sty [...]
+class org.apache.wiki.api.filters.PageFilter--><a href="PageFilter.html" target="_top" title="PageFilter.html" xlink:actuate="onRequest" xlink:href="PageFilter.html" xlink:show="new" xlink:title="PageFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1phqcl3cy69qu)" height="122.7656" id="org.apache.wiki.api.filters.PageFilter" style="stroke:#A80036;stroke-width:1.5;" width="240" x="7" y="7"/><ellipse cx="58.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" sty [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/package.svg
index ed1325127d..e30be54b65 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/filters/package.svg
@@ -1,18 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="594px" preserveAspectRatio="none" style="width:327px;height:594px;background:#FFFFFF;" version="1.1" viewBox="0 0 327 594" width="327px" zoomAndPan="magnify"><defs><filter height="300%" id="f34p1uasodb3l" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-cluster org.apache.wiki.api.filters--><polygon fill="#FFFFFF" filter="url(#f34p1uasodb3l)" points="16,6,226,6,233,28.2969,310,28.2969,310,571,16,571,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="233" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="204" x="20" y="20.9951">org.apache.wiki.api.filters</text><!--MD5=[e6f7120dbe2c94b2a1428c [...]
-class org.apache.wiki.api.filters.BasePageFilter--><a href="BasePageFilter.html" target="_top" title="BasePageFilter.html" xlink:actuate="onRequest" xlink:href="BasePageFilter.html" xlink:show="new" xlink:title="BasePageFilter.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f34p1uasodb3l)" height="73.6094" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="215" x="55.5" y="226"/><ellipse cx="111.75" cy="242" fill="#ADD [...]
-class org.apache.wiki.api.filters.PageFilter--><a href="PageFilter.html" target="_top" title="PageFilter.html" xlink:actuate="onRequest" xlink:href="PageFilter.html" xlink:show="new" xlink:title="PageFilter.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#f34p1uasodb3l)" height="124.8281" id="org.apache.wiki.api.filters.PageFilter" style="stroke:#A80036;stroke-width:1.5;" width="240" x="43" y="41"/><ellipse cx="127.75" cy="57" fill="#B4A7E5" rx="11" ry="11" style= [...]
-class org.apache.wiki.api.filters.BasicPageFilter--><a href="BasicPageFilter.html" target="_top" title="BasicPageFilter.html" xlink:actuate="onRequest" xlink:href="BasicPageFilter.html" xlink:show="new" xlink:title="BasicPageFilter.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#f34p1uasodb3l)" height="194.7891" id="org.apache.wiki.api.filters.BasicPageFilter" style="stroke:#A80036;stroke-width:1.5;" width="261" x="32.5" y="360"/><ellipse cx="110.75" cy="378.968 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="594px" preserveAspectRatio="none" style="width:327px;height:594px;background:#FFFFFF;" version="1.1" viewBox="0 0 327 594" width="327px" zoomAndPan="magnify"><defs><filter height="300%" id="fx01fdpr1go5h" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+cluster org.apache.wiki.api.filters--><polygon fill="#FFFFFF" filter="url(#fx01fdpr1go5h)" points="16,6,226,6,233,28.2969,310,28.2969,310,571,16,571,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="233" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="204" x="20" y="20.9951">org.apache.wiki.api.filters</text><!--MD5=[a833b874e85e441aa0a4bb [...]
+class org.apache.wiki.api.filters.PageFilter--><a href="PageFilter.html" target="_top" title="PageFilter.html" xlink:actuate="onRequest" xlink:href="PageFilter.html" xlink:show="new" xlink:title="PageFilter.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fx01fdpr1go5h)" height="124.8281" id="org.apache.wiki.api.filters.PageFilter" style="stroke:#A80036;stroke-width:1.5;" width="240" x="43" y="41"/><ellipse cx="127.75" cy="57" fill="#B4A7E5" rx="11" ry="11" style= [...]
+class org.apache.wiki.api.filters.BasePageFilter--><a href="BasePageFilter.html" target="_top" title="BasePageFilter.html" xlink:actuate="onRequest" xlink:href="BasePageFilter.html" xlink:show="new" xlink:title="BasePageFilter.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#fx01fdpr1go5h)" height="73.6094" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="215" x="55.5" y="226"/><ellipse cx="111.75" cy="242" fill="#AD [...]
+class org.apache.wiki.api.filters.BasicPageFilter--><a href="BasicPageFilter.html" target="_top" title="BasicPageFilter.html" xlink:actuate="onRequest" xlink:href="BasicPageFilter.html" xlink:show="new" xlink:title="BasicPageFilter.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#fx01fdpr1go5h)" height="194.7891" id="org.apache.wiki.api.filters.BasicPageFilter" style="stroke:#A80036;stroke-width:1.5;" width="261" x="32.5" y="360"/><ellipse cx="110.75" cy="378.968 [...]
 reverse link org.apache.wiki.api.filters.PageFilter to org.apache.wiki.api.filters.BasePageFilter--><path codeLine="31" d="M163,186.45 C163,200.28 163,213.98 163,225.83 " fill="none" id="org.apache.wiki.api.filters.PageFilter-backto-org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="156,186.3,163,166.3,170,186.3,156,186.3" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[f3e683fd0708669ec811e6ae6b1b4472]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.api.filters.BasicPageFilter--><path codeLine="32" d="M163,320.54 C163,332.96 163,346.45 163,359.94 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.api.filters.BasicPageFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="156,320.21,163,300.21,170,320.21,156,320.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" f [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.api.filters.BasicPageFilter--><path codeLine="32" d="M163,320.54 C163,332.96 163,346.45 163,359.94 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.api.filters.BasicPageFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="156,320.21,163,300.21,170,320.21,156,320.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" f [...]
 @startuml
     namespace org.apache.wiki.api.filters {
 
-        class BasePageFilter [[BasePageFilter.html]] {
-            #m_engine: Engine
-            +initialize(Engine, Properties): void
-        }
-
         interface PageFilter [[PageFilter.html]] {
             {abstract} +initialize(Engine, Properties): void
             +preTranslate(Context, String): String
@@ -22,6 +17,11 @@ reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.api.f
             +destroy(Engine): void
         }
 
+        class BasePageFilter [[BasePageFilter.html]] {
+            #m_engine: Engine
+            +initialize(Engine, Properties): void
+        }
+
         class BasicPageFilter <<deprecated>> [[BasicPageFilter.html]] {
             +initialize(WikiEngine, Properties): void
             +preTranslate(WikiContext, String): String
@@ -49,5 +49,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/package.svg
index a18b55ed49..51ae54dfa3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/package.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:277px;height:256px;background:#FFFFFF;" version="1.1" viewBox="0 0 277 256" width="277px" zoomAndPan="magnify"><defs><filter height="300%" id="f8ylylle9h7os" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 cluster org.apache.wiki.api--><polygon fill="#FFFFFF" filter="url(#f8ylylle9h7os)" points="16,6,175,6,182,28.2969,260,28.2969,260,233,16,233,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="182" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="153" x="20" y="20.9951">org.apache.wiki.api</text><!--MD5=[8aa7ee819f181ce0222db08c29dd3379]
-class org.apache.wiki.api.Release--><a href="Release.html" target="_top" title="Release.html" xlink:actuate="onRequest" xlink:href="Release.html" xlink:show="new" xlink:title="Release.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f8ylylle9h7os)" height="176.0469" id="org.apache.wiki.api.Release" style="stroke:#A80036;stroke-width:1.5;" width="212" x="32" y="41"/><ellipse cx="108.75" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;" [...]
+class org.apache.wiki.api.Release--><a href="Release.html" target="_top" title="Release.html" xlink:actuate="onRequest" xlink:href="Release.html" xlink:show="new" xlink:title="Release.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f8ylylle9h7os)" height="176.0469" id="org.apache.wiki.api.Release" style="stroke:#A80036;stroke-width:1.5;" width="212" x="32" y="41"/><ellipse cx="108.75" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;" [...]
 @startuml
     namespace org.apache.wiki.api {
 
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/InitializablePlugin.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/InitializablePlugin.svg
index eedf5bea63..11f10dc108 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/InitializablePlugin.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/InitializablePlugin.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:199px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 90" width="199px" zoomAndPan="magnify"><defs><filter height="300%" id="f75kfdfx7v1ie" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation=" [...]
-class org.apache.wiki.api.plugin.InitializablePlugin--><a href="InitializablePlugin.html" target="_top" title="InitializablePlugin.html" xlink:actuate="onRequest" xlink:href="InitializablePlugin.html" xlink:show="new" xlink:title="InitializablePlugin.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f75kfdfx7v1ie)" height="58.7422" id="org.apache.wiki.api.plugin.InitializablePlugin" style="stroke:#A80036;stroke-width:1.5;" width="161" x="15.5" y="7"/><ellipse cx="3 [...]
+class org.apache.wiki.api.plugin.InitializablePlugin--><a href="InitializablePlugin.html" target="_top" title="InitializablePlugin.html" xlink:actuate="onRequest" xlink:href="InitializablePlugin.html" xlink:show="new" xlink:title="InitializablePlugin.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f75kfdfx7v1ie)" height="58.7422" id="org.apache.wiki.api.plugin.InitializablePlugin" style="stroke:#A80036;stroke-width:1.5;" width="161" x="15.5" y="7"/><ellipse cx="3 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/ParserStagePlugin.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/ParserStagePlugin.svg
index 463709a9f2..d2a80e72ec 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/ParserStagePlugin.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/ParserStagePlugin.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:424px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 424 90" width="424px" zoomAndPan="magnify"><defs><filter height="300%" id="fh33xah11a0sq" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation=" [...]
-class org.apache.wiki.api.plugin.ParserStagePlugin--><a href="ParserStagePlugin.html" target="_top" title="ParserStagePlugin.html" xlink:actuate="onRequest" xlink:href="ParserStagePlugin.html" xlink:show="new" xlink:title="ParserStagePlugin.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fh33xah11a0sq)" height="58.7422" id="org.apache.wiki.api.plugin.ParserStagePlugin" style="stroke:#A80036;stroke-width:1.5;" width="403" x="7" y="7"/><ellipse cx="139.75" cy="25.9 [...]
+class org.apache.wiki.api.plugin.ParserStagePlugin--><a href="ParserStagePlugin.html" target="_top" title="ParserStagePlugin.html" xlink:actuate="onRequest" xlink:href="ParserStagePlugin.html" xlink:show="new" xlink:title="ParserStagePlugin.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fh33xah11a0sq)" height="58.7422" id="org.apache.wiki.api.plugin.ParserStagePlugin" style="stroke:#A80036;stroke-width:1.5;" width="403" x="7" y="7"/><ellipse cx="139.75" cy="25.9 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/Plugin.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/Plugin.svg
index 70a038d06b..df33e3924f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/Plugin.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/Plugin.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="111px" preserveAspectRatio="none" style="width:308px;height:111px;background:#FFFFFF;" version="1.1" viewBox="0 0 308 111" width="308px" zoomAndPan="magnify"><defs><filter height="300%" id="fgrylso0lgfgy" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.plugin.Plugin--><a href="Plugin.html" target="_top" title="Plugin.html" xlink:actuate="onRequest" xlink:href="Plugin.html" xlink:show="new" xlink:title="Plugin.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fgrylso0lgfgy)" height="79.5469" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="7" y="7"/><ellipse cx="81.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-wi [...]
+class org.apache.wiki.api.plugin.Plugin--><a href="Plugin.html" target="_top" title="Plugin.html" xlink:actuate="onRequest" xlink:href="Plugin.html" xlink:show="new" xlink:title="Plugin.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fgrylso0lgfgy)" height="79.5469" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="7" y="7"/><ellipse cx="81.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-wi [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -19,5 +19,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/PluginElement.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/PluginElement.svg
index 6062521eac..38072e0d7d 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/PluginElement.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/PluginElement.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="167px" preserveAspectRatio="none" style="width:262px;height:167px;background:#FFFFFF;" version="1.1" viewBox="0 0 262 167" width="262px" zoomAndPan="magnify"><defs><filter height="300%" id="fib9waz4x372e" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.plugin.PluginElement--><a href="PluginElement.html" target="_top" title="PluginElement.html" xlink:actuate="onRequest" xlink:href="PluginElement.html" xlink:show="new" xlink:title="PluginElement.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fib9waz4x372e)" height="135.5703" id="org.apache.wiki.api.plugin.PluginElement" style="stroke:#A80036;stroke-width:1.5;" width="241" x="7" y="7"/><ellipse cx="58.75" cy="25.9688" fill="#B4A7E5" rx=" [...]
+class org.apache.wiki.api.plugin.PluginElement--><a href="PluginElement.html" target="_top" title="PluginElement.html" xlink:actuate="onRequest" xlink:href="PluginElement.html" xlink:show="new" xlink:title="PluginElement.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fib9waz4x372e)" height="135.5703" id="org.apache.wiki.api.plugin.PluginElement" style="stroke:#A80036;stroke-width:1.5;" width="241" x="7" y="7"/><ellipse cx="58.75" cy="25.9688" fill="#B4A7E5" rx=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/WikiPlugin.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/WikiPlugin.svg
index 0f1bb0ac06..307b647a8e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/WikiPlugin.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/WikiPlugin.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="242px" preserveAspectRatio="none" style="width:331px;height:242px;background:#FFFFFF;" version="1.1" viewBox="0 0 331 242" width="331px" zoomAndPan="magnify"><defs><filter height="300%" id="fi4l4hxs1omlt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.plugin.WikiPlugin--><a href="WikiPlugin.html" target="_top" title="WikiPlugin.html" xlink:actuate="onRequest" xlink:href="WikiPlugin.html" xlink:show="new" xlink:title="WikiPlugin.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fi4l4hxs1omlt)" height="85.5156" id="org.apache.wiki.api.plugin.WikiPlugin" style="stroke:#A80036;stroke-width:1.5;" width="310" x="7" y="126"/><ellipse cx="93.25" cy="151.9531" fill="#B4A7E5" rx="11" ry="11" styl [...]
 class org.apache.wiki.api.plugin.Plugin--><a href="Plugin.html" target="_top" title="Plugin.html" xlink:actuate="onRequest" xlink:href="Plugin.html" xlink:show="new" xlink:title="Plugin.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#fi4l4hxs1omlt)" height="58.7422" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="18.5" y="7"/><ellipse cx="93.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;strok [...]
-reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.api.plugin.WikiPlugin--><path codeLine="14" d="M162,86.61 C162,99.5 162,113.3 162,125.8 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.api.plugin.WikiPlugin" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="155,86.14,162,66.14,169,86.14,155,86.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" te [...]
+reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.api.plugin.WikiPlugin--><path codeLine="14" d="M162,86.61 C162,99.5 162,113.3 162,125.8 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.api.plugin.WikiPlugin" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="155,86.14,162,66.14,169,86.14,155,86.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" te [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/package.svg
index 452ea07107..9131ad6ebb 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/plugin/package.svg
@@ -1,16 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="358px" preserveAspectRatio="none" style="width:1067px;height:358px;background:#FFFFFF;" version="1.1" viewBox="0 0 1067 358" width="1067px" zoomAndPan="magnify"><defs><filter height="300%" id="fn9ww7koj2je8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
-cluster org.apache.wiki.api.plugin--><polygon fill="#FFFFFF" filter="url(#fn9ww7koj2je8)" points="16,6,228,6,235,28.2969,1050,28.2969,1050,335,16,335,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="235" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="206" x="20" y="20.9951">org.apache.wiki.api.plugin</text><!--MD5=[e635f748fe944f22e1d279 [...]
-class org.apache.wiki.api.plugin.ParserStagePlugin--><a href="ParserStagePlugin.html" target="_top" title="ParserStagePlugin.html" xlink:actuate="onRequest" xlink:href="ParserStagePlugin.html" xlink:show="new" xlink:title="ParserStagePlugin.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fn9ww7koj2je8)" height="60.8047" id="org.apache.wiki.api.plugin.ParserStagePlugin" style="stroke:#A80036;stroke-width:1.5;" width="403" x="354.5" y="79.5"/><ellipse cx="495.25" c [...]
-class org.apache.wiki.api.plugin.PluginElement--><a href="PluginElement.html" target="_top" title="PluginElement.html" xlink:actuate="onRequest" xlink:href="PluginElement.html" xlink:show="new" xlink:title="PluginElement.html" xlink:type="simple"><rect codeLine="7" fill="#FEFECE" filter="url(#fn9ww7koj2je8)" height="137.6328" id="org.apache.wiki.api.plugin.PluginElement" style="stroke:#A80036;stroke-width:1.5;" width="241" x="792.5" y="41"/><ellipse cx="864.75" cy="57" fill="#B4A7E5" rx= [...]
-class org.apache.wiki.api.plugin.InitializablePlugin--><a href="InitializablePlugin.html" target="_top" title="InitializablePlugin.html" xlink:actuate="onRequest" xlink:href="InitializablePlugin.html" xlink:show="new" xlink:title="InitializablePlugin.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#fn9ww7koj2je8)" height="60.8047" id="org.apache.wiki.api.plugin.InitializablePlugin" style="stroke:#A80036;stroke-width:1.5;" width="150" x="481" y="248.5"/><ellipse c [...]
-class org.apache.wiki.api.plugin.Plugin--><a href="Plugin.html" target="_top" title="Plugin.html" xlink:actuate="onRequest" xlink:href="Plugin.html" xlink:show="new" xlink:title="Plugin.html" xlink:type="simple"><rect codeLine="21" fill="#FEFECE" filter="url(#fn9ww7koj2je8)" height="73.6094" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="32.5" y="73"/><ellipse cx="153.25" cy="89" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-w [...]
-class org.apache.wiki.api.plugin.WikiPlugin--><a href="WikiPlugin.html" target="_top" title="WikiPlugin.html" xlink:actuate="onRequest" xlink:href="WikiPlugin.html" xlink:show="new" xlink:title="WikiPlugin.html" xlink:type="simple"><rect codeLine="26" fill="#FEFECE" filter="url(#fn9ww7koj2je8)" height="79.5469" id="org.apache.wiki.api.plugin.WikiPlugin" style="stroke:#A80036;stroke-width:1.5;" width="310" x="32" y="239"/><ellipse cx="141.25" cy="257.9688" fill="#B4A7E5" rx="11" ry="11" s [...]
-reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.api.plugin.WikiPlugin--><path codeLine="31" d="M179.71,167.28 C181.26,190.82 183.02,217.6 184.43,238.92 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.api.plugin.WikiPlugin" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="172.72,167.65,178.39,147.24,186.69,166.73,172.72,167.65" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[14cfd92be189fbbe378463b88f44709e]
-link org.apache.wiki.api.plugin.ParserStagePlugin to org.apache.wiki.api.plugin.PluginElement--><!--MD5=[49a08b3acff6e9026af26693c85b10fb]
-link org.apache.wiki.api.plugin.ParserStagePlugin to org.apache.wiki.api.plugin.InitializablePlugin--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="431" y="350.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[99cc4d647383d6e1b227e93cc62ce28d]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="352px" preserveAspectRatio="none" style="width:977px;height:352px;background:#FFFFFF;" version="1.1" viewBox="0 0 977 352" width="977px" zoomAndPan="magnify"><defs><filter height="300%" id="f18ad5zt7e4968" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+cluster org.apache.wiki.api.plugin--><polygon fill="#FFFFFF" filter="url(#f18ad5zt7e4968)" points="16,6,228,6,235,28.2969,960,28.2969,960,329,16,329,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="235" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="206" x="20" y="20.9951">org.apache.wiki.api.plugin</text><!--MD5=[c734dc17d5c62ee069eb735 [...]
+class org.apache.wiki.api.plugin.InitializablePlugin--><a href="InitializablePlugin.html" target="_top" title="InitializablePlugin.html" xlink:actuate="onRequest" xlink:href="InitializablePlugin.html" xlink:show="new" xlink:title="InitializablePlugin.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f18ad5zt7e4968)" height="60.8047" id="org.apache.wiki.api.plugin.InitializablePlugin" style="stroke:#A80036;stroke-width:1.5;" width="150" x="355" y="47.5"/><ellipse cx [...]
+class org.apache.wiki.api.plugin.Plugin--><a href="Plugin.html" target="_top" title="Plugin.html" xlink:actuate="onRequest" xlink:href="Plugin.html" xlink:show="new" xlink:title="Plugin.html" xlink:type="simple"><rect codeLine="7" fill="#FEFECE" filter="url(#f18ad5zt7e4968)" height="73.6094" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="32.5" y="41"/><ellipse cx="153.25" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-w [...]
+class org.apache.wiki.api.plugin.ParserStagePlugin--><a href="ParserStagePlugin.html" target="_top" title="ParserStagePlugin.html" xlink:actuate="onRequest" xlink:href="ParserStagePlugin.html" xlink:show="new" xlink:title="ParserStagePlugin.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f18ad5zt7e4968)" height="60.8047" id="org.apache.wiki.api.plugin.ParserStagePlugin" style="stroke:#A80036;stroke-width:1.5;" width="403" x="540.5" y="47.5"/><ellipse cx="681.25" [...]
+class org.apache.wiki.api.plugin.PluginElement--><a href="PluginElement.html" target="_top" title="PluginElement.html" xlink:actuate="onRequest" xlink:href="PluginElement.html" xlink:show="new" xlink:title="PluginElement.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#f18ad5zt7e4968)" height="137.6328" id="org.apache.wiki.api.plugin.PluginElement" style="stroke:#A80036;stroke-width:1.5;" width="241" x="377.5" y="175"/><ellipse cx="449.75" cy="191" fill="#B4A7E5" [...]
+class org.apache.wiki.api.plugin.WikiPlugin--><a href="WikiPlugin.html" target="_top" title="WikiPlugin.html" xlink:actuate="onRequest" xlink:href="WikiPlugin.html" xlink:show="new" xlink:title="WikiPlugin.html" xlink:type="simple"><rect codeLine="26" fill="#FEFECE" filter="url(#f18ad5zt7e4968)" height="79.5469" id="org.apache.wiki.api.plugin.WikiPlugin" style="stroke:#A80036;stroke-width:1.5;" width="310" x="32" y="204"/><ellipse cx="141.25" cy="222.9688" fill="#B4A7E5" rx="11" ry="11"  [...]
+reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.api.plugin.WikiPlugin--><path codeLine="31" d="M179.79,135.47 C181.3,158 183,183.39 184.37,203.84 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.api.plugin.WikiPlugin" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="172.8,135.82,178.44,115.4,186.76,134.88,172.8,135.82" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[8738b868a41b5cfbd16881fa7f97d369]
+link org.apache.wiki.api.plugin.InitializablePlugin to org.apache.wiki.api.plugin.ParserStagePlugin--><!--MD5=[2cf37abaf8bf0b7f95754f85ee949f54]
+link org.apache.wiki.api.plugin.InitializablePlugin to org.apache.wiki.api.plugin.PluginElement--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="386" y="344.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[5fd76001d74f5436cb1d79d422d66014]
 @startuml
     namespace org.apache.wiki.api.plugin {
 
+        interface InitializablePlugin [[InitializablePlugin.html]] {
+            {abstract} +initialize(Engine): void
+        }
+
+        interface Plugin [[Plugin.html]] {
+            {static} +CORE_PLUGINS_RESOURCEBUNDLE: String
+            {abstract} +execute(Context, Map<String, String>): String
+        }
+
         interface ParserStagePlugin [[ParserStagePlugin.html]] {
             {abstract} +executeParser(PluginElement, Context, Map<String, String>): void
         }
@@ -25,15 +34,6 @@ link org.apache.wiki.api.plugin.ParserStagePlugin to org.apache.wiki.api.plugin.
             {abstract} +executeParse(Context): void
         }
 
-        interface InitializablePlugin [[InitializablePlugin.html]] {
-            {abstract} +initialize(Engine): void
-        }
-
-        interface Plugin [[Plugin.html]] {
-            {static} +CORE_PLUGINS_RESOURCEBUNDLE: String
-            {abstract} +execute(Context, Map<String, String>): String
-        }
-
         interface WikiPlugin <<deprecated>> [[WikiPlugin.html]] {
             +execute(Context, Map<String, String>): String
             {abstract} +execute(WikiContext, Map<String, String>): String
@@ -51,5 +51,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/AttachmentProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/AttachmentProvider.svg
index de3eaf21eb..39d2a96a9f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/AttachmentProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/AttachmentProvider.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="364px" preserveAspectRatio="none" style="width:361px;height:364px;background:#FFFFFF;" version="1.1" viewBox="0 0 361 364" width="361px" zoomAndPan="magnify"><defs><filter height="300%" id="ffis45hif042f" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.providers.AttachmentProvider--><a href="AttachmentProvider.html" target="_top" title="AttachmentProvider.html" xlink:actuate="onRequest" xlink:href="AttachmentProvider.html" xlink:show="new" xlink:title="AttachmentProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ffis45hif042f)" height="194.7891" id="org.apache.wiki.api.providers.AttachmentProvider" style="stroke:#A80036;stroke-width:1.5;" width="340" x="7" y="139"/><ellipse cx="1 [...]
 class org.apache.wiki.api.providers.WikiProvider--><a href="WikiProvider.html" target="_top" title="WikiProvider.html" xlink:actuate="onRequest" xlink:href="WikiProvider.html" xlink:show="new" xlink:title="WikiProvider.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#ffis45hif042f)" height="71.5469" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="216" x="69" y="7"/><ellipse cx="101.55" cy="25.9688" fill="#B4A7E5" rx [...]
-reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.providers.AttachmentProvider--><path codeLine="24" d="M177,99.33 C177,111.7 177,125.17 177,138.67 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.api.providers.AttachmentProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="170,99.12,177,79.12,184,99.12,170,99.12" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-seri [...]
+reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.providers.AttachmentProvider--><path codeLine="24" d="M177,99.33 C177,111.7 177,125.17 177,138.67 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.api.providers.AttachmentProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="170,99.12,177,79.12,184,99.12,170,99.12" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-seri [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -37,5 +37,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/PageProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/PageProvider.svg
index 9d635d6f55..92a3ef1db1 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/PageProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/PageProvider.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="382px" preserveAspectRatio="none" style="width:333px;height:382px;background:#FFFFFF;" version="1.1" viewBox="0 0 333 382" width="333px" zoomAndPan="magnify"><defs><filter height="300%" id="fppmpnqs0fpw3" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.api.providers.PageProvider--><a href="PageProvider.html" target="_top" title="PageProvider.html" xlink:actuate="onRequest" xlink:href="PageProvider.html" xlink:show="new" xlink:title="PageProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fppmpnqs0fpw3)" height="212.3984" id="org.apache.wiki.api.providers.PageProvider" style="stroke:#A80036;stroke-width:1.5;" width="312" x="7" y="139"/><ellipse cx="86.25" cy="157.9688" fill="#B4A7E5" r [...]
 class org.apache.wiki.api.providers.WikiProvider--><a href="WikiProvider.html" target="_top" title="WikiProvider.html" xlink:actuate="onRequest" xlink:href="WikiProvider.html" xlink:show="new" xlink:title="WikiProvider.html" xlink:type="simple"><rect codeLine="21" fill="#FEFECE" filter="url(#fppmpnqs0fpw3)" height="71.5469" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="216" x="55" y="7"/><ellipse cx="87.55" cy="25.9688" fill="#B4A7E5" rx= [...]
-reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.providers.PageProvider--><path codeLine="26" d="M163,99.36 C163,111.66 163,125.09 163,138.65 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.api.providers.PageProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="156,99.3,163,79.3,170,99.3,156,99.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="1 [...]
+reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.providers.PageProvider--><path codeLine="26" d="M163,99.36 C163,111.66 163,125.09 163,138.65 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.api.providers.PageProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="156,99.3,163,79.3,170,99.3,156,99.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="1 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -39,5 +39,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/WikiProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/WikiProvider.svg
index 10b8d61e97..03f85177c6 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/WikiProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/WikiProvider.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="124px" preserveAspectRatio="none" style="width:237px;height:124px;background:#FFFFFF;" version="1.1" viewBox="0 0 237 124" width="237px" zoomAndPan="magnify"><defs><filter height="300%" id="f1t05urou4uaa4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.providers.WikiProvider--><a href="WikiProvider.html" target="_top" title="WikiProvider.html" xlink:actuate="onRequest" xlink:href="WikiProvider.html" xlink:show="new" xlink:title="WikiProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1t05urou4uaa4)" height="92.3516" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="216" x="7" y="7"/><ellipse cx="39.55" cy="25.9688" fill="#B4A7E5" rx=" [...]
+class org.apache.wiki.api.providers.WikiProvider--><a href="WikiProvider.html" target="_top" title="WikiProvider.html" xlink:actuate="onRequest" xlink:href="WikiProvider.html" xlink:show="new" xlink:title="WikiProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1t05urou4uaa4)" height="92.3516" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="216" x="7" y="7"/><ellipse cx="39.55" cy="25.9688" fill="#B4A7E5" rx=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/package.svg
index 40f85f66d3..6731e9b54a 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/providers/package.svg
@@ -1,13 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="440px" preserveAspectRatio="none" style="width:752px;height:440px;background:#FFFFFF;" version="1.1" viewBox="0 0 752 440" width="752px" zoomAndPan="magnify"><defs><filter height="300%" id="ffmhqnzjflbfj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-cluster org.apache.wiki.api.providers--><polygon fill="#FFFFFF" filter="url(#ffmhqnzjflbfj)" points="16,6,256,6,263,28.2969,735,28.2969,735,417,16,417,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="263" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="234" x="20" y="20.9951">org.apache.wiki.api.providers</text><!--MD5=[ebfb9829b8ca2c9c74 [...]
-class org.apache.wiki.api.providers.PageProvider--><a href="PageProvider.html" target="_top" title="PageProvider.html" xlink:actuate="onRequest" xlink:href="PageProvider.html" xlink:show="new" xlink:title="PageProvider.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#ffmhqnzjflbfj)" height="214.4609" id="org.apache.wiki.api.providers.PageProvider" style="stroke:#A80036;stroke-width:1.5;" width="312" x="32" y="187"/><ellipse cx="143.25" cy="203" fill="#B4A7E5" rx=" [...]
-class org.apache.wiki.api.providers.AttachmentProvider--><a href="AttachmentProvider.html" target="_top" title="AttachmentProvider.html" xlink:actuate="onRequest" xlink:href="AttachmentProvider.html" xlink:show="new" xlink:title="AttachmentProvider.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#ffmhqnzjflbfj)" height="188.8516" id="org.apache.wiki.api.providers.AttachmentProvider" style="stroke:#A80036;stroke-width:1.5;" width="340" x="379" y="199.5"/><ellipse  [...]
-class org.apache.wiki.api.providers.WikiProvider--><a href="WikiProvider.html" target="_top" title="WikiProvider.html" xlink:actuate="onRequest" xlink:href="WikiProvider.html" xlink:show="new" xlink:title="WikiProvider.html" xlink:type="simple"><rect codeLine="33" fill="#FEFECE" filter="url(#ffmhqnzjflbfj)" height="86.4141" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="216" x="260" y="41"/><ellipse cx="326.25" cy="57" fill="#B4A7E5" rx="1 [...]
-reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.providers.PageProvider--><path codeLine="39" d="M318.15,142.6 C306.19,156.42 293.04,171.62 279.84,186.87 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.api.providers.PageProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="313.19,137.63,331.57,127.09,323.78,146.8,313.19,137.63" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[336bdd61b6cc4b01fa [...]
-reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.providers.AttachmentProvider--><path codeLine="40" d="M417.86,142.3 C433.25,159.99 450.62,179.95 467.57,199.42 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.api.providers.AttachmentProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="412.48,146.77,404.63,127.09,423.04,137.58,412.48,146.77" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#8 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="440px" preserveAspectRatio="none" style="width:752px;height:440px;background:#FFFFFF;" version="1.1" viewBox="0 0 752 440" width="752px" zoomAndPan="magnify"><defs><filter height="300%" id="fy00fk9ap6fe1" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+cluster org.apache.wiki.api.providers--><polygon fill="#FFFFFF" filter="url(#fy00fk9ap6fe1)" points="16,6,256,6,263,28.2969,735,28.2969,735,417,16,417,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="263" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="234" x="20" y="20.9951">org.apache.wiki.api.providers</text><!--MD5=[ea4dae4738ef87ae92 [...]
+class org.apache.wiki.api.providers.AttachmentProvider--><a href="AttachmentProvider.html" target="_top" title="AttachmentProvider.html" xlink:actuate="onRequest" xlink:href="AttachmentProvider.html" xlink:show="new" xlink:title="AttachmentProvider.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fy00fk9ap6fe1)" height="188.8516" id="org.apache.wiki.api.providers.AttachmentProvider" style="stroke:#A80036;stroke-width:1.5;" width="340" x="32" y="199.5"/><ellipse cx [...]
+class org.apache.wiki.api.providers.PageProvider--><a href="PageProvider.html" target="_top" title="PageProvider.html" xlink:actuate="onRequest" xlink:href="PageProvider.html" xlink:show="new" xlink:title="PageProvider.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#fy00fk9ap6fe1)" height="214.4609" id="org.apache.wiki.api.providers.PageProvider" style="stroke:#A80036;stroke-width:1.5;" width="312" x="407" y="187"/><ellipse cx="518.25" cy="203" fill="#B4A7E5" rx [...]
+class org.apache.wiki.api.providers.WikiProvider--><a href="WikiProvider.html" target="_top" title="WikiProvider.html" xlink:actuate="onRequest" xlink:href="WikiProvider.html" xlink:show="new" xlink:title="WikiProvider.html" xlink:type="simple"><rect codeLine="33" fill="#FEFECE" filter="url(#fy00fk9ap6fe1)" height="86.4141" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="216" x="274" y="41"/><ellipse cx="340.25" cy="57" fill="#B4A7E5" rx="1 [...]
+reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.providers.AttachmentProvider--><path codeLine="39" d="M332.42,142.3 C317.11,159.99 299.83,179.95 282.98,199.42 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.api.providers.AttachmentProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="327.19,137.63,345.57,127.09,337.78,146.8,327.19,137.63" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5743d5 [...]
+reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.providers.PageProvider--><path codeLine="40" d="M432.13,142.6 C444.15,156.42 457.37,171.62 470.65,186.87 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.api.providers.PageProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="426.48,146.77,418.63,127.09,437.04,137.58,426.48,146.77" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font- [...]
 @startuml
     namespace org.apache.wiki.api.providers {
 
+        interface AttachmentProvider [[AttachmentProvider.html]] {
+            {static} +PROP_STORAGEDIR: String
+            {abstract} +putAttachmentData(Attachment, InputStream): void
+            {abstract} +getAttachmentData(Attachment): InputStream
+            {abstract} +listAttachments(Page): List<Attachment>
+            {abstract} +findAttachments(QueryItem[]): Collection<Attachment>
+            {abstract} +listAllChanged(Date): List<Attachment>
+            {abstract} +getAttachmentInfo(Page, String, int): Attachment
+            {abstract} +getVersionHistory(Attachment): List<Attachment>
+            {abstract} +deleteVersion(Attachment): void
+            {abstract} +deleteAttachment(Attachment): void
+            {abstract} +moveAttachmentsForPage(String, String): void
+        }
+
         interface PageProvider [[PageProvider.html]] {
             {abstract} +putPageText(Page, String): void
             {abstract} +pageExists(String): boolean
@@ -24,28 +38,14 @@ reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.api.p
             {abstract} +movePage(String, String): void
         }
 
-        interface AttachmentProvider [[AttachmentProvider.html]] {
-            {static} +PROP_STORAGEDIR: String
-            {abstract} +putAttachmentData(Attachment, InputStream): void
-            {abstract} +getAttachmentData(Attachment): InputStream
-            {abstract} +listAttachments(Page): List<Attachment>
-            {abstract} +findAttachments(QueryItem[]): Collection<Attachment>
-            {abstract} +listAllChanged(Date): List<Attachment>
-            {abstract} +getAttachmentInfo(Page, String, int): Attachment
-            {abstract} +getVersionHistory(Attachment): List<Attachment>
-            {abstract} +deleteVersion(Attachment): void
-            {abstract} +deleteAttachment(Attachment): void
-            {abstract} +moveAttachmentsForPage(String, String): void
-        }
-
         interface WikiProvider [[WikiProvider.html]] {
             {static} +LATEST_VERSION: int
             {abstract} +initialize(Engine, Properties): void
             {abstract} +getProviderInfo(): String
         }
 
-        WikiProvider <|- - PageProvider
         WikiProvider <|- - AttachmentProvider
+        WikiProvider <|- - PageProvider
     }
 
     center footer UMLDoclet 2.0.15, PlantUML 1.2021.13
@@ -57,5 +57,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/QueryItem.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/QueryItem.svg
index da8a20f19c..2c26af6d30 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/QueryItem.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/QueryItem.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="141px" preserveAspectRatio="none" style="width:199px;height:141px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 141" width="199px" zoomAndPan="magnify"><defs><filter height="300%" id="f16x5vlfv62s8y" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.search.QueryItem--><a href="QueryItem.html" target="_top" title="QueryItem.html" xlink:actuate="onRequest" xlink:href="QueryItem.html" xlink:show="new" xlink:title="QueryItem.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f16x5vlfv62s8y)" height="109.9609" id="org.apache.wiki.api.search.QueryItem" style="stroke:#A80036;stroke-width:1.5;" width="158" x="17" y="7"/><ellipse cx="32" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
+class org.apache.wiki.api.search.QueryItem--><a href="QueryItem.html" target="_top" title="QueryItem.html" xlink:actuate="onRequest" xlink:href="QueryItem.html" xlink:show="new" xlink:title="QueryItem.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f16x5vlfv62s8y)" height="109.9609" id="org.apache.wiki.api.search.QueryItem" style="stroke:#A80036;stroke-width:1.5;" width="158" x="17" y="7"/><ellipse cx="32" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/SearchResult.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/SearchResult.svg
index efa1af3168..715369237b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/SearchResult.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/SearchResult.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="116px" preserveAspectRatio="none" style="width:199px;height:116px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 116" width="199px" zoomAndPan="magnify"><defs><filter height="300%" id="fg315e161ct4l" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.search.SearchResult--><a href="SearchResult.html" target="_top" title="SearchResult.html" xlink:actuate="onRequest" xlink:href="SearchResult.html" xlink:show="new" xlink:title="SearchResult.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fg315e161ct4l)" height="84.3516" id="org.apache.wiki.api.search.SearchResult" style="stroke:#A80036;stroke-width:1.5;" width="164" x="14" y="7"/><ellipse cx="29" cy="25.9688" fill="#B4A7E5" rx="11" ry="1 [...]
+class org.apache.wiki.api.search.SearchResult--><a href="SearchResult.html" target="_top" title="SearchResult.html" xlink:actuate="onRequest" xlink:href="SearchResult.html" xlink:show="new" xlink:title="SearchResult.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fg315e161ct4l)" height="84.3516" id="org.apache.wiki.api.search.SearchResult" style="stroke:#A80036;stroke-width:1.5;" width="164" x="14" y="7"/><ellipse cx="29" cy="25.9688" fill="#B4A7E5" rx="11" ry="1 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/package.svg
index 1bc3ec8841..56a7b50dce 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/search/package.svg
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="192px" preserveAspectRatio="none" style="width:368px;height:192px;background:#FFFFFF;" version="1.1" viewBox="0 0 368 192" width="368px" zoomAndPan="magnify"><defs><filter height="300%" id="fuuhy1ftjtw51" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-cluster org.apache.wiki.api.search--><polygon fill="#FFFFFF" filter="url(#fuuhy1ftjtw51)" points="16,6,234,6,241,28.2969,351,28.2969,351,169,16,169,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="241" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="20" y="20.9951">org.apache.wiki.api.search</text><!--MD5=[4898dc02c93ff0c7bc5f9c18 [...]
-class org.apache.wiki.api.search.QueryItem--><a href="QueryItem.html" target="_top" title="QueryItem.html" xlink:actuate="onRequest" xlink:href="QueryItem.html" xlink:show="new" xlink:title="QueryItem.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fuuhy1ftjtw51)" height="112.0234" id="org.apache.wiki.api.search.QueryItem" style="stroke:#A80036;stroke-width:1.5;" width="116" x="219" y="41"/><ellipse cx="243.45" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
-class org.apache.wiki.api.search.SearchResult--><a href="SearchResult.html" target="_top" title="SearchResult.html" xlink:actuate="onRequest" xlink:href="SearchResult.html" xlink:show="new" xlink:title="SearchResult.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#fuuhy1ftjtw51)" height="86.4141" id="org.apache.wiki.api.search.SearchResult" style="stroke:#A80036;stroke-width:1.5;" width="151" x="32.5" y="54"/><ellipse cx="64.15" cy="70" fill="#B4A7E5" rx="11" ry= [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="192px" preserveAspectRatio="none" style="width:368px;height:192px;background:#FFFFFF;" version="1.1" viewBox="0 0 368 192" width="368px" zoomAndPan="magnify"><defs><filter height="300%" id="fu5z7tm61cjnj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+cluster org.apache.wiki.api.search--><polygon fill="#FFFFFF" filter="url(#fu5z7tm61cjnj)" points="16,6,234,6,241,28.2969,351,28.2969,351,169,16,169,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="241" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="20" y="20.9951">org.apache.wiki.api.search</text><!--MD5=[48c1a0424b68d58c2410d321 [...]
+class org.apache.wiki.api.search.SearchResult--><a href="SearchResult.html" target="_top" title="SearchResult.html" xlink:actuate="onRequest" xlink:href="SearchResult.html" xlink:show="new" xlink:title="SearchResult.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fu5z7tm61cjnj)" height="86.4141" id="org.apache.wiki.api.search.SearchResult" style="stroke:#A80036;stroke-width:1.5;" width="151" x="183.5" y="54"/><ellipse cx="215.15" cy="70" fill="#B4A7E5" rx="11" ry [...]
+class org.apache.wiki.api.search.QueryItem--><a href="QueryItem.html" target="_top" title="QueryItem.html" xlink:actuate="onRequest" xlink:href="QueryItem.html" xlink:show="new" xlink:title="QueryItem.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#fu5z7tm61cjnj)" height="112.0234" id="org.apache.wiki.api.search.QueryItem" style="stroke:#A80036;stroke-width:1.5;" width="116" x="32" y="41"/><ellipse cx="56.45" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:# [...]
 @startuml
     namespace org.apache.wiki.api.search {
 
+        interface SearchResult [[SearchResult.html]] {
+            {abstract} +getPage(): Page
+            {abstract} +getScore(): int
+            {abstract} +getContexts(): String[]
+        }
+
         class QueryItem [[QueryItem.html]] {
             {static} +REQUIRED: int
             {static} +FORBIDDEN: int
@@ -13,12 +19,6 @@ class org.apache.wiki.api.search.SearchResult--><a href="SearchResult.html" targ
             +type: int
         }
 
-        interface SearchResult [[SearchResult.html]] {
-            {abstract} +getPage(): Page
-            {abstract} +getScore(): int
-            {abstract} +getContexts(): String[]
-        }
-
     }
 
     center footer UMLDoclet 2.0.15, PlantUML 1.2021.13
@@ -30,5 +30,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/AclsDSL.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/AclsDSL.svg
index a189a85937..ac66637913 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/AclsDSL.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/AclsDSL.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="103px" preserveAspectRatio="none" style="width:199px;height:103px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 103" width="199px" zoomAndPan="magnify"><defs><filter height="300%" id="frakxdgt68ye4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.spi.AclsDSL--><a href="AclsDSL.html" target="_top" title="AclsDSL.html" xlink:actuate="onRequest" xlink:href="AclsDSL.html" xlink:show="new" xlink:title="AclsDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#frakxdgt68ye4)" height="71.5469" id="org.apache.wiki.api.spi.AclsDSL" style="stroke:#A80036;stroke-width:1.5;" width="139" x="26.5" y="7"/><ellipse cx="41.5" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke- [...]
+class org.apache.wiki.api.spi.AclsDSL--><a href="AclsDSL.html" target="_top" title="AclsDSL.html" xlink:actuate="onRequest" xlink:href="AclsDSL.html" xlink:show="new" xlink:title="AclsDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#frakxdgt68ye4)" height="71.5469" id="org.apache.wiki.api.spi.AclsDSL" style="stroke:#A80036;stroke-width:1.5;" width="139" x="26.5" y="7"/><ellipse cx="41.5" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke- [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -19,5 +19,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/AclsSPI.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/AclsSPI.svg
index 6f9c451d80..bf2a6f629e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/AclsSPI.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/AclsSPI.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="103px" preserveAspectRatio="none" style="width:199px;height:103px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 103" width="199px" zoomAndPan="magnify"><defs><filter height="300%" id="f107wjfe8dfaq0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.spi.AclsSPI--><a href="AclsSPI.html" target="_top" title="AclsSPI.html" xlink:actuate="onRequest" xlink:href="AclsSPI.html" xlink:show="new" xlink:title="AclsSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f107wjfe8dfaq0)" height="71.5469" id="org.apache.wiki.api.spi.AclsSPI" style="stroke:#A80036;stroke-width:1.5;" width="145" x="23.5" y="7"/><ellipse cx="38.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke [...]
+class org.apache.wiki.api.spi.AclsSPI--><a href="AclsSPI.html" target="_top" title="AclsSPI.html" xlink:actuate="onRequest" xlink:href="AclsSPI.html" xlink:show="new" xlink:title="AclsSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f107wjfe8dfaq0)" height="71.5469" id="org.apache.wiki.api.spi.AclsSPI" style="stroke:#A80036;stroke-width:1.5;" width="145" x="23.5" y="7"/><ellipse cx="38.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -19,5 +19,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContentsDSL.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContentsDSL.svg
index f02effa615..a2ce975b47 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContentsDSL.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContentsDSL.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="103px" preserveAspectRatio="none" style="width:313px;height:103px;background:#FFFFFF;" version="1.1" viewBox="0 0 313 103" width="313px" zoomAndPan="magnify"><defs><filter height="300%" id="f1olpt8bjx8bk4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.spi.ContentsDSL--><a href="ContentsDSL.html" target="_top" title="ContentsDSL.html" xlink:actuate="onRequest" xlink:href="ContentsDSL.html" xlink:show="new" xlink:title="ContentsDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1olpt8bjx8bk4)" height="71.5469" id="org.apache.wiki.api.spi.ContentsDSL" style="stroke:#A80036;stroke-width:1.5;" width="292" x="7" y="7"/><ellipse cx="95.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style= [...]
+class org.apache.wiki.api.spi.ContentsDSL--><a href="ContentsDSL.html" target="_top" title="ContentsDSL.html" xlink:actuate="onRequest" xlink:href="ContentsDSL.html" xlink:show="new" xlink:title="ContentsDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1olpt8bjx8bk4)" height="71.5469" id="org.apache.wiki.api.spi.ContentsDSL" style="stroke:#A80036;stroke-width:1.5;" width="292" x="7" y="7"/><ellipse cx="95.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -19,5 +19,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContentsSPI.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContentsSPI.svg
index f38bb03db6..f188b59d90 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContentsSPI.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContentsSPI.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="103px" preserveAspectRatio="none" style="width:312px;height:103px;background:#FFFFFF;" version="1.1" viewBox="0 0 312 103" width="312px" zoomAndPan="magnify"><defs><filter height="300%" id="f1n9it6q4anuvs" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.api.spi.ContentsSPI--><a href="ContentsSPI.html" target="_top" title="ContentsSPI.html" xlink:actuate="onRequest" xlink:href="ContentsSPI.html" xlink:show="new" xlink:title="ContentsSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1n9it6q4anuvs)" height="71.5469" id="org.apache.wiki.api.spi.ContentsSPI" style="stroke:#A80036;stroke-width:1.5;" width="291" x="7" y="7"/><ellipse cx="91.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style= [...]
+class org.apache.wiki.api.spi.ContentsSPI--><a href="ContentsSPI.html" target="_top" title="ContentsSPI.html" xlink:actuate="onRequest" xlink:href="ContentsSPI.html" xlink:show="new" xlink:title="ContentsSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1n9it6q4anuvs)" height="71.5469" id="org.apache.wiki.api.spi.ContentsSPI" style="stroke:#A80036;stroke-width:1.5;" width="291" x="7" y="7"/><ellipse cx="91.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -19,5 +19,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContextDSL.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContextDSL.svg
index b1a84a5843..a167a36e59 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContextDSL.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContextDSL.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="128px" preserveAspectRatio="none" style="width:363px;height:128px;background:#FFFFFF;" version="1.1" viewBox="0 0 363 128" width="363px" zoomAndPan="magnify"><defs><filter height="300%" id="fdeztqlu3s6ws" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.spi.ContextDSL--><a href="ContextDSL.html" target="_top" title="ContextDSL.html" xlink:actuate="onRequest" xlink:href="ContextDSL.html" xlink:show="new" xlink:title="ContextDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fdeztqlu3s6ws)" height="97.1563" id="org.apache.wiki.api.spi.ContextDSL" style="stroke:#A80036;stroke-width:1.5;" width="342" x="7" y="7"/><ellipse cx="120.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="strok [...]
+class org.apache.wiki.api.spi.ContextDSL--><a href="ContextDSL.html" target="_top" title="ContextDSL.html" xlink:actuate="onRequest" xlink:href="ContextDSL.html" xlink:show="new" xlink:title="ContextDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fdeztqlu3s6ws)" height="97.1563" id="org.apache.wiki.api.spi.ContextDSL" style="stroke:#A80036;stroke-width:1.5;" width="342" x="7" y="7"/><ellipse cx="120.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="strok [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContextSPI.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContextSPI.svg
index 9b8fa96d1d..fa73d2f657 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContextSPI.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/ContextSPI.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="128px" preserveAspectRatio="none" style="width:364px;height:128px;background:#FFFFFF;" version="1.1" viewBox="0 0 364 128" width="364px" zoomAndPan="magnify"><defs><filter height="300%" id="fs9tcyjtvyc0y" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.spi.ContextSPI--><a href="ContextSPI.html" target="_top" title="ContextSPI.html" xlink:actuate="onRequest" xlink:href="ContextSPI.html" xlink:show="new" xlink:title="ContextSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fs9tcyjtvyc0y)" height="97.1563" id="org.apache.wiki.api.spi.ContextSPI" style="stroke:#A80036;stroke-width:1.5;" width="343" x="7" y="7"/><ellipse cx="117.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="strok [...]
+class org.apache.wiki.api.spi.ContextSPI--><a href="ContextSPI.html" target="_top" title="ContextSPI.html" xlink:actuate="onRequest" xlink:href="ContextSPI.html" xlink:show="new" xlink:title="ContextSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fs9tcyjtvyc0y)" height="97.1563" id="org.apache.wiki.api.spi.ContextSPI" style="stroke:#A80036;stroke-width:1.5;" width="343" x="7" y="7"/><ellipse cx="117.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="strok [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/EngineDSL.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/EngineDSL.svg
index 58dfe1510d..22eac6f24d 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/EngineDSL.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/EngineDSL.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="116px" preserveAspectRatio="none" style="width:272px;height:116px;background:#FFFFFF;" version="1.1" viewBox="0 0 272 116" width="272px" zoomAndPan="magnify"><defs><filter height="300%" id="fpcd1rczam2fb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.spi.EngineDSL--><a href="EngineDSL.html" target="_top" title="EngineDSL.html" xlink:actuate="onRequest" xlink:href="EngineDSL.html" xlink:show="new" xlink:title="EngineDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fpcd1rczam2fb)" height="84.3516" id="org.apache.wiki.api.spi.EngineDSL" style="stroke:#A80036;stroke-width:1.5;" width="251" x="7" y="7"/><ellipse cx="74.75" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A800 [...]
+class org.apache.wiki.api.spi.EngineDSL--><a href="EngineDSL.html" target="_top" title="EngineDSL.html" xlink:actuate="onRequest" xlink:href="EngineDSL.html" xlink:show="new" xlink:title="EngineDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fpcd1rczam2fb)" height="84.3516" id="org.apache.wiki.api.spi.EngineDSL" style="stroke:#A80036;stroke-width:1.5;" width="251" x="7" y="7"/><ellipse cx="74.75" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A800 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/EngineSPI.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/EngineSPI.svg
index 24c1e08e92..55b566ee0b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/EngineSPI.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/EngineSPI.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:272px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 272 90" width="272px" zoomAndPan="magnify"><defs><filter height="300%" id="f15ixdcxzk047q" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation= [...]
-class org.apache.wiki.api.spi.EngineSPI--><a href="EngineSPI.html" target="_top" title="EngineSPI.html" xlink:actuate="onRequest" xlink:href="EngineSPI.html" xlink:show="new" xlink:title="EngineSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f15ixdcxzk047q)" height="58.7422" id="org.apache.wiki.api.spi.EngineSPI" style="stroke:#A80036;stroke-width:1.5;" width="251" x="7" y="7"/><ellipse cx="71.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80 [...]
+class org.apache.wiki.api.spi.EngineSPI--><a href="EngineSPI.html" target="_top" title="EngineSPI.html" xlink:actuate="onRequest" xlink:href="EngineSPI.html" xlink:show="new" xlink:title="EngineSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f15ixdcxzk047q)" height="58.7422" id="org.apache.wiki.api.spi.EngineSPI" style="stroke:#A80036;stroke-width:1.5;" width="251" x="7" y="7"/><ellipse cx="71.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/SessionDSL.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/SessionDSL.svg
index b189c8a569..7b16aadc80 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/SessionDSL.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/SessionDSL.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="116px" preserveAspectRatio="none" style="width:285px;height:116px;background:#FFFFFF;" version="1.1" viewBox="0 0 285 116" width="285px" zoomAndPan="magnify"><defs><filter height="300%" id="f45d91ktned2t" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.spi.SessionDSL--><a href="SessionDSL.html" target="_top" title="SessionDSL.html" xlink:actuate="onRequest" xlink:href="SessionDSL.html" xlink:show="new" xlink:title="SessionDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f45d91ktned2t)" height="84.3516" id="org.apache.wiki.api.spi.SessionDSL" style="stroke:#A80036;stroke-width:1.5;" width="264" x="7" y="7"/><ellipse cx="81.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
+class org.apache.wiki.api.spi.SessionDSL--><a href="SessionDSL.html" target="_top" title="SessionDSL.html" xlink:actuate="onRequest" xlink:href="SessionDSL.html" xlink:show="new" xlink:title="SessionDSL.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f45d91ktned2t)" height="84.3516" id="org.apache.wiki.api.spi.SessionDSL" style="stroke:#A80036;stroke-width:1.5;" width="264" x="7" y="7"/><ellipse cx="81.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/SessionSPI.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/SessionSPI.svg
index 15c20ccc56..37526bf604 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/SessionSPI.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/SessionSPI.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="116px" preserveAspectRatio="none" style="width:286px;height:116px;background:#FFFFFF;" version="1.1" viewBox="0 0 286 116" width="286px" zoomAndPan="magnify"><defs><filter height="300%" id="f9fqy8vhvopk7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.spi.SessionSPI--><a href="SessionSPI.html" target="_top" title="SessionSPI.html" xlink:actuate="onRequest" xlink:href="SessionSPI.html" xlink:show="new" xlink:title="SessionSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f9fqy8vhvopk7)" height="84.3516" id="org.apache.wiki.api.spi.SessionSPI" style="stroke:#A80036;stroke-width:1.5;" width="265" x="7" y="7"/><ellipse cx="78.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke [...]
+class org.apache.wiki.api.spi.SessionSPI--><a href="SessionSPI.html" target="_top" title="SessionSPI.html" xlink:actuate="onRequest" xlink:href="SessionSPI.html" xlink:show="new" xlink:title="SessionSPI.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f9fqy8vhvopk7)" height="84.3516" id="org.apache.wiki.api.spi.SessionSPI" style="stroke:#A80036;stroke-width:1.5;" width="265" x="7" y="7"/><ellipse cx="78.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/Wiki.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/Wiki.svg
index 8fecc59508..b31fac9102 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/Wiki.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/Wiki.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="154px" preserveAspectRatio="none" style="width:222px;height:154px;background:#FFFFFF;" version="1.1" viewBox="0 0 222 154" width="222px" zoomAndPan="magnify"><defs><filter height="300%" id="fp8vmn47d9qdg" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.api.spi.Wiki--><a href="Wiki.html" target="_top" title="Wiki.html" xlink:actuate="onRequest" xlink:href="Wiki.html" xlink:show="new" xlink:title="Wiki.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fp8vmn47d9qdg)" height="122.7656" id="org.apache.wiki.api.spi.Wiki" style="stroke:#A80036;stroke-width:1.5;" width="201" x="7" y="7"/><ellipse cx="49.9" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d [...]
+class org.apache.wiki.api.spi.Wiki--><a href="Wiki.html" target="_top" title="Wiki.html" xlink:actuate="onRequest" xlink:href="Wiki.html" xlink:show="new" xlink:title="Wiki.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fp8vmn47d9qdg)" height="122.7656" id="org.apache.wiki.api.spi.Wiki" style="stroke:#A80036;stroke-width:1.5;" width="201" x="7" y="7"/><ellipse cx="49.9" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/package.svg
index 1a315b79c4..d1c37d8851 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/api/spi/package.svg
@@ -1,48 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="485px" preserveAspectRatio="none" style="width:1348px;height:485px;background:#FFFFFF;" version="1.1" viewBox="0 0 1348 485" width="1348px" zoomAndPan="magnify"><defs><filter height="300%" id="ff39e06h24484" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
-cluster org.apache.wiki.api.spi--><polygon fill="#FFFFFF" filter="url(#ff39e06h24484)" points="16,6,203,6,210,28.2969,1331,28.2969,1331,462,16,462,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="210" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="181" x="20" y="20.9951">org.apache.wiki.api.spi</text><!--MD5=[f94607c025d7165374977c722d2704ab]
-class org.apache.wiki.api.spi.ContextSPI--><a href="ContextSPI.html" target="_top" title="ContextSPI.html" xlink:actuate="onRequest" xlink:href="ContextSPI.html" xlink:show="new" xlink:title="ContextSPI.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#ff39e06h24484)" height="99.2188" id="org.apache.wiki.api.spi.ContextSPI" style="stroke:#A80036;stroke-width:1.5;" width="343" x="31.5" y="54"/><ellipse cx="164.75" cy="70" fill="#B4A7E5" rx="11" ry="11" style="stroke [...]
-class org.apache.wiki.api.spi.ContextDSL--><a href="ContextDSL.html" target="_top" title="ContextDSL.html" xlink:actuate="onRequest" xlink:href="ContextDSL.html" xlink:show="new" xlink:title="ContextDSL.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#ff39e06h24484)" height="99.2188" id="org.apache.wiki.api.spi.ContextDSL" style="stroke:#A80036;stroke-width:1.5;" width="342" x="410" y="54"/><ellipse cx="541.25" cy="70" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
-class org.apache.wiki.api.spi.ContentsSPI--><a href="ContentsSPI.html" target="_top" title="ContentsSPI.html" xlink:actuate="onRequest" xlink:href="ContentsSPI.html" xlink:show="new" xlink:title="ContentsSPI.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#ff39e06h24484)" height="73.6094" id="org.apache.wiki.api.spi.ContentsSPI" style="stroke:#A80036;stroke-width:1.5;" width="291" x="787.5" y="66.5"/><ellipse cx="891.25" cy="82.5" fill="#B4A7E5" rx="11" ry="11" s [...]
-class org.apache.wiki.api.spi.Wiki--><a href="Wiki.html" target="_top" title="Wiki.html" xlink:actuate="onRequest" xlink:href="Wiki.html" xlink:show="new" xlink:title="Wiki.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#ff39e06h24484)" height="124.8281" id="org.apache.wiki.api.spi.Wiki" style="stroke:#A80036;stroke-width:1.5;" width="201" x="1113.5" y="41"/><ellipse cx="1197.75" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><p [...]
-class org.apache.wiki.api.spi.SessionSPI--><a href="SessionSPI.html" target="_top" title="SessionSPI.html" xlink:actuate="onRequest" xlink:href="SessionSPI.html" xlink:show="new" xlink:title="SessionSPI.html" xlink:type="simple"><rect codeLine="31" fill="#FEFECE" filter="url(#ff39e06h24484)" height="86.4141" id="org.apache.wiki.api.spi.SessionSPI" style="stroke:#A80036;stroke-width:1.5;" width="265" x="70.5" y="226"/><ellipse cx="165.75" cy="242" fill="#B4A7E5" rx="11" ry="11" style="str [...]
-class org.apache.wiki.api.spi.SessionDSL--><a href="SessionDSL.html" target="_top" title="SessionDSL.html" xlink:actuate="onRequest" xlink:href="SessionDSL.html" xlink:show="new" xlink:title="SessionDSL.html" xlink:type="simple"><rect codeLine="37" fill="#FEFECE" filter="url(#ff39e06h24484)" height="86.4141" id="org.apache.wiki.api.spi.SessionDSL" style="stroke:#A80036;stroke-width:1.5;" width="264" x="371" y="226"/><ellipse cx="462.75" cy="242" fill="#ADD1B2" rx="11" ry="11" style="stro [...]
-class org.apache.wiki.api.spi.AclsDSL--><a href="AclsDSL.html" target="_top" title="AclsDSL.html" xlink:actuate="onRequest" xlink:href="AclsDSL.html" xlink:show="new" xlink:title="AclsDSL.html" xlink:type="simple"><rect codeLine="43" fill="#FEFECE" filter="url(#ff39e06h24484)" height="73.6094" id="org.apache.wiki.api.spi.AclsDSL" style="stroke:#A80036;stroke-width:1.5;" width="116" x="670" y="232"/><ellipse cx="701.2" cy="248" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-w [...]
-class org.apache.wiki.api.spi.EngineDSL--><a href="EngineDSL.html" target="_top" title="EngineDSL.html" xlink:actuate="onRequest" xlink:href="EngineDSL.html" xlink:show="new" xlink:title="EngineDSL.html" xlink:type="simple"><rect codeLine="48" fill="#FEFECE" filter="url(#ff39e06h24484)" height="86.4141" id="org.apache.wiki.api.spi.EngineDSL" style="stroke:#A80036;stroke-width:1.5;" width="251" x="821.5" y="226"/><ellipse cx="909.75" cy="242" fill="#ADD1B2" rx="11" ry="11" style="stroke:# [...]
-class org.apache.wiki.api.spi.ContentsDSL--><a href="ContentsDSL.html" target="_top" title="ContentsDSL.html" xlink:actuate="onRequest" xlink:href="ContentsDSL.html" xlink:show="new" xlink:title="ContentsDSL.html" xlink:type="simple"><rect codeLine="54" fill="#FEFECE" filter="url(#ff39e06h24484)" height="73.6094" id="org.apache.wiki.api.spi.ContentsDSL" style="stroke:#A80036;stroke-width:1.5;" width="292" x="57" y="372"/><ellipse cx="158.75" cy="388" fill="#ADD1B2" rx="11" ry="11" style= [...]
-class org.apache.wiki.api.spi.AclsSPI--><a href="AclsSPI.html" target="_top" title="AclsSPI.html" xlink:actuate="onRequest" xlink:href="AclsSPI.html" xlink:show="new" xlink:title="AclsSPI.html" xlink:type="simple"><rect codeLine="59" fill="#FEFECE" filter="url(#ff39e06h24484)" height="73.6094" id="org.apache.wiki.api.spi.AclsSPI" style="stroke:#A80036;stroke-width:1.5;" width="119" x="384.5" y="372"/><ellipse cx="419.3" cy="388" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke [...]
-class org.apache.wiki.api.spi.EngineSPI--><a href="EngineSPI.html" target="_top" title="EngineSPI.html" xlink:actuate="onRequest" xlink:href="EngineSPI.html" xlink:show="new" xlink:title="EngineSPI.html" xlink:type="simple"><rect codeLine="64" fill="#FEFECE" filter="url(#ff39e06h24484)" height="60.8047" id="org.apache.wiki.api.spi.EngineSPI" style="stroke:#A80036;stroke-width:1.5;" width="251" x="538.5" y="378.5"/><ellipse cx="628.75" cy="394.5" fill="#B4A7E5" rx="11" ry="11" style="stro [...]
-link org.apache.wiki.api.spi.ContextSPI to org.apache.wiki.api.spi.ContextDSL--><!--MD5=[0514082b5e424fd636f072cef8dd11ea]
-link org.apache.wiki.api.spi.ContextDSL to org.apache.wiki.api.spi.ContentsSPI--><!--MD5=[85317c00ba41754abd8c27af753ef65a]
-link org.apache.wiki.api.spi.ContentsSPI to org.apache.wiki.api.spi.Wiki--><!--MD5=[d57a641e9e4643629549c46e109a8eec]
-link org.apache.wiki.api.spi.ContextSPI to org.apache.wiki.api.spi.SessionSPI--><!--MD5=[1014298641ac7f9c8e08d0756288e361]
-link org.apache.wiki.api.spi.SessionSPI to org.apache.wiki.api.spi.SessionDSL--><!--MD5=[0bb745787ccaa94cbf00d1772cf4207b]
-link org.apache.wiki.api.spi.SessionDSL to org.apache.wiki.api.spi.AclsDSL--><!--MD5=[23d98d4481267e318aec428155570e3a]
-link org.apache.wiki.api.spi.AclsDSL to org.apache.wiki.api.spi.EngineDSL--><!--MD5=[c5588d9fe0594c3af8b03fc08313ffb9]
-link org.apache.wiki.api.spi.SessionSPI to org.apache.wiki.api.spi.ContentsDSL--><!--MD5=[9d26eff2e187d382b37ef9f5a479676e]
-link org.apache.wiki.api.spi.ContentsDSL to org.apache.wiki.api.spi.AclsSPI--><!--MD5=[c1195b0e9f6149d57eb4778b4efead97]
-link org.apache.wiki.api.spi.AclsSPI to org.apache.wiki.api.spi.EngineSPI--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="571.5" y="477.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[b8e732ad12f6f33789f8a07c01c0b0b2]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="523px" preserveAspectRatio="none" style="width:1321px;height:523px;background:#FFFFFF;" version="1.1" viewBox="0 0 1321 523" width="1321px" zoomAndPan="magnify"><defs><filter height="300%" id="f1iqf3m3cbebk0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
+cluster org.apache.wiki.api.spi--><polygon fill="#FFFFFF" filter="url(#f1iqf3m3cbebk0)" points="16,6,203,6,210,28.2969,1304,28.2969,1304,500,16,500,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="210" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="181" x="20" y="20.9951">org.apache.wiki.api.spi</text><!--MD5=[de3d530920b5106156f3f4352c6d4935]
+class org.apache.wiki.api.spi.Wiki--><a href="Wiki.html" target="_top" title="Wiki.html" xlink:actuate="onRequest" xlink:href="Wiki.html" xlink:show="new" xlink:title="Wiki.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="124.8281" id="org.apache.wiki.api.spi.Wiki" style="stroke:#A80036;stroke-width:1.5;" width="201" x="102.5" y="41"/><ellipse cx="186.75" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><pat [...]
+class org.apache.wiki.api.spi.SessionDSL--><a href="SessionDSL.html" target="_top" title="SessionDSL.html" xlink:actuate="onRequest" xlink:href="SessionDSL.html" xlink:show="new" xlink:title="SessionDSL.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="86.4141" id="org.apache.wiki.api.spi.SessionDSL" style="stroke:#A80036;stroke-width:1.5;" width="264" x="339" y="60.5"/><ellipse cx="430.75" cy="76.5" fill="#ADD1B2" rx="11" ry="11" style="s [...]
+class org.apache.wiki.api.spi.EngineSPI--><a href="EngineSPI.html" target="_top" title="EngineSPI.html" xlink:actuate="onRequest" xlink:href="EngineSPI.html" xlink:show="new" xlink:title="EngineSPI.html" xlink:type="simple"><rect codeLine="18" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="60.8047" id="org.apache.wiki.api.spi.EngineSPI" style="stroke:#A80036;stroke-width:1.5;" width="251" x="638.5" y="73"/><ellipse cx="728.75" cy="89" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A [...]
+class org.apache.wiki.api.spi.AclsDSL--><a href="AclsDSL.html" target="_top" title="AclsDSL.html" xlink:actuate="onRequest" xlink:href="AclsDSL.html" xlink:show="new" xlink:title="AclsDSL.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="73.6094" id="org.apache.wiki.api.spi.AclsDSL" style="stroke:#A80036;stroke-width:1.5;" width="116" x="925" y="66.5"/><ellipse cx="956.2" cy="82.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;strok [...]
+class org.apache.wiki.api.spi.ContextDSL--><a href="ContextDSL.html" target="_top" title="ContextDSL.html" xlink:actuate="onRequest" xlink:href="ContextDSL.html" xlink:show="new" xlink:title="ContextDSL.html" xlink:type="simple"><rect codeLine="27" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="99.2188" id="org.apache.wiki.api.spi.ContextDSL" style="stroke:#A80036;stroke-width:1.5;" width="342" x="32" y="226"/><ellipse cx="163.25" cy="242" fill="#ADD1B2" rx="11" ry="11" style="stro [...]
+class org.apache.wiki.api.spi.SessionSPI--><a href="SessionSPI.html" target="_top" title="SessionSPI.html" xlink:actuate="onRequest" xlink:href="SessionSPI.html" xlink:show="new" xlink:title="SessionSPI.html" xlink:type="simple"><rect codeLine="34" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="86.4141" id="org.apache.wiki.api.spi.SessionSPI" style="stroke:#A80036;stroke-width:1.5;" width="265" x="409.5" y="232.5"/><ellipse cx="504.75" cy="248.5" fill="#B4A7E5" rx="11" ry="11" styl [...]
+class org.apache.wiki.api.spi.EngineDSL--><a href="EngineDSL.html" target="_top" title="EngineDSL.html" xlink:actuate="onRequest" xlink:href="EngineDSL.html" xlink:show="new" xlink:title="EngineDSL.html" xlink:type="simple"><rect codeLine="40" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="86.4141" id="org.apache.wiki.api.spi.EngineDSL" style="stroke:#A80036;stroke-width:1.5;" width="251" x="709.5" y="232.5"/><ellipse cx="797.75" cy="248.5" fill="#ADD1B2" rx="11" ry="11" style="str [...]
+class org.apache.wiki.api.spi.ContentsDSL--><a href="ContentsDSL.html" target="_top" title="ContentsDSL.html" xlink:actuate="onRequest" xlink:href="ContentsDSL.html" xlink:show="new" xlink:title="ContentsDSL.html" xlink:type="simple"><rect codeLine="46" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="73.6094" id="org.apache.wiki.api.spi.ContentsDSL" style="stroke:#A80036;stroke-width:1.5;" width="292" x="996" y="238.5"/><ellipse cx="1097.75" cy="254.5" fill="#ADD1B2" rx="11" ry="11" [...]
+class org.apache.wiki.api.spi.ContentsSPI--><a href="ContentsSPI.html" target="_top" title="ContentsSPI.html" xlink:actuate="onRequest" xlink:href="ContentsSPI.html" xlink:show="new" xlink:title="ContentsSPI.html" xlink:type="simple"><rect codeLine="51" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="73.6094" id="org.apache.wiki.api.spi.ContentsSPI" style="stroke:#A80036;stroke-width:1.5;" width="291" x="57.5" y="397.5"/><ellipse cx="161.25" cy="413.5" fill="#B4A7E5" rx="11" ry="11" [...]
+class org.apache.wiki.api.spi.AclsSPI--><a href="AclsSPI.html" target="_top" title="AclsSPI.html" xlink:actuate="onRequest" xlink:href="AclsSPI.html" xlink:show="new" xlink:title="AclsSPI.html" xlink:type="simple"><rect codeLine="56" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="73.6094" id="org.apache.wiki.api.spi.AclsSPI" style="stroke:#A80036;stroke-width:1.5;" width="119" x="383.5" y="397.5"/><ellipse cx="418.3" cy="413.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;s [...]
+class org.apache.wiki.api.spi.ContextSPI--><a href="ContextSPI.html" target="_top" title="ContextSPI.html" xlink:actuate="onRequest" xlink:href="ContextSPI.html" xlink:show="new" xlink:title="ContextSPI.html" xlink:type="simple"><rect codeLine="61" fill="#FEFECE" filter="url(#f1iqf3m3cbebk0)" height="99.2188" id="org.apache.wiki.api.spi.ContextSPI" style="stroke:#A80036;stroke-width:1.5;" width="343" x="537.5" y="385"/><ellipse cx="670.75" cy="401" fill="#B4A7E5" rx="11" ry="11" style="s [...]
+link org.apache.wiki.api.spi.Wiki to org.apache.wiki.api.spi.SessionDSL--><!--MD5=[94c485e86e10fd2f6e708c85a66b57ba]
+link org.apache.wiki.api.spi.SessionDSL to org.apache.wiki.api.spi.EngineSPI--><!--MD5=[5a775a8154c131f76fed11b7aaa05fd1]
+link org.apache.wiki.api.spi.EngineSPI to org.apache.wiki.api.spi.AclsDSL--><!--MD5=[20e25a0aacfdc89605a3a0f605cb6505]
+link org.apache.wiki.api.spi.Wiki to org.apache.wiki.api.spi.ContextDSL--><!--MD5=[01d3335ad341910a134a3cf428993842]
+link org.apache.wiki.api.spi.ContextDSL to org.apache.wiki.api.spi.SessionSPI--><!--MD5=[1bca28c93a5971d8e87f5bf35f5a6e05]
+link org.apache.wiki.api.spi.SessionSPI to org.apache.wiki.api.spi.EngineDSL--><!--MD5=[4ba84f417fbc37808c2bdd373fff0f70]
+link org.apache.wiki.api.spi.EngineDSL to org.apache.wiki.api.spi.ContentsDSL--><!--MD5=[0514082b5e424fd636f072cef8dd11ea]
+link org.apache.wiki.api.spi.ContextDSL to org.apache.wiki.api.spi.ContentsSPI--><!--MD5=[7fd9c36ad66f10aa2e1aec7cc751d562]
+link org.apache.wiki.api.spi.ContentsSPI to org.apache.wiki.api.spi.AclsSPI--><!--MD5=[c494891f6c33db641fcfc9f0d818f571]
+link org.apache.wiki.api.spi.AclsSPI to org.apache.wiki.api.spi.ContextSPI--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="558" y="515.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[9a88a80123b01d45814d4b0d7bcfb61f]
 @startuml
     namespace org.apache.wiki.api.spi {
 
-        interface ContextSPI [[ContextSPI.html]] {
-            {abstract} +create(Engine, Page): Context
-            {abstract} +create(Engine, HttpServletRequest, Command): Context
-            {abstract} +create(Engine, HttpServletRequest, Page): Context
-            {abstract} +create(Engine, HttpServletRequest, String): Context
-        }
-
-        class ContextDSL [[ContextDSL.html]] {
-            +create(Engine, Page): Context
-            +create(Engine, HttpServletRequest, Command): Context
-            +create(Engine, HttpServletRequest, Page): Context
-            +create(Engine, HttpServletRequest, String): Context
-        }
-
-        interface ContentsSPI [[ContentsSPI.html]] {
-            {abstract} +attachment(Engine, String, String): Attachment
-            {abstract} +page(Engine, String): Page
-        }
-
         class Wiki [[Wiki.html]] {
             {static} +init(ServletContext): Properties
             {static} +acls(): AclsDSL
@@ -52,23 +33,34 @@ link org.apache.wiki.api.spi.AclsSPI to org.apache.wiki.api.spi.EngineSPI--><tex
             {static} +session(): SessionDSL
         }
 
-        interface SessionSPI [[SessionSPI.html]] {
-            {abstract} +remove(Engine, HttpServletRequest): void
-            {abstract} +find(Engine, HttpServletRequest): Session
-            {abstract} +guest(Engine): Session
-        }
-
         class SessionDSL [[SessionDSL.html]] {
             +remove(Engine, HttpServletRequest): void
             +find(Engine, HttpServletRequest): Session
             +guest(Engine): Session
         }
 
+        interface EngineSPI [[EngineSPI.html]] {
+            {abstract} +find(ServletContext, Properties): Engine
+        }
+
         class AclsDSL [[AclsDSL.html]] {
             +acl(): Acl
             +entry(): AclEntry
         }
 
+        class ContextDSL [[ContextDSL.html]] {
+            +create(Engine, Page): Context
+            +create(Engine, HttpServletRequest, Command): Context
+            +create(Engine, HttpServletRequest, Page): Context
+            +create(Engine, HttpServletRequest, String): Context
+        }
+
+        interface SessionSPI [[SessionSPI.html]] {
+            {abstract} +remove(Engine, HttpServletRequest): void
+            {abstract} +find(Engine, HttpServletRequest): Session
+            {abstract} +guest(Engine): Session
+        }
+
         class EngineDSL [[EngineDSL.html]] {
             +find(ServletConfig): Engine
             +find(ServletConfig, Properties): Engine
@@ -80,13 +72,21 @@ link org.apache.wiki.api.spi.AclsSPI to org.apache.wiki.api.spi.EngineSPI--><tex
             +page(Engine, String): Page
         }
 
+        interface ContentsSPI [[ContentsSPI.html]] {
+            {abstract} +attachment(Engine, String, String): Attachment
+            {abstract} +page(Engine, String): Page
+        }
+
         interface AclsSPI [[AclsSPI.html]] {
             {abstract} +acl(): Acl
             {abstract} +entry(): AclEntry
         }
 
-        interface EngineSPI [[EngineSPI.html]] {
-            {abstract} +find(ServletContext, Properties): Engine
+        interface ContextSPI [[ContextSPI.html]] {
+            {abstract} +create(Engine, Page): Context
+            {abstract} +create(Engine, HttpServletRequest, Command): Context
+            {abstract} +create(Engine, HttpServletRequest, Page): Context
+            {abstract} +create(Engine, HttpServletRequest, String): Context
         }
 
     }
@@ -100,5 +100,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/Attachment.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/Attachment.svg
index 1d53a89d1e..8a787f1559 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/Attachment.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/Attachment.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.attachment.Attachment--><a href="Attachment.html" target="
 class org.apache.wiki.WikiPage--><a href="../WikiPage.html" target="_top" title="../WikiPage.html" xlink:actuate="onRequest" xlink:href="../WikiPage.html" xlink:show="new" xlink:title="../WikiPage.html" xlink:type="simple"><rect codeLine="15" fill="#FEFECE" filter="url(#f18k1isayv0evf)" height="37.9375" id="org.apache.wiki.WikiPage" style="stroke:#A80036;stroke-width:1.5;" width="106" x="7" y="43"/><ellipse cx="22" cy="61.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke- [...]
 class org.apache.wiki.api.core.Attachment--><a href="../api/core/Attachment.html" target="_top" title="../api/core/Attachment.html" xlink:actuate="onRequest" xlink:href="../api/core/Attachment.html" xlink:show="new" xlink:title="../api/core/Attachment.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#f18k1isayv0evf)" height="109.9609" id="org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="187" x="148.5" y="7"/><ellipse cx="178.8"  [...]
 reverse link org.apache.wiki.WikiPage to org.apache.wiki.attachment.Attachment--><path codeLine="24" d="M78.19,99.18 C89.35,121.37 103.99,150.49 117.21,176.79 " fill="none" id="org.apache.wiki.WikiPage-backto-org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="71.79,102.03,69.06,81.02,84.3,95.74,71.79,102.03" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[11c9514100c55d9786e81b457b673b58]
-reverse link org.apache.wiki.api.core.Attachment to org.apache.wiki.attachment.Attachment--><path codeLine="25" d="M205.56,135.48 C198.68,149.16 191.52,163.41 184.73,176.92 " fill="none" id="org.apache.wiki.api.core.Attachment-backto-org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="199.46,132.03,214.7,117.31,211.97,138.32,199.46,132.03" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font [...]
+reverse link org.apache.wiki.api.core.Attachment to org.apache.wiki.attachment.Attachment--><path codeLine="25" d="M205.56,135.48 C198.68,149.16 191.52,163.41 184.73,176.92 " fill="none" id="org.apache.wiki.api.core.Attachment-backto-org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="199.46,132.03,214.7,117.31,211.97,138.32,199.46,132.03" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -40,5 +40,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/AttachmentManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/AttachmentManager.svg
index fc0d070ffb..d5b2d20eae 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/AttachmentManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/AttachmentManager.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="431px" preserveAspectRatio="none" style="width:396px;height:431px;background:#FFFFFF;" version="1.1" viewBox="0 0 396 431" width="396px" zoomAndPan="magnify"><defs><filter height="300%" id="f1hcbo26lmsxx8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.attachment.AttachmentManager--><a href="AttachmentManager.html" target="_top" title="AttachmentManager.html" xlink:actuate="onRequest" xlink:href="AttachmentManager.html" xlink:show="new" xlink:title="AttachmentManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1hcbo26lmsxx8)" height="399.6641" id="org.apache.wiki.attachment.AttachmentManager" style="stroke:#A80036;stroke-width:1.5;" width="375" x="7" y="7"/><ellipse cx="119.75" cy="25 [...]
+class org.apache.wiki.attachment.AttachmentManager--><a href="AttachmentManager.html" target="_top" title="AttachmentManager.html" xlink:actuate="onRequest" xlink:href="AttachmentManager.html" xlink:show="new" xlink:title="AttachmentManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1hcbo26lmsxx8)" height="399.6641" id="org.apache.wiki.attachment.AttachmentManager" style="stroke:#A80036;stroke-width:1.5;" width="375" x="7" y="7"/><ellipse cx="119.75" cy="25 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -44,5 +44,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/AttachmentServlet.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/AttachmentServlet.svg
index a2f90d27c5..d3b6026c86 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/AttachmentServlet.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/AttachmentServlet.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="258px" preserveAspectRatio="none" style="width:514px;height:258px;background:#FFFFFF;" version="1.1" viewBox="0 0 514 258" width="514px" zoomAndPan="magnify"><defs><filter height="300%" id="f67wwtgjdmzbo" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.attachment.AttachmentServlet--><a href="AttachmentServlet.html" target="_top" title="AttachmentServlet.html" xlink:actuate="onRequest" xlink:href="AttachmentServlet.html" xlink:show="new" xlink:title="AttachmentServlet.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f67wwtgjdmzbo)" height="122.7656" id="org.apache.wiki.attachment.AttachmentServlet" style="stroke:#A80036;stroke-width:1.5;" width="491" x="9" y="105"/><ellipse cx="183.25" cy="1 [...]
 class javax.servlet.http.HttpServlet--><rect codeLine="14" fill="#FEFECE" filter="url(#f67wwtgjdmzbo)" height="37.9375" id="javax.servlet.http.HttpServlet" style="stroke:#A80036;stroke-width:1.5;" width="119" x="195" y="7"/><ellipse cx="210" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M210.1094,21.3125 L208.9531,26.3906 L211.2813,26.3906 L210.1094,21.3125 Z M208.625,19.0781 L211.6094,19.0781 L214.9688,31.4688 L212.5156,31.4688 L211.75,28 [...]
-reverse link javax.servlet.http.HttpServlet to org.apache.wiki.attachment.AttachmentServlet--><path codeLine="16" d="M254.5,65.43 C254.5,77.6 254.5,91.36 254.5,104.7 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.attachment.AttachmentServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="247.5,65.11,254.5,45.11,261.5,65.11,247.5,65.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" l [...]
+reverse link javax.servlet.http.HttpServlet to org.apache.wiki.attachment.AttachmentServlet--><path codeLine="16" d="M254.5,65.43 C254.5,77.6 254.5,91.36 254.5,104.7 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.attachment.AttachmentServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="247.5,65.11,254.5,45.11,261.5,65.11,247.5,65.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" l [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -29,5 +29,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DefaultAttachmentManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DefaultAttachmentManager.svg
index 339c27ed22..b2bd546877 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DefaultAttachmentManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DefaultAttachmentManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="560px" preserveAspectRatio="none" style="width:396px;height:560px;background:#FFFFFF;" version="1.1" viewBox="0 0 396 560" width="396px" zoomAndPan="magnify"><defs><filter height="300%" id="fzct726hei92k" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.attachment.DefaultAttachmentManager--><a href="DefaultAttachmentManager.html" target="_top" title="DefaultAttachmentManager.html" xlink:actuate="onRequest" xlink:href="DefaultAttachmentManager.html" xlink:show="new" xlink:title="DefaultAttachmentManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fzct726hei92k)" height="238.0078" id="org.apache.wiki.attachment.DefaultAttachmentManager" style="stroke:#A80036;stroke-width:1.5;" width="370" [...]
 class org.apache.wiki.attachment.AttachmentManager--><a href="AttachmentManager.html" target="_top" title="AttachmentManager.html" xlink:actuate="onRequest" xlink:href="AttachmentManager.html" xlink:show="new" xlink:title="AttachmentManager.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#fzct726hei92k)" height="225.2031" id="org.apache.wiki.attachment.AttachmentManager" style="stroke:#A80036;stroke-width:1.5;" width="375" x="7" y="7"/><ellipse cx="119.75" cy="25 [...]
-reverse link org.apache.wiki.attachment.AttachmentManager to org.apache.wiki.attachment.DefaultAttachmentManager--><path codeLine="40" d="M194.5,252.46 C194.5,265.58 194.5,278.85 194.5,291.82 " fill="none" id="org.apache.wiki.attachment.AttachmentManager-backto-org.apache.wiki.attachment.DefaultAttachmentManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="187.5,252.01,194.5,232.01,201.5,252.01,187.5,252.01" style="stroke:#A80036;stroke [...]
+reverse link org.apache.wiki.attachment.AttachmentManager to org.apache.wiki.attachment.DefaultAttachmentManager--><path codeLine="40" d="M194.5,252.46 C194.5,265.58 194.5,278.85 194.5,291.82 " fill="none" id="org.apache.wiki.attachment.AttachmentManager-backto-org.apache.wiki.attachment.DefaultAttachmentManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="187.5,252.01,194.5,232.01,201.5,252.01,187.5,252.01" style="stroke:#A80036;stroke [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -53,5 +53,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DynamicAttachment.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DynamicAttachment.svg
index ef4b8995f8..7de655dd1f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DynamicAttachment.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DynamicAttachment.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:456px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 456 207" width="456px" zoomAndPan="magnify"><defs><filter height="300%" id="ftjikjqq7ewz2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.attachment.DynamicAttachment--><a href="DynamicAttachment.html" target="_top" title="DynamicAttachment.html" xlink:actuate="onRequest" xlink:href="DynamicAttachment.html" xlink:show="new" xlink:title="DynamicAttachment.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ftjikjqq7ewz2)" height="71.5469" id="org.apache.wiki.attachment.DynamicAttachment" style="stroke:#A80036;stroke-width:1.5;" width="435" x="7" y="105"/><ellipse cx="150.75" cy="12 [...]
 class org.apache.wiki.attachment.Attachment--><a href="Attachment.html" target="_top" title="Attachment.html" xlink:actuate="onRequest" xlink:href="Attachment.html" xlink:show="new" xlink:title="Attachment.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#ftjikjqq7ewz2)" height="37.9375" id="org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="166" x="141.5" y="7"/><ellipse cx="156.5" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" st [...]
-reverse link org.apache.wiki.attachment.Attachment to org.apache.wiki.attachment.DynamicAttachment--><path codeLine="12" d="M224.5,65.3 C224.5,78 224.5,92.08 224.5,104.56 " fill="none" id="org.apache.wiki.attachment.Attachment-backto-org.apache.wiki.attachment.DynamicAttachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="217.5,65.16,224.5,45.16,231.5,65.16,217.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font [...]
+reverse link org.apache.wiki.attachment.Attachment to org.apache.wiki.attachment.DynamicAttachment--><path codeLine="12" d="M224.5,65.3 C224.5,78 224.5,92.08 224.5,104.56 " fill="none" id="org.apache.wiki.attachment.Attachment-backto-org.apache.wiki.attachment.DynamicAttachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="217.5,65.16,224.5,45.16,231.5,65.16,217.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DynamicAttachmentProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DynamicAttachmentProvider.svg
index 760ebe21e0..58905c4b38 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DynamicAttachmentProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/DynamicAttachmentProvider.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:358px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 358 90" width="358px" zoomAndPan="magnify"><defs><filter height="300%" id="f19y5kwsi2fewc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation= [...]
-class org.apache.wiki.attachment.DynamicAttachmentProvider--><a href="DynamicAttachmentProvider.html" target="_top" title="DynamicAttachmentProvider.html" xlink:actuate="onRequest" xlink:href="DynamicAttachmentProvider.html" xlink:show="new" xlink:title="DynamicAttachmentProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f19y5kwsi2fewc)" height="58.7422" id="org.apache.wiki.attachment.DynamicAttachmentProvider" style="stroke:#A80036;stroke-width:1.5;" width [...]
+class org.apache.wiki.attachment.DynamicAttachmentProvider--><a href="DynamicAttachmentProvider.html" target="_top" title="DynamicAttachmentProvider.html" xlink:actuate="onRequest" xlink:href="DynamicAttachmentProvider.html" xlink:show="new" xlink:title="DynamicAttachmentProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f19y5kwsi2fewc)" height="58.7422" id="org.apache.wiki.attachment.DynamicAttachmentProvider" style="stroke:#A80036;stroke-width:1.5;" width [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/package.svg
index 696cdfef56..a8cd8e8fe3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/attachment/package.svg
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1109px" preserveAspectRatio="none" style="width:1325px;height:1109px;background:#FFFFFF;" version="1.1" viewBox="0 0 1325 1109" width="1325px" zoomAndPan="magnify"><defs><filter height="300%" id="f1ajlss5sbznfx" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdD [...]
-cluster org.apache.wiki.attachment--><polygon fill="#FFFFFF" filter="url(#f1ajlss5sbznfx)" points="16,202,241,202,248,224.2969,1226,224.2969,1226,1086,16,1086,16,202" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="248" y1="224.2969" y2="224.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="219" x="20" y="216.9951">org.apache.wiki.attachment</text><!--MD5=[737c6b32 [...]
-cluster javax.servlet.http--><polygon fill="#FFFFFF" filter="url(#f1ajlss5sbznfx)" points="611,38,754,38,761,60.2969,764,60.2969,764,137,611,137,611,38" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="611" x2="761" y1="60.2969" y2="60.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="137" x="615" y="52.9951">javax.servlet.http</text><!--MD5=[0efc58285ba131b623584699d07d72ab]
-cluster org.apache.wiki--><polygon fill="#FFFFFF" filter="url(#f1ajlss5sbznfx)" points="925,38,1056,38,1063,60.2969,1066,60.2969,1066,137,925,137,925,38" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="925" x2="1063" y1="60.2969" y2="60.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="125" x="929" y="52.9951">org.apache.wiki</text><!--MD5=[329450b53650989569259c82e5e37fa6]
-cluster org.apache.wiki.api.core--><polygon fill="#FFFFFF" filter="url(#f1ajlss5sbznfx)" points="1090,6,1290,6,1297,28.2969,1308,28.2969,1308,169,1090,169,1090,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1090" x2="1297" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="194" x="1094" y="20.9951">org.apache.wiki.api.core</text><!--MD5=[2371672daf94 [...]
-class org.apache.wiki.attachment.AttachmentServlet--><a href="AttachmentServlet.html" target="_top" title="AttachmentServlet.html" xlink:actuate="onRequest" xlink:href="AttachmentServlet.html" xlink:show="new" xlink:title="AttachmentServlet.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="124.8281" id="org.apache.wiki.attachment.AttachmentServlet" style="stroke:#A80036;stroke-width:1.5;" width="491" x="442.5" y="371.5"/><ellipse cx="625.75 [...]
-class org.apache.wiki.attachment.Attachment--><a href="Attachment.html" target="_top" title="Attachment.html" xlink:actuate="onRequest" xlink:href="Attachment.html" xlink:show="new" xlink:title="Attachment.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="137.6328" id="org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="241" x="968.5" y="365"/><ellipse cx="1048.25" cy="381" fill="#ADD1B2" rx="11" ry="11"  [...]
-class org.apache.wiki.attachment.DynamicAttachmentProvider--><a href="DynamicAttachmentProvider.html" target="_top" title="DynamicAttachmentProvider.html" xlink:actuate="onRequest" xlink:href="DynamicAttachmentProvider.html" xlink:show="new" xlink:title="DynamicAttachmentProvider.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="60.8047" id="org.apache.wiki.attachment.DynamicAttachmentProvider" style="stroke:#A80036;stroke-width:1.5;" widt [...]
-class org.apache.wiki.attachment.AttachmentManager--><a href="AttachmentManager.html" target="_top" title="AttachmentManager.html" xlink:actuate="onRequest" xlink:href="AttachmentManager.html" xlink:show="new" xlink:title="AttachmentManager.html" xlink:type="simple"><rect codeLine="26" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="393.7266" id="org.apache.wiki.attachment.AttachmentManager" style="stroke:#A80036;stroke-width:1.5;" width="375" x="32.5" y="237"/><ellipse cx="151.75"  [...]
-class org.apache.wiki.attachment.DefaultAttachmentManager--><a href="DefaultAttachmentManager.html" target="_top" title="DefaultAttachmentManager.html" xlink:actuate="onRequest" xlink:href="DefaultAttachmentManager.html" xlink:show="new" xlink:title="DefaultAttachmentManager.html" xlink:type="simple"><rect codeLine="56" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="240.0703" id="org.apache.wiki.attachment.DefaultAttachmentManager" style="stroke:#A80036;stroke-width:1.5;" width="37 [...]
-class org.apache.wiki.attachment.DynamicAttachment--><a href="DynamicAttachment.html" target="_top" title="DynamicAttachment.html" xlink:actuate="onRequest" xlink:href="DynamicAttachment.html" xlink:show="new" xlink:title="DynamicAttachment.html" xlink:type="simple"><rect codeLine="74" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="60.8047" id="org.apache.wiki.attachment.DynamicAttachment" style="stroke:#A80036;stroke-width:1.5;" width="435" x="775.5" y="781.5"/><ellipse cx="926.25 [...]
-class javax.servlet.http.HttpServlet--><rect codeLine="87" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="48" id="javax.servlet.http.HttpServlet" style="stroke:#A80036;stroke-width:1.5;" width="102" x="637" y="73"/><ellipse cx="652" cy="89" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M652.1094,84.3438 L650.9531,89.4219 L653.2813,89.4219 L652.1094,84.3438 Z M650.625,82.1094 L653.6094,82.1094 L656.9688,94.5 L654.5156,94.5 L653.75,91.4375 L650.468 [...]
-class org.apache.wiki.WikiPage--><a href="../WikiPage.html" target="_top" title="../WikiPage.html" xlink:actuate="onRequest" xlink:href="../WikiPage.html" xlink:show="new" xlink:title="../WikiPage.html" xlink:type="simple"><rect codeLine="92" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="48" id="org.apache.wiki.WikiPage" style="stroke:#A80036;stroke-width:1.5;" width="88" x="962" y="73"/><ellipse cx="977" cy="89" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1. [...]
-class org.apache.wiki.api.core.Attachment--><a href="../api/core/Attachment.html" target="_top" title="../api/core/Attachment.html" xlink:actuate="onRequest" xlink:href="../api/core/Attachment.html" xlink:show="new" xlink:title="../api/core/Attachment.html" xlink:type="simple"><rect codeLine="97" fill="#FEFECE" filter="url(#f1ajlss5sbznfx)" height="112.0234" id="org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="187" x="1105.5" y="41"/><ellipse cx="1158. [...]
-reverse link javax.servlet.http.HttpServlet to org.apache.wiki.attachment.AttachmentServlet--><path codeLine="78" d="M688,141.38 C688,199.94 688,304.64 688,371.36 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.attachment.AttachmentServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="681,141.03,688,121.03,695,141.03,681,141.03" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[baf7c3e44b02c798a1e716d3cd4e6b87]
-reverse link org.apache.wiki.WikiPage to org.apache.wiki.attachment.Attachment--><path codeLine="79" d="M1016.58,140.71 C1030.59,197.24 1055.44,297.56 1072.07,364.68 " fill="none" id="org.apache.wiki.WikiPage-backto-org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1009.72,142.12,1011.7,121.03,1023.31,138.76,1009.72,142.12" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[11c9514100c55d9786e81b457b673b58]
-reverse link org.apache.wiki.api.core.Attachment to org.apache.wiki.attachment.Attachment--><path codeLine="80" d="M1174.6,172.32 C1155.7,229.87 1129.74,308.93 1111.38,364.85 " fill="none" id="org.apache.wiki.api.core.Attachment-backto-org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1167.95,170.14,1180.84,153.32,1181.25,174.5,1167.95,170.14" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1f0bac36cd [...]
-reverse link org.apache.wiki.attachment.AttachmentManager to org.apache.wiki.attachment.DefaultAttachmentManager--><path codeLine="81" d="M220,651.51 C220,665.26 220,678.8 220,691.83 " fill="none" id="org.apache.wiki.attachment.AttachmentManager-backto-org.apache.wiki.attachment.DefaultAttachmentManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="213,651.26,220,631.26,227,651.26,213,651.26" style="stroke:#A80036;stroke-width:1.0;"/><!- [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1109px" preserveAspectRatio="none" style="width:1325px;height:1109px;background:#FFFFFF;" version="1.1" viewBox="0 0 1325 1109" width="1325px" zoomAndPan="magnify"><defs><filter height="300%" id="f14zczsm4tbwfl" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdD [...]
+cluster org.apache.wiki.attachment--><polygon fill="#FFFFFF" filter="url(#f14zczsm4tbwfl)" points="16,202,241,202,248,224.2969,1226,224.2969,1226,1086,16,1086,16,202" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="248" y1="224.2969" y2="224.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="219" x="20" y="216.9951">org.apache.wiki.attachment</text><!--MD5=[737c6b32 [...]
+cluster javax.servlet.http--><polygon fill="#FFFFFF" filter="url(#f14zczsm4tbwfl)" points="611,38,754,38,761,60.2969,764,60.2969,764,137,611,137,611,38" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="611" x2="761" y1="60.2969" y2="60.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="137" x="615" y="52.9951">javax.servlet.http</text><!--MD5=[0efc58285ba131b623584699d07d72ab]
+cluster org.apache.wiki--><polygon fill="#FFFFFF" filter="url(#f14zczsm4tbwfl)" points="925,38,1056,38,1063,60.2969,1066,60.2969,1066,137,925,137,925,38" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="925" x2="1063" y1="60.2969" y2="60.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="125" x="929" y="52.9951">org.apache.wiki</text><!--MD5=[329450b53650989569259c82e5e37fa6]
+cluster org.apache.wiki.api.core--><polygon fill="#FFFFFF" filter="url(#f14zczsm4tbwfl)" points="1090,6,1290,6,1297,28.2969,1308,28.2969,1308,169,1090,169,1090,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1090" x2="1297" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="194" x="1094" y="20.9951">org.apache.wiki.api.core</text><!--MD5=[2371672daf94 [...]
+class org.apache.wiki.attachment.AttachmentServlet--><a href="AttachmentServlet.html" target="_top" title="AttachmentServlet.html" xlink:actuate="onRequest" xlink:href="AttachmentServlet.html" xlink:show="new" xlink:title="AttachmentServlet.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="124.8281" id="org.apache.wiki.attachment.AttachmentServlet" style="stroke:#A80036;stroke-width:1.5;" width="491" x="442.5" y="371.5"/><ellipse cx="625.75 [...]
+class org.apache.wiki.attachment.DefaultAttachmentManager--><a href="DefaultAttachmentManager.html" target="_top" title="DefaultAttachmentManager.html" xlink:actuate="onRequest" xlink:href="DefaultAttachmentManager.html" xlink:show="new" xlink:title="DefaultAttachmentManager.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="240.0703" id="org.apache.wiki.attachment.DefaultAttachmentManager" style="stroke:#A80036;stroke-width:1.5;" width="37 [...]
+class org.apache.wiki.attachment.DynamicAttachmentProvider--><a href="DynamicAttachmentProvider.html" target="_top" title="DynamicAttachmentProvider.html" xlink:actuate="onRequest" xlink:href="DynamicAttachmentProvider.html" xlink:show="new" xlink:title="DynamicAttachmentProvider.html" xlink:type="simple"><rect codeLine="30" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="60.8047" id="org.apache.wiki.attachment.DynamicAttachmentProvider" style="stroke:#A80036;stroke-width:1.5;" widt [...]
+class org.apache.wiki.attachment.Attachment--><a href="Attachment.html" target="_top" title="Attachment.html" xlink:actuate="onRequest" xlink:href="Attachment.html" xlink:show="new" xlink:title="Attachment.html" xlink:type="simple"><rect codeLine="34" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="137.6328" id="org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="241" x="968.5" y="365"/><ellipse cx="1048.25" cy="381" fill="#ADD1B2" rx="11" ry="11"  [...]
+class org.apache.wiki.attachment.AttachmentManager--><a href="AttachmentManager.html" target="_top" title="AttachmentManager.html" xlink:actuate="onRequest" xlink:href="AttachmentManager.html" xlink:show="new" xlink:title="AttachmentManager.html" xlink:type="simple"><rect codeLine="44" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="393.7266" id="org.apache.wiki.attachment.AttachmentManager" style="stroke:#A80036;stroke-width:1.5;" width="375" x="32.5" y="237"/><ellipse cx="151.75"  [...]
+class org.apache.wiki.attachment.DynamicAttachment--><a href="DynamicAttachment.html" target="_top" title="DynamicAttachment.html" xlink:actuate="onRequest" xlink:href="DynamicAttachment.html" xlink:show="new" xlink:title="DynamicAttachment.html" xlink:type="simple"><rect codeLine="74" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="60.8047" id="org.apache.wiki.attachment.DynamicAttachment" style="stroke:#A80036;stroke-width:1.5;" width="435" x="775.5" y="781.5"/><ellipse cx="926.25 [...]
+class javax.servlet.http.HttpServlet--><rect codeLine="87" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="48" id="javax.servlet.http.HttpServlet" style="stroke:#A80036;stroke-width:1.5;" width="102" x="637" y="73"/><ellipse cx="652" cy="89" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M652.1094,84.3438 L650.9531,89.4219 L653.2813,89.4219 L652.1094,84.3438 Z M650.625,82.1094 L653.6094,82.1094 L656.9688,94.5 L654.5156,94.5 L653.75,91.4375 L650.468 [...]
+class org.apache.wiki.WikiPage--><a href="../WikiPage.html" target="_top" title="../WikiPage.html" xlink:actuate="onRequest" xlink:href="../WikiPage.html" xlink:show="new" xlink:title="../WikiPage.html" xlink:type="simple"><rect codeLine="92" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="48" id="org.apache.wiki.WikiPage" style="stroke:#A80036;stroke-width:1.5;" width="88" x="962" y="73"/><ellipse cx="977" cy="89" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1. [...]
+class org.apache.wiki.api.core.Attachment--><a href="../api/core/Attachment.html" target="_top" title="../api/core/Attachment.html" xlink:actuate="onRequest" xlink:href="../api/core/Attachment.html" xlink:show="new" xlink:title="../api/core/Attachment.html" xlink:type="simple"><rect codeLine="97" fill="#FEFECE" filter="url(#f14zczsm4tbwfl)" height="112.0234" id="org.apache.wiki.api.core.Attachment" style="stroke:#A80036;stroke-width:1.5;" width="187" x="1105.5" y="41"/><ellipse cx="1158. [...]
+reverse link javax.servlet.http.HttpServlet to org.apache.wiki.attachment.AttachmentServlet--><path codeLine="78" d="M688,141.38 C688,199.94 688,304.64 688,371.36 " fill="none" id="javax.servlet.http.HttpServlet-backto-org.apache.wiki.attachment.AttachmentServlet" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="681,141.03,688,121.03,695,141.03,681,141.03" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1f0bac36cdefe313a58bd3101046f366]
+reverse link org.apache.wiki.attachment.AttachmentManager to org.apache.wiki.attachment.DefaultAttachmentManager--><path codeLine="79" d="M220,651.51 C220,665.26 220,678.8 220,691.83 " fill="none" id="org.apache.wiki.attachment.AttachmentManager-backto-org.apache.wiki.attachment.DefaultAttachmentManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="213,651.26,220,631.26,227,651.26,213,651.26" style="stroke:#A80036;stroke-width:1.0;"/><!- [...]
+reverse link org.apache.wiki.WikiPage to org.apache.wiki.attachment.Attachment--><path codeLine="80" d="M1016.58,140.71 C1030.59,197.24 1055.44,297.56 1072.07,364.68 " fill="none" id="org.apache.wiki.WikiPage-backto-org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1009.72,142.12,1011.7,121.03,1023.31,138.76,1009.72,142.12" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[11c9514100c55d9786e81b457b673b58]
+reverse link org.apache.wiki.api.core.Attachment to org.apache.wiki.attachment.Attachment--><path codeLine="81" d="M1174.6,172.32 C1155.7,229.87 1129.74,308.93 1111.38,364.85 " fill="none" id="org.apache.wiki.api.core.Attachment-backto-org.apache.wiki.attachment.Attachment" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1167.95,170.14,1180.84,153.32,1181.25,174.5,1167.95,170.14" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1508e32f84 [...]
 reverse link org.apache.wiki.attachment.Attachment to org.apache.wiki.attachment.DynamicAttachment--><path codeLine="82" d="M1066.63,522.6 C1045.38,605.85 1014.64,726.26 1000.56,781.4 " fill="none" id="org.apache.wiki.attachment.Attachment-backto-org.apache.wiki.attachment.DynamicAttachment" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1059.88,520.74,1071.62,503.09,1073.45,524.2,1059.88,520.74" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[28a9c9cfa8dbb5ff1 [...]
-link org.apache.wiki.attachment.DynamicAttachment to org.apache.wiki.attachment.DynamicAttachmentProvider--><path codeLine="83" d="M993,842.94 C993,884.5 993,959.52 993,1003.58 " fill="none" id="org.apache.wiki.attachment.DynamicAttachment-to-org.apache.wiki.attachment.DynamicAttachmentProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="993,1008.79,997,999.79,993,1003.79,989,999.79,993,1008.79" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" [...]
+link org.apache.wiki.attachment.DynamicAttachment to org.apache.wiki.attachment.DynamicAttachmentProvider--><path codeLine="83" d="M993,842.94 C993,884.5 993,959.52 993,1003.58 " fill="none" id="org.apache.wiki.attachment.DynamicAttachment-to-org.apache.wiki.attachment.DynamicAttachmentProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="993,1008.79,997,999.79,993,1003.79,989,999.79,993,1008.79" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" [...]
 @startuml
     namespace org.apache.wiki.attachment {
 
@@ -30,6 +30,28 @@ link org.apache.wiki.attachment.DynamicAttachment to org.apache.wiki.attachment.
             #executeUpload(Context, InputStream, String, String, String, String, long): boolean
         }
 
+        class DefaultAttachmentManager [[DefaultAttachmentManager.html]] {
+            +DefaultAttachmentManager(Engine, Properties)
+            +attachmentsEnabled(): boolean
+            +getAttachmentInfoName(Context, String): String
+            +getAttachmentInfo(Context, String, int): Attachment
+            +listAttachments(Page): List<Attachment>
+            +forceDownload(String): boolean
+            +getAttachmentStream(Context, Attachment): InputStream
+            +storeDynamicAttachment(Context, DynamicAttachment): void
+            +getDynamicAttachment(String): DynamicAttachment
+            +storeAttachment(Attachment, InputStream): void
+            +getVersionHistory(String): List<Attachment>
+            +getAllAttachments(): Collection<Attachment>
+            +getCurrentProvider(): AttachmentProvider
+            +deleteVersion(Attachment): void
+            +deleteAttachment(Attachment): void
+        }
+
+        interface DynamicAttachmentProvider [[DynamicAttachmentProvider.html]] {
+            {abstract} +getAttachmentData(Context, Attachment): InputStream
+        }
+
         class Attachment [[Attachment.html]] {
             +Attachment(Engine, String, String)
             +- -Attachment- -(WikiEngine, String, String)
@@ -40,10 +62,6 @@ link org.apache.wiki.attachment.DynamicAttachment to org.apache.wiki.attachment.
             +setCacheable(boolean): void
         }
 
-        interface DynamicAttachmentProvider [[DynamicAttachmentProvider.html]] {
-            {abstract} +getAttachmentData(Context, Attachment): InputStream
-        }
-
         interface AttachmentManager [[AttachmentManager.html]] {
             {static} +PROP_PROVIDER: String
             {static} +- -PROP_PROVIDER_DEPRECATED- -: String
@@ -74,32 +92,14 @@ link org.apache.wiki.attachment.DynamicAttachment to org.apache.wiki.attachment.
             {static} +validateFileName(String): String
         }
 
-        class DefaultAttachmentManager [[DefaultAttachmentManager.html]] {
-            +DefaultAttachmentManager(Engine, Properties)
-            +attachmentsEnabled(): boolean
-            +getAttachmentInfoName(Context, String): String
-            +getAttachmentInfo(Context, String, int): Attachment
-            +listAttachments(Page): List<Attachment>
-            +forceDownload(String): boolean
-            +getAttachmentStream(Context, Attachment): InputStream
-            +storeDynamicAttachment(Context, DynamicAttachment): void
-            +getDynamicAttachment(String): DynamicAttachment
-            +storeAttachment(Attachment, InputStream): void
-            +getVersionHistory(String): List<Attachment>
-            +getAllAttachments(): Collection<Attachment>
-            +getCurrentProvider(): AttachmentProvider
-            +deleteVersion(Attachment): void
-            +deleteAttachment(Attachment): void
-        }
-
         class DynamicAttachment [[DynamicAttachment.html]] {
             +DynamicAttachment(Engine, String, String, DynamicAttachmentProvider)
         }
 
         javax.servlet.http.HttpServlet <|- - AttachmentServlet
+        AttachmentManager <|.. DefaultAttachmentManager
         org.apache.wiki.WikiPage <|- - Attachment
         org.apache.wiki.api.core.Attachment <|.. Attachment
-        AttachmentManager <|.. DefaultAttachmentManager
         Attachment <|- - DynamicAttachment
         DynamicAttachment - -> DynamicAttachmentProvider: provider
     }
@@ -133,5 +133,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/AuthenticationManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/AuthenticationManager.svg
index 728c070aea..4d4064f782 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/AuthenticationManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/AuthenticationManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="454px" preserveAspectRatio="none" style="width:616px;height:454px;background:#FFFFFF;" version="1.1" viewBox="0 0 616 454" width="616px" zoomAndPan="magnify"><defs><filter height="300%" id="fwe44ra9chdt7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.AuthenticationManager--><a href="AuthenticationManager.html" target="_top" title="AuthenticationManager.html" xlink:actuate="onRequest" xlink:href="AuthenticationManager.html" xlink:show="new" xlink:title="AuthenticationManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fwe44ra9chdt7)" height="297.2266" id="org.apache.wiki.auth.AuthenticationManager" style="stroke:#A80036;stroke-width:1.5;" width="595" x="7" y="126"/><ellipse cx="2 [...]
 class org.apache.wiki.api.engine.Initializable--><a href="../api/engine/Initializable.html" target="_top" title="../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../api/engine/Initializable.html" xlink:show="new" xlink:title="../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="27" fill="#FEFECE" filter="url(#fwe44ra9chdt7)" height="58.7422" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="196.5" [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.AuthenticationManager--><path codeLine="31" d="M304.5,86.73 C304.5,98.64 304.5,111.98 304.5,125.9 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.AuthenticationManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="297.5,86.44,304.5,66.44,311.5,86.44,297.5,86.44" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.AuthenticationManager--><path codeLine="31" d="M304.5,86.73 C304.5,98.64 304.5,111.98 304.5,125.9 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.AuthenticationManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="297.5,86.44,304.5,66.44,311.5,86.44,297.5,86.44" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -44,5 +44,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/AuthorizationManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/AuthorizationManager.svg
index 1ffeb29b84..8c8682ad84 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/AuthorizationManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/AuthorizationManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="415px" preserveAspectRatio="none" style="width:390px;height:415px;background:#FFFFFF;" version="1.1" viewBox="0 0 390 415" width="390px" zoomAndPan="magnify"><defs><filter height="300%" id="fdt606g704iuj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.AuthorizationManager--><a href="AuthorizationManager.html" target="_top" title="AuthorizationManager.html" xlink:actuate="onRequest" xlink:href="AuthorizationManager.html" xlink:show="new" xlink:title="AuthorizationManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fdt606g704iuj)" height="258.8125" id="org.apache.wiki.auth.AuthorizationManager" style="stroke:#A80036;stroke-width:1.5;" width="369" x="7" y="126"/><ellipse cx="111.75" [...]
 class org.apache.wiki.api.engine.Initializable--><a href="../api/engine/Initializable.html" target="_top" title="../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../api/engine/Initializable.html" xlink:show="new" xlink:title="../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="24" fill="#FEFECE" filter="url(#fdt606g704iuj)" height="58.7422" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="83.5"  [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.AuthorizationManager--><path codeLine="28" d="M191.5,86.77 C191.5,98.74 191.5,112.1 191.5,125.91 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.AuthorizationManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="184.5,86.32,191.5,66.32,198.5,86.32,184.5,86.32" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif"  [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.AuthorizationManager--><path codeLine="28" d="M191.5,86.77 C191.5,98.74 191.5,112.1 191.5,125.91 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.AuthorizationManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="184.5,86.32,191.5,66.32,198.5,86.32,184.5,86.32" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -41,5 +41,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/Authorizer.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/Authorizer.svg
index 9ce4fc0030..0814311636 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/Authorizer.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/Authorizer.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="128px" preserveAspectRatio="none" style="width:277px;height:128px;background:#FFFFFF;" version="1.1" viewBox="0 0 277 128" width="277px" zoomAndPan="magnify"><defs><filter height="300%" id="f6k4rnxfxleuo" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.auth.Authorizer--><a href="Authorizer.html" target="_top" title="Authorizer.html" xlink:actuate="onRequest" xlink:href="Authorizer.html" xlink:show="new" xlink:title="Authorizer.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f6k4rnxfxleuo)" height="97.1563" id="org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.5;" width="256" x="7" y="7"/><ellipse cx="79.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A800 [...]
+class org.apache.wiki.auth.Authorizer--><a href="Authorizer.html" target="_top" title="Authorizer.html" xlink:actuate="onRequest" xlink:href="Authorizer.html" xlink:show="new" xlink:title="Authorizer.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f6k4rnxfxleuo)" height="97.1563" id="org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.5;" width="256" x="7" y="7"/><ellipse cx="79.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A800 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultAuthenticationManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultAuthenticationManager.svg
index 70a7027f07..12b54830cb 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultAuthenticationManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultAuthenticationManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:622px;height:479px;background:#FFFFFF;" version="1.1" viewBox="0 0 622 479" width="622px" zoomAndPan="magnify"><defs><filter height="300%" id="f1291v0unysp5c" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.DefaultAuthenticationManager--><a href="DefaultAuthenticationManager.html" target="_top" title="DefaultAuthenticationManager.html" xlink:actuate="onRequest" xlink:href="DefaultAuthenticationManager.html" xlink:show="new" xlink:title="DefaultAuthenticationManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1291v0unysp5c)" height="220.3984" id="org.apache.wiki.auth.DefaultAuthenticationManager" style="stroke:#A80036;stroke-width:1.5; [...]
 class org.apache.wiki.auth.AuthenticationManager--><a href="AuthenticationManager.html" target="_top" title="AuthenticationManager.html" xlink:actuate="onRequest" xlink:href="AuthenticationManager.html" xlink:show="new" xlink:title="AuthenticationManager.html" xlink:type="simple"><rect codeLine="21" fill="#FEFECE" filter="url(#f1291v0unysp5c)" height="161.1797" id="org.apache.wiki.auth.AuthenticationManager" style="stroke:#A80036;stroke-width:1.5;" width="595" x="11" y="7"/><ellipse cx=" [...]
-reverse link org.apache.wiki.auth.AuthenticationManager to org.apache.wiki.auth.DefaultAuthenticationManager--><path codeLine="33" d="M308.5,188.25 C308.5,201.3 308.5,214.71 308.5,227.9 " fill="none" id="org.apache.wiki.auth.AuthenticationManager-backto-org.apache.wiki.auth.DefaultAuthenticationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="301.5,188.15,308.5,168.15,315.5,188.15,301.5,188.15" style="stroke:#A80036;stroke-width:1.0 [...]
+reverse link org.apache.wiki.auth.AuthenticationManager to org.apache.wiki.auth.DefaultAuthenticationManager--><path codeLine="33" d="M308.5,188.25 C308.5,201.3 308.5,214.71 308.5,227.9 " fill="none" id="org.apache.wiki.auth.AuthenticationManager-backto-org.apache.wiki.auth.DefaultAuthenticationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="301.5,188.15,308.5,168.15,315.5,188.15,301.5,188.15" style="stroke:#A80036;stroke-width:1.0 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -46,5 +46,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultAuthorizationManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultAuthorizationManager.svg
index 76d648b0b9..6363521f60 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultAuthorizationManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultAuthorizationManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="432px" preserveAspectRatio="none" style="width:392px;height:432px;background:#FFFFFF;" version="1.1" viewBox="0 0 392 432" width="392px" zoomAndPan="magnify"><defs><filter height="300%" id="f1n3eh0rqdlj77" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.DefaultAuthorizationManager--><a href="DefaultAuthorizationManager.html" target="_top" title="DefaultAuthorizationManager.html" xlink:actuate="onRequest" xlink:href="DefaultAuthorizationManager.html" xlink:show="new" xlink:title="DefaultAuthorizationManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1n3eh0rqdlj77)" height="173.9844" id="org.apache.wiki.auth.DefaultAuthorizationManager" style="stroke:#A80036;stroke-width:1.5;" widt [...]
 class org.apache.wiki.auth.AuthorizationManager--><a href="AuthorizationManager.html" target="_top" title="AuthorizationManager.html" xlink:actuate="onRequest" xlink:href="AuthorizationManager.html" xlink:show="new" xlink:title="AuthorizationManager.html" xlink:type="simple"><rect codeLine="18" fill="#FEFECE" filter="url(#f1n3eh0rqdlj77)" height="161.1797" id="org.apache.wiki.auth.AuthorizationManager" style="stroke:#A80036;stroke-width:1.5;" width="369" x="8" y="7"/><ellipse cx="112.75" [...]
-reverse link org.apache.wiki.auth.AuthorizationManager to org.apache.wiki.auth.DefaultAuthorizationManager--><path codeLine="30" d="M192.5,188.42 C192.5,201.6 192.5,215.02 192.5,227.94 " fill="none" id="org.apache.wiki.auth.AuthorizationManager-backto-org.apache.wiki.auth.DefaultAuthorizationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="185.5,188,192.5,168,199.5,188,185.5,188" style="stroke:#A80036;stroke-width:1.0;"/><text fill= [...]
+reverse link org.apache.wiki.auth.AuthorizationManager to org.apache.wiki.auth.DefaultAuthorizationManager--><path codeLine="30" d="M192.5,188.42 C192.5,201.6 192.5,215.02 192.5,227.94 " fill="none" id="org.apache.wiki.auth.AuthorizationManager-backto-org.apache.wiki.auth.DefaultAuthorizationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="185.5,188,192.5,168,199.5,188,185.5,188" style="stroke:#A80036;stroke-width:1.0;"/><text fill= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -43,5 +43,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.svg
index d97df3e3b0..ff28b12aab 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.JSONUserModule.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><a href="DefaultU
 class org.apache.wiki.ajax.WikiAjaxServlet--><a href="../ajax/WikiAjaxServlet.html" target="_top" title="../ajax/WikiAjaxServlet.html" xlink:actuate="onRequest" xlink:href="../ajax/WikiAjaxServlet.html" xlink:show="new" xlink:title="../ajax/WikiAjaxServlet.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f1htf2p2sz7209)" height="71.5469" id="org.apache.wiki.ajax.WikiAjaxServlet" style="stroke:#A80036;stroke-width:1.5;" width="461" x="7" y="7"/><ellipse cx="180.75 [...]
 class org.apache.wiki.auth.DefaultUserManager--><a href="DefaultUserManager.html" target="_top" title="DefaultUserManager.html" xlink:actuate="onRequest" xlink:href="DefaultUserManager.html" xlink:show="new" xlink:title="DefaultUserManager.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#f1htf2p2sz7209)" height="37.9375" id="org.apache.wiki.auth.DefaultUserManager" style="stroke:#A80036;stroke-width:1.5;" width="173" x="503" y="24"/><ellipse cx="518" cy="42.9688" [...]
 reverse link org.apache.wiki.ajax.WikiAjaxServlet to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="18" d="M296.78,92 C315.41,107.08 335.96,123.72 354.56,138.78 " fill="none" id="org.apache.wiki.ajax.WikiAjaxServlet-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="292.14,97.25,281.01,79.22,300.95,86.37,292.14,97.25" style="stroke:#A80036;stroke-width:1.0 [...]
-reverse link org.apache.wiki.auth.DefaultUserManager to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="19" d="M555.38,71.62 C531.81,90.71 499.84,116.6 472.21,138.96 " fill="none" id="org.apache.wiki.auth.DefaultUserManager-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="560.9936" cy="67.0856" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036;str [...]
+reverse link org.apache.wiki.auth.DefaultUserManager to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="19" d="M555.38,71.62 C531.81,90.71 499.84,116.6 472.21,138.96 " fill="none" id="org.apache.wiki.auth.DefaultUserManager-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="560.9936" cy="67.0856" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036;str [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -34,5 +34,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.svg
index d5c0afc89a..7c9cba9b0c 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/DefaultUserManager.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.DefaultUserManager--><a href="DefaultUserManager.html
 class org.apache.wiki.auth.UserManager--><a href="UserManager.html" target="_top" title="UserManager.html" xlink:actuate="onRequest" xlink:href="UserManager.html" xlink:show="new" xlink:title="UserManager.html" xlink:type="simple"><rect codeLine="18" fill="#FEFECE" filter="url(#f1uf5p1dftsstc)" height="161.1797" id="org.apache.wiki.auth.UserManager" style="stroke:#A80036;stroke-width:1.5;" width="368" x="7" y="7"/><ellipse cx="135.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="st [...]
 class org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><a href="DefaultUserManager.JSONUserModule.html" target="_top" title="DefaultUserManager.JSONUserModule.html" xlink:actuate="onRequest" xlink:href="DefaultUserManager.JSONUserModule.html" xlink:show="new" xlink:title="DefaultUserManager.JSONUserModule.html" xlink:type="simple"><rect codeLine="29" fill="#FEFECE" filter="url(#f1uf5p1dftsstc)" height="37.9375" id="org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="st [...]
 reverse link org.apache.wiki.auth.UserManager to org.apache.wiki.auth.DefaultUserManager--><path codeLine="31" d="M191,188.42 C191,201.6 191,215.02 191,227.94 " fill="none" id="org.apache.wiki.auth.UserManager-backto-org.apache.wiki.auth.DefaultUserManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="184,188,191,168,198,188,184,188" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[99042d82d8b73fd6e83d3dfa22be7d41]
-reverse link org.apache.wiki.auth.DefaultUserManager to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="32" d="M191,417.49 C191,434.49 191,450.31 191,461.78 " fill="none" id="org.apache.wiki.auth.DefaultUserManager-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="191" cy="410.32" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036;stroke-width:1.0;" [...]
+reverse link org.apache.wiki.auth.DefaultUserManager to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="32" d="M191,417.49 C191,434.49 191,450.31 191,461.78 " fill="none" id="org.apache.wiki.auth.DefaultUserManager-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="191" cy="410.32" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036;stroke-width:1.0;" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -47,5 +47,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/GroupPrincipal.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/GroupPrincipal.svg
index f2460fa46d..d097b927e2 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/GroupPrincipal.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/GroupPrincipal.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.GroupPrincipal--><a href="GroupPrincipal.html" target
 class java.security.Principal--><rect codeLine="10" fill="#FEFECE" filter="url(#f4kebh742vr4w)" height="58.7422" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="126" x="7" y="7"/><ellipse cx="35.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M31.4219,21.7344 L31.4219,19.5781 L38.8125,19.5781 L38.8125,21.7344 L36.3438,21.7344 L36.3438,29.8125 L38.8125,29.8125 L38.8125,31.9688 L31.4219,31.9688 L31.4219,29.8125  [...]
 class java.io.Serializable--><rect codeLine="13" fill="#FEFECE" filter="url(#f4kebh742vr4w)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="168" y="17.5"/><ellipse cx="183" cy="36.4688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M178.9219,32.2344 L178.9219,30.0781 L186.3125,30.0781 L186.3125,32.2344 L183.8438,32.2344 L183.8438,40.3125 L186.3125,40.3125 L186.3125,42.4688 L178.9219,42.4688 L178.9219, [...]
 reverse link java.security.Principal to org.apache.wiki.auth.GroupPrincipal--><path codeLine="15" d="M98.38,83.62 C106.99,97.61 116.31,112.75 124.4,125.9 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="92.15,86.85,87.63,66.14,104.07,79.51,92.15,86.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[296ff7e5d1ef75d18adc80e02449a383]
-reverse link java.io.Serializable to org.apache.wiki.auth.GroupPrincipal--><path codeLine="16" d="M200.27,72.82 C190.04,89.44 177.87,109.22 167.65,125.82 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="194.34,69.09,210.79,55.72,206.27,76.42,194.34,69.09" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" len [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.GroupPrincipal--><path codeLine="16" d="M200.27,72.82 C190.04,89.44 177.87,109.22 167.65,125.82 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="194.34,69.09,210.79,55.72,206.27,76.42,194.34,69.09" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" len [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/NoSuchPrincipalException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/NoSuchPrincipalException.svg
index 7ee2936cdd..027aaff3eb 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/NoSuchPrincipalException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/NoSuchPrincipalException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:234px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 234 194" width="234px" zoomAndPan="magnify"><defs><filter height="300%" id="f5ucmtjlrgcom" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.NoSuchPrincipalException--><a href="NoSuchPrincipalException.html" target="_top" title="NoSuchPrincipalException.html" xlink:actuate="onRequest" xlink:href="NoSuchPrincipalException.html" xlink:show="new" xlink:title="NoSuchPrincipalException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f5ucmtjlrgcom)" height="58.7422" id="org.apache.wiki.auth.NoSuchPrincipalException" style="stroke:#A80036;stroke-width:1.5;" width="213" x="7" y="105 [...]
 class org.apache.wiki.auth.WikiSecurityException--><a href="WikiSecurityException.html" target="_top" title="WikiSecurityException.html" xlink:actuate="onRequest" xlink:href="WikiSecurityException.html" xlink:show="new" xlink:title="WikiSecurityException.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f5ucmtjlrgcom)" height="37.9375" id="org.apache.wiki.auth.WikiSecurityException" style="stroke:#A80036;stroke-width:1.5;" width="182" x="22.5" y="7"/><ellipse cx="3 [...]
-reverse link org.apache.wiki.auth.WikiSecurityException to org.apache.wiki.auth.NoSuchPrincipalException--><path codeLine="11" d="M113.5,65.22 C113.5,78.3 113.5,92.7 113.5,104.89 " fill="none" id="org.apache.wiki.auth.WikiSecurityException-backto-org.apache.wiki.auth.NoSuchPrincipalException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="106.5,65.07,113.5,45.07,120.5,65.07,106.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sa [...]
+reverse link org.apache.wiki.auth.WikiSecurityException to org.apache.wiki.auth.NoSuchPrincipalException--><path codeLine="11" d="M113.5,65.22 C113.5,78.3 113.5,92.7 113.5,104.89 " fill="none" id="org.apache.wiki.auth.WikiSecurityException-backto-org.apache.wiki.auth.NoSuchPrincipalException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="106.5,65.07,113.5,45.07,120.5,65.07,106.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sa [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/SecurityVerifier.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/SecurityVerifier.svg
index ba61356200..d7eb3607e3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/SecurityVerifier.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/SecurityVerifier.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:258px;height:380px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 380" width="258px" zoomAndPan="magnify"><defs><filter height="300%" id="fbmejtimhs1yi" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.auth.SecurityVerifier--><a href="SecurityVerifier.html" target="_top" title="SecurityVerifier.html" xlink:actuate="onRequest" xlink:href="SecurityVerifier.html" xlink:show="new" xlink:title="SecurityVerifier.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fbmejtimhs1yi)" height="348.4453" id="org.apache.wiki.auth.SecurityVerifier" style="stroke:#A80036;stroke-width:1.5;" width="237" x="7" y="7"/><ellipse cx="70.25" cy="25.9688" fill="#ADD1B2 [...]
+class org.apache.wiki.auth.SecurityVerifier--><a href="SecurityVerifier.html" target="_top" title="SecurityVerifier.html" xlink:actuate="onRequest" xlink:href="SecurityVerifier.html" xlink:show="new" xlink:title="SecurityVerifier.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fbmejtimhs1yi)" height="348.4453" id="org.apache.wiki.auth.SecurityVerifier" style="stroke:#A80036;stroke-width:1.5;" width="237" x="7" y="7"/><ellipse cx="70.25" cy="25.9688" fill="#ADD1B2 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -40,5 +40,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/SessionMonitor.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/SessionMonitor.svg
index fcb589180d..9552363436 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/SessionMonitor.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/SessionMonitor.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="382px" preserveAspectRatio="none" style="width:327px;height:382px;background:#FFFFFF;" version="1.1" viewBox="0 0 327 382" width="327px" zoomAndPan="magnify"><defs><filter height="300%" id="f1xkcf0pu1axgg" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.SessionMonitor--><a href="SessionMonitor.html" target="_top" title="SessionMonitor.html" xlink:actuate="onRequest" xlink:href="SessionMonitor.html" xlink:show="new" xlink:title="SessionMonitor.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1xkcf0pu1axgg)" height="212.3984" id="org.apache.wiki.auth.SessionMonitor" style="stroke:#A80036;stroke-width:1.5;" width="304" x="9" y="139"/><ellipse cx="103.25" cy="157.9688" fill="#ADD1B2" rx="1 [...]
 class javax.servlet.http.HttpSessionListener--><rect codeLine="21" fill="#FEFECE" filter="url(#f1xkcf0pu1axgg)" height="71.5469" id="javax.servlet.http.HttpSessionListener" style="stroke:#A80036;stroke-width:1.5;" width="264" x="29" y="7"/><ellipse cx="87.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M83.6719,21.7344 L83.6719,19.5781 L91.0625,19.5781 L91.0625,21.7344 L88.5938,21.7344 L88.5938,29.8125 L91.0625,29.8125 L91.0625,31.9688 L [...]
-reverse link javax.servlet.http.HttpSessionListener to org.apache.wiki.auth.SessionMonitor--><path codeLine="26" d="M161,99.36 C161,111.66 161,125.09 161,138.65 " fill="none" id="javax.servlet.http.HttpSessionListener-backto-org.apache.wiki.auth.SessionMonitor" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="154,99.3,161,79.3,168,99.3,154,99.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size [...]
+reverse link javax.servlet.http.HttpSessionListener to org.apache.wiki.auth.SessionMonitor--><path codeLine="26" d="M161,99.36 C161,111.66 161,125.09 161,138.65 " fill="none" id="javax.servlet.http.HttpSessionListener-backto-org.apache.wiki.auth.SessionMonitor" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="154,99.3,161,79.3,168,99.3,154,99.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -39,5 +39,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/UserManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/UserManager.svg
index c66afae6f6..436bfe10f7 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/UserManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/UserManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="364px" preserveAspectRatio="none" style="width:389px;height:364px;background:#FFFFFF;" version="1.1" viewBox="0 0 389 364" width="389px" zoomAndPan="magnify"><defs><filter height="300%" id="f5d8agbv22mx5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.UserManager--><a href="UserManager.html" target="_top" title="UserManager.html" xlink:actuate="onRequest" xlink:href="UserManager.html" xlink:show="new" xlink:title="UserManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f5d8agbv22mx5)" height="207.5938" id="org.apache.wiki.auth.UserManager" style="stroke:#A80036;stroke-width:1.5;" width="368" x="7" y="126"/><ellipse cx="135.25" cy="144.9688" fill="#B4A7E5" rx="11" ry="11" style="s [...]
 class org.apache.wiki.api.engine.Initializable--><a href="../api/engine/Initializable.html" target="_top" title="../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../api/engine/Initializable.html" xlink:show="new" xlink:title="../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="20" fill="#FEFECE" filter="url(#f5d8agbv22mx5)" height="58.7422" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="83" y= [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.UserManager--><path codeLine="24" d="M191,86.43 C191,98.63 191,112.17 191,125.91 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.UserManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="184,86.17,191,66.17,198,86.17,184,86.17" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spac [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.UserManager--><path codeLine="24" d="M191,86.43 C191,98.63 191,112.17 191,125.91 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.UserManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="184,86.17,191,66.17,198,86.17,184,86.17" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spac [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -37,5 +37,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/WikiPrincipal.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/WikiPrincipal.svg
index 27aa7b67ff..55912260ce 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/WikiPrincipal.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/WikiPrincipal.svg
@@ -5,7 +5,7 @@ class java.lang.Comparable--><rect codeLine="22" fill="#FEFECE" filter="url(#f1m
 class java.io.Serializable--><rect codeLine="25" fill="#FEFECE" filter="url(#f1m862xvn0iig8)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="375" y="20.5"/><ellipse cx="390" cy="39.4688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M385.9219,35.2344 L385.9219,33.0781 L393.3125,33.0781 L393.3125,35.2344 L390.8438,35.2344 L390.8438,43.3125 L393.3125,43.3125 L393.3125,45.4688 L385.9219,45.4688 L385.9219 [...]
 reverse link java.security.Principal to org.apache.wiki.auth.WikiPrincipal--><path codeLine="27" d="M112.72,83.46 C126.31,97.12 141.93,112.82 157.72,128.7 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="107.49,88.12,98.35,69,117.41,78.24,107.49,88.12" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[de6327563baad93a22d2f868a2ac8195]
 reverse link java.lang.Comparable to org.apache.wiki.auth.WikiPrincipal--><path codeLine="28" d="M254,89.3 C254,101.51 254,115.04 254,128.7 " fill="none" id="java.lang.Comparable-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="247,89,254,69,261,89,247,89" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ec8e80d48d4435410905123bd859e267]
-reverse link java.io.Serializable to org.apache.wiki.auth.WikiPrincipal--><path codeLine="29" d="M397.93,73.35 C383.06,89.07 364.39,108.8 345.48,128.79 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="393.07,68.29,411.9,58.58,403.24,77.92,393.07,68.29" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthA [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.WikiPrincipal--><path codeLine="29" d="M397.93,73.35 C383.06,89.07 364.39,108.8 345.48,128.79 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="393.07,68.29,411.9,58.58,403.24,77.92,393.07,68.29" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthA [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -46,5 +46,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/WikiSecurityException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/WikiSecurityException.svg
index f6316dd3a1..9e2b33addd 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/WikiSecurityException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/WikiSecurityException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:277px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 277 207" width="277px" zoomAndPan="magnify"><defs><filter height="300%" id="flqk9oi52gcl0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.WikiSecurityException--><a href="WikiSecurityException.html" target="_top" title="WikiSecurityException.html" xlink:actuate="onRequest" xlink:href="WikiSecurityException.html" xlink:show="new" xlink:title="WikiSecurityException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#flqk9oi52gcl0)" height="71.5469" id="org.apache.wiki.auth.WikiSecurityException" style="stroke:#A80036;stroke-width:1.5;" width="256" x="7" y="105"/><ellipse cx="55 [...]
 class org.apache.wiki.api.exceptions.WikiException--><a href="../api/exceptions/WikiException.html" target="_top" title="../api/exceptions/WikiException.html" xlink:actuate="onRequest" xlink:href="../api/exceptions/WikiException.html" xlink:show="new" xlink:title="../api/exceptions/WikiException.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#flqk9oi52gcl0)" height="37.9375" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5 [...]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.auth.WikiSecurityException--><path codeLine="12" d="M135,65.3 C135,78 135,92.08 135,104.56 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.auth.WikiSecurityException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="128,65.16,135,45.16,142,65.16,128,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size= [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.auth.WikiSecurityException--><path codeLine="12" d="M135,65.3 C135,78 135,92.08 135,104.56 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.auth.WikiSecurityException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="128,65.16,135,45.16,142,65.16,128,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/Acl.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/Acl.svg
index 110370ace9..386265133c 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/Acl.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/Acl.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="331px" preserveAspectRatio="none" style="width:256px;height:331px;background:#FFFFFF;" version="1.1" viewBox="0 0 256 331" width="256px" zoomAndPan="magnify"><defs><filter height="300%" id="f1anpx1igvl1tv" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.acl.Acl--><a href="Acl.html" target="_top" title="Acl.html" xlink:actuate="onRequest" xlink:href="Acl.html" xlink:show="new" xlink:title="Acl.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1anpx1igvl1tv)" height="111.125" id="org.apache.wiki.auth.acl.Acl" style="stroke:#A80036;stroke-width:1.5;" width="217" x="16" y="190"/><ellipse cx="59.8" cy="215.9531" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d [...]
 class org.apache.wiki.api.core.Acl--><a href="../../api/core/Acl.html" target="_top" title="../../api/core/Acl.html" xlink:actuate="onRequest" xlink:href="../../api/core/Acl.html" xlink:show="new" xlink:title="../../api/core/Acl.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f1anpx1igvl1tv)" height="122.7656" id="org.apache.wiki.api.core.Acl" style="stroke:#A80036;stroke-width:1.5;" width="235" x="7" y="7"/><ellipse cx="59.75" cy="25.9688" fill="#B4A7E5" rx="11 [...]
-reverse link org.apache.wiki.api.core.Acl to org.apache.wiki.auth.acl.Acl--><path codeLine="21" d="M124.5,150.68 C124.5,163.91 124.5,177.34 124.5,189.75 " fill="none" id="org.apache.wiki.api.core.Acl-backto-org.apache.wiki.auth.acl.Acl" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="117.5,150.22,124.5,130.22,131.5,150.22,117.5,150.22" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textL [...]
+reverse link org.apache.wiki.api.core.Acl to org.apache.wiki.auth.acl.Acl--><path codeLine="21" d="M124.5,150.68 C124.5,163.91 124.5,177.34 124.5,189.75 " fill="none" id="org.apache.wiki.api.core.Acl-backto-org.apache.wiki.auth.acl.Acl" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="117.5,150.22,124.5,130.22,131.5,150.22,117.5,150.22" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textL [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -34,5 +34,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclEntry.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclEntry.svg
index d9f783b789..6a09433002 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclEntry.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclEntry.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="272px" preserveAspectRatio="none" style="width:283px;height:272px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 272" width="283px" zoomAndPan="magnify"><defs><filter height="300%" id="fx6rklgp7vr59" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.acl.AclEntry--><a href="AclEntry.html" target="_top" title="AclEntry.html" xlink:actuate="onRequest" xlink:href="AclEntry.html" xlink:show="new" xlink:title="AclEntry.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fx6rklgp7vr59)" height="51.9063" id="org.apache.wiki.auth.acl.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="153" x="61.5" y="190"/><ellipse cx="76.5" cy="215.9531" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80 [...]
 class org.apache.wiki.api.core.AclEntry--><a href="../../api/core/AclEntry.html" target="_top" title="../../api/core/AclEntry.html" xlink:actuate="onRequest" xlink:href="../../api/core/AclEntry.html" xlink:show="new" xlink:title="../../api/core/AclEntry.html" xlink:type="simple"><rect codeLine="7" fill="#FEFECE" filter="url(#fx6rklgp7vr59)" height="122.7656" id="org.apache.wiki.api.core.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="262" x="7" y="7"/><ellipse cx="73.25" cy="25 [...]
-reverse link org.apache.wiki.api.core.AclEntry to org.apache.wiki.auth.acl.AclEntry--><path codeLine="16" d="M138,150.6 C138,164.87 138,178.71 138,189.87 " fill="none" id="org.apache.wiki.api.core.AclEntry-backto-org.apache.wiki.auth.acl.AclEntry" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="131,150.36,138,130.36,145,150.36,131,150.36" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" te [...]
+reverse link org.apache.wiki.api.core.AclEntry to org.apache.wiki.auth.acl.AclEntry--><path codeLine="16" d="M138,150.6 C138,164.87 138,178.71 138,189.87 " fill="none" id="org.apache.wiki.api.core.AclEntry-backto-org.apache.wiki.auth.acl.AclEntry" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="131,150.36,138,130.36,145,150.36,131,150.36" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" te [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -29,5 +29,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclEntryImpl.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclEntryImpl.svg
index 9d46fba72d..79d570d5ee 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclEntryImpl.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclEntryImpl.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.acl.AclEntryImpl--><a href="AclEntryImpl.html" target
 class org.apache.wiki.auth.acl.AclEntry--><a href="AclEntry.html" target="_top" title="AclEntry.html" xlink:actuate="onRequest" xlink:href="AclEntry.html" xlink:show="new" xlink:title="AclEntry.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#fdfkweuwfdm20)" height="51.9063" id="org.apache.wiki.auth.acl.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="153" x="7" y="7"/><ellipse cx="22" cy="32.9531" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;str [...]
 class java.io.Serializable--><rect codeLine="15" fill="#FEFECE" filter="url(#fdfkweuwfdm20)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="195.5" y="14"/><ellipse cx="210.5" cy="32.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M206.4219,28.7344 L206.4219,26.5781 L213.8125,26.5781 L213.8125,28.7344 L211.3438,28.7344 L211.3438,36.8125 L213.8125,36.8125 L213.8125,38.9688 L206.4219,38.9688 L206.421 [...]
 reverse link org.apache.wiki.auth.acl.AclEntry to org.apache.wiki.auth.acl.AclEntryImpl--><path codeLine="17" d="M107.7,76.43 C115.27,89.69 123.76,104.58 131.9,118.84 " fill="none" id="org.apache.wiki.auth.acl.AclEntry-backto-org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="101.6,79.85,97.77,59.01,113.76,72.92,101.6,79.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5e845b528a605dfd8fbebcc6992f0649]
-reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclEntryImpl--><path codeLine="18" d="M229.15,69.68 C220.7,84.49 210.65,102.1 201.11,118.83 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="223.17,66.04,239.16,52.13,235.33,72.97,223.17,66.04" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" l [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclEntryImpl--><path codeLine="18" d="M229.15,69.68 C220.7,84.49 210.65,102.1 201.11,118.83 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="223.17,66.04,239.16,52.13,235.33,72.97,223.17,66.04" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" l [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclImpl.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclImpl.svg
index a3a2750622..9f0d8718e5 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclImpl.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclImpl.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.acl.AclImpl--><a href="AclImpl.html" target="_top" ti
 class org.apache.wiki.auth.acl.Acl--><a href="Acl.html" target="_top" title="Acl.html" xlink:actuate="onRequest" xlink:href="Acl.html" xlink:show="new" xlink:title="Acl.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#f7ianq6id0jdz)" height="51.9063" id="org.apache.wiki.auth.acl.Acl" style="stroke:#A80036;stroke-width:1.5;" width="153" x="7" y="7"/><ellipse cx="22" cy="32.9531" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M17. [...]
 class java.io.Serializable--><rect codeLine="15" fill="#FEFECE" filter="url(#f7ianq6id0jdz)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="195.5" y="14"/><ellipse cx="210.5" cy="32.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M206.4219,28.7344 L206.4219,26.5781 L213.8125,26.5781 L213.8125,28.7344 L211.3438,28.7344 L211.3438,36.8125 L213.8125,36.8125 L213.8125,38.9688 L206.4219,38.9688 L206.421 [...]
 reverse link org.apache.wiki.auth.acl.Acl to org.apache.wiki.auth.acl.AclImpl--><path codeLine="17" d="M107.7,76.43 C115.27,89.69 123.76,104.58 131.9,118.84 " fill="none" id="org.apache.wiki.auth.acl.Acl-backto-org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="101.6,79.85,97.77,59.01,113.76,72.92,101.6,79.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[12d717298da9b659ac8d160209c7eee3]
-reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclImpl--><path codeLine="18" d="M229.15,69.68 C220.7,84.49 210.65,102.1 201.11,118.83 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="223.17,66.04,239.16,52.13,235.33,72.97,223.17,66.04" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjus [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclImpl--><path codeLine="18" d="M229.15,69.68 C220.7,84.49 210.65,102.1 201.11,118.83 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="223.17,66.04,239.16,52.13,235.33,72.97,223.17,66.04" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjus [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclManager.svg
index 607cad1a8a..e44b8c65f6 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/AclManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:237px;height:241px;background:#FFFFFF;" version="1.1" viewBox="0 0 237 241" width="237px" zoomAndPan="magnify"><defs><filter height="300%" id="f88lxmcdus4ss" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.acl.AclManager--><a href="AclManager.html" target="_top" title="AclManager.html" xlink:actuate="onRequest" xlink:href="AclManager.html" xlink:show="new" xlink:title="AclManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f88lxmcdus4ss)" height="84.3516" id="org.apache.wiki.auth.acl.AclManager" style="stroke:#A80036;stroke-width:1.5;" width="204" x="13" y="126"/><ellipse cx="50.95" cy="144.9688" fill="#B4A7E5" rx="11" ry="11" style=" [...]
 class org.apache.wiki.api.engine.Initializable--><a href="../../api/engine/Initializable.html" target="_top" title="../../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../../api/engine/Initializable.html" xlink:show="new" xlink:title="../../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f88lxmcdus4ss)" height="58.7422" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="21 [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.acl.AclManager--><path codeLine="15" d="M115,86.63 C115,99.47 115,113.17 115,125.56 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.acl.AclManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="108,86.24,115,66.24,122,86.24,108,86.24" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.acl.AclManager--><path codeLine="15" d="M115,86.63 C115,99.47 115,113.17 115,125.56 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.acl.AclManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="108,86.24,115,66.24,122,86.24,108,86.24" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/DefaultAclManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/DefaultAclManager.svg
index d6601a2efe..80ec7d6c47 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/DefaultAclManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/DefaultAclManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="312px" preserveAspectRatio="none" style="width:238px;height:312px;background:#FFFFFF;" version="1.1" viewBox="0 0 238 312" width="238px" zoomAndPan="magnify"><defs><filter height="300%" id="f1boui8jftc65r" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.acl.DefaultAclManager--><a href="DefaultAclManager.html" target="_top" title="DefaultAclManager.html" xlink:actuate="onRequest" xlink:href="DefaultAclManager.html" xlink:show="new" xlink:title="DefaultAclManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1boui8jftc65r)" height="130.7656" id="org.apache.wiki.auth.acl.DefaultAclManager" style="stroke:#A80036;stroke-width:1.5;" width="215" x="9" y="151"/><ellipse cx="48.3" cy="169.96 [...]
 class org.apache.wiki.auth.acl.AclManager--><a href="AclManager.html" target="_top" title="AclManager.html" xlink:actuate="onRequest" xlink:href="AclManager.html" xlink:show="new" xlink:title="AclManager.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#f1boui8jftc65r)" height="84.3516" id="org.apache.wiki.auth.acl.AclManager" style="stroke:#A80036;stroke-width:1.5;" width="204" x="14.5" y="7"/><ellipse cx="52.45" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style= [...]
-reverse link org.apache.wiki.auth.acl.AclManager to org.apache.wiki.auth.acl.DefaultAclManager--><path codeLine="20" d="M116.5,111.41 C116.5,124.28 116.5,137.9 116.5,150.89 " fill="none" id="org.apache.wiki.auth.acl.AclManager-backto-org.apache.wiki.auth.acl.DefaultAclManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="109.5,111.34,116.5,91.34,123.5,111.34,109.5,111.34" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" fon [...]
+reverse link org.apache.wiki.auth.acl.AclManager to org.apache.wiki.auth.acl.DefaultAclManager--><path codeLine="20" d="M116.5,111.41 C116.5,124.28 116.5,137.9 116.5,150.89 " fill="none" id="org.apache.wiki.auth.acl.AclManager-backto-org.apache.wiki.auth.acl.DefaultAclManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="109.5,111.34,116.5,91.34,123.5,111.34,109.5,111.34" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" fon [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/UnresolvedPrincipal.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/UnresolvedPrincipal.svg
index 540004055e..6c30ee7517 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/UnresolvedPrincipal.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/UnresolvedPrincipal.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.acl.UnresolvedPrincipal--><a href="UnresolvedPrincipa
 class java.security.Principal--><rect codeLine="10" fill="#FEFECE" filter="url(#f1gg7huijuv8ju)" height="58.7422" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="126" x="7" y="7"/><ellipse cx="35.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M31.4219,21.7344 L31.4219,19.5781 L38.8125,19.5781 L38.8125,21.7344 L36.3438,21.7344 L36.3438,29.8125 L38.8125,29.8125 L38.8125,31.9688 L31.4219,31.9688 L31.4219,29.8125 [...]
 class java.io.Serializable--><rect codeLine="13" fill="#FEFECE" filter="url(#f1gg7huijuv8ju)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="168" y="17.5"/><ellipse cx="183" cy="36.4688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M178.9219,32.2344 L178.9219,30.0781 L186.3125,30.0781 L186.3125,32.2344 L183.8438,32.2344 L183.8438,40.3125 L186.3125,40.3125 L186.3125,42.4688 L178.9219,42.4688 L178.9219 [...]
 reverse link java.security.Principal to org.apache.wiki.auth.acl.UnresolvedPrincipal--><path codeLine="15" d="M98.38,83.62 C106.99,97.61 116.31,112.75 124.4,125.9 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="92.15,86.85,87.63,66.14,104.07,79.51,92.15,86.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a27231dfd8b4cb461cea2f048d7b5d23]
-reverse link java.io.Serializable to org.apache.wiki.auth.acl.UnresolvedPrincipal--><path codeLine="16" d="M200.27,72.82 C190.04,89.44 177.87,109.22 167.65,125.82 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="194.34,69.09,210.79,55.72,206.27,76.42,194.34,69.09" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif"  [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.acl.UnresolvedPrincipal--><path codeLine="16" d="M200.27,72.82 C190.04,89.44 177.87,109.22 167.65,125.82 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="194.34,69.09,210.79,55.72,206.27,76.42,194.34,69.09" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/package.svg
index 6ad115a49b..b3b6eca0ff 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/acl/package.svg
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="570px" preserveAspectRatio="none" style="width:1256px;height:570px;background:#FFFFFF;" version="1.1" viewBox="0 0 1256 570" width="1256px" zoomAndPan="magnify"><defs><filter height="300%" id="f4zhwmqa5hmlc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
-cluster org.apache.wiki.auth.acl--><polygon fill="#FFFFFF" filter="url(#f4zhwmqa5hmlc)" points="249,206,447,206,454,228.2969,1103,228.2969,1103,547,249,547,249,206" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="249" x2="454" y1="228.2969" y2="228.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="192" x="253" y="220.9951">org.apache.wiki.auth.acl</text><!--MD5=[329450b536 [...]
-cluster org.apache.wiki.api.core--><polygon fill="#FFFFFF" filter="url(#f4zhwmqa5hmlc)" points="176,6,376,6,383,28.2969,741,28.2969,741,182,176,182,176,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="176" x2="383" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="194" x="180" y="20.9951">org.apache.wiki.api.core</text><!--MD5=[0d852700fdad35b7061d461 [...]
-cluster java.io--><polygon fill="#FFFFFF" filter="url(#f4zhwmqa5hmlc)" points="16,44.5,72,44.5,79,66.7969,152,66.7969,152,143.5,16,143.5,16,44.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="79" y1="66.7969" y2="66.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="20" y="59.4951">java.io</text><!--MD5=[06e4b2620a8b168056b961578cd367b2]
-cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#f4zhwmqa5hmlc)" points="765,38,983,38,990,60.2969,1013,60.2969,1013,150,765,150,765,38" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="765" x2="990" y1="60.2969" y2="60.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="769" y="52.9951">org.apache.wiki.api.engine</text><!--MD5=[67892945c51b45 [...]
-cluster java.security--><polygon fill="#FFFFFF" filter="url(#f4zhwmqa5hmlc)" points="1037,31.5,1143,31.5,1150,53.7969,1239,53.7969,1239,156.5,1037,156.5,1037,31.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1037" x2="1150" y1="53.7969" y2="53.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="1041" y="46.4951">java.security</text><!--MD5=[c115711a15917d2a78b4d8 [...]
-class org.apache.wiki.auth.acl.Acl--><a href="Acl.html" target="_top" title="Acl.html" xlink:actuate="onRequest" xlink:href="Acl.html" xlink:show="new" xlink:title="Acl.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="105.1563" id="org.apache.wiki.auth.acl.Acl" style="stroke:#A80036;stroke-width:1.5;" width="217" x="415.5" y="241"/><ellipse cx="478.25" cy="259.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><p [...]
-class org.apache.wiki.auth.acl.AclEntryImpl--><a href="AclEntryImpl.html" target="_top" title="AclEntryImpl.html" xlink:actuate="onRequest" xlink:href="AclEntryImpl.html" xlink:show="new" xlink:title="AclEntryImpl.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="124.8281" id="org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.5;" width="267" x="265.5" y="406"/><ellipse cx="357.25" cy="422" fill="#ADD1B2" rx="11" ry [...]
-class org.apache.wiki.auth.acl.AclManager--><a href="AclManager.html" target="_top" title="AclManager.html" xlink:actuate="onRequest" xlink:href="AclManager.html" xlink:show="new" xlink:title="AclManager.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="86.4141" id="org.apache.wiki.auth.acl.AclManager" style="stroke:#A80036;stroke-width:1.5;" width="204" x="668" y="250.5"/><ellipse cx="729.25" cy="266.5" fill="#B4A7E5" rx="11" ry="11" style [...]
-class org.apache.wiki.auth.acl.AclEntry--><a href="AclEntry.html" target="_top" title="AclEntry.html" xlink:actuate="onRequest" xlink:href="AclEntry.html" xlink:show="new" xlink:title="AclEntry.html" xlink:type="simple"><rect codeLine="25" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="53.9375" id="org.apache.wiki.auth.acl.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="115" x="265.5" y="266.5"/><ellipse cx="280.5" cy="285.4688" fill="#B4A7E5" rx="11" ry="11" style="stroke [...]
-class org.apache.wiki.auth.acl.DefaultAclManager--><a href="DefaultAclManager.html" target="_top" title="DefaultAclManager.html" xlink:actuate="onRequest" xlink:href="DefaultAclManager.html" xlink:show="new" xlink:title="DefaultAclManager.html" xlink:type="simple"><rect codeLine="27" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="124.8281" id="org.apache.wiki.auth.acl.DefaultAclManager" style="stroke:#A80036;stroke-width:1.5;" width="215" x="841.5" y="406"/><ellipse cx="885.75" cy=" [...]
-class org.apache.wiki.auth.acl.UnresolvedPrincipal--><a href="UnresolvedPrincipal.html" target="_top" title="UnresolvedPrincipal.html" xlink:actuate="onRequest" xlink:href="UnresolvedPrincipal.html" xlink:show="new" xlink:title="UnresolvedPrincipal.html" xlink:type="simple"><rect codeLine="36" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="73.6094" id="org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.5;" width="180" x="907" y="256.5"/><ellipse cx="9 [...]
-class org.apache.wiki.auth.acl.AclImpl--><a href="AclImpl.html" target="_top" title="AclImpl.html" xlink:actuate="onRequest" xlink:href="AclImpl.html" xlink:show="new" xlink:title="AclImpl.html" xlink:type="simple"><rect codeLine="41" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="124.8281" id="org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.5;" width="238" x="568" y="406"/><ellipse cx="661.25" cy="422" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stro [...]
-class org.apache.wiki.api.core.Acl--><a href="../../api/core/Acl.html" target="_top" title="../../api/core/Acl.html" xlink:actuate="onRequest" xlink:href="../../api/core/Acl.html" xlink:show="new" xlink:title="../../api/core/Acl.html" xlink:type="simple"><rect codeLine="63" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="124.8281" id="org.apache.wiki.api.core.Acl" style="stroke:#A80036;stroke-width:1.5;" width="235" x="489.5" y="41"/><ellipse cx="593.75" cy="57" fill="#B4A7E5" rx="11 [...]
-class org.apache.wiki.api.core.AclEntry--><a href="../../api/core/AclEntry.html" target="_top" title="../../api/core/AclEntry.html" xlink:actuate="onRequest" xlink:href="../../api/core/AclEntry.html" xlink:show="new" xlink:title="../../api/core/AclEntry.html" xlink:type="simple"><rect codeLine="71" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="124.8281" id="org.apache.wiki.api.core.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="262" x="192" y="41"/><ellipse cx="293.25" c [...]
-class java.io.Serializable--><rect codeLine="82" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="32.5" y="79.5"/><ellipse cx="47.5" cy="95.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M43.4219,91.2656 L43.4219,89.1094 L50.8125,89.1094 L50.8125,91.2656 L48.3438,91.2656 L48.3438,99.3438 L50.8125,99.3438 L50.8125,101.5 L43.4219,101.5 L43.4219,99.3438 L45.8906,99. [...]
-class org.apache.wiki.api.engine.Initializable--><a href="../../api/engine/Initializable.html" target="_top" title="../../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../../api/engine/Initializable.html" xlink:show="new" xlink:title="../../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="86" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="21 [...]
-class java.security.Principal--><rect codeLine="92" fill="#FEFECE" filter="url(#f4zhwmqa5hmlc)" height="73.6094" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="170" x="1053" y="66.5"/><ellipse cx="1107.75" cy="82.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1103.6719,78.2656 L1103.6719,76.1094 L1111.0625,76.1094 L1111.0625,78.2656 L1108.5938,78.2656 L1108.5938,86.3438 L1111.0625,86.3438 L1111.0625,88.5 L1103.6719,88.5 [...]
-reverse link org.apache.wiki.api.core.Acl to org.apache.wiki.auth.acl.Acl--><path codeLine="50" d="M571.72,184.41 C563.28,203.52 554.5,223.43 546.79,240.87 " fill="none" id="org.apache.wiki.api.core.Acl-backto-org.apache.wiki.auth.acl.Acl" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="565.34,181.53,579.82,166.06,578.15,187.18,565.34,181.53" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[567e058e736d2cac867c7d7dbecf1c10]
-reverse link org.apache.wiki.auth.acl.AclEntry to org.apache.wiki.auth.acl.AclEntryImpl--><path codeLine="51" d="M342.6,339.12 C351.51,359.41 362.2,383.74 371.87,405.74 " fill="none" id="org.apache.wiki.auth.acl.AclEntry-backto-org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="336.18,341.9,334.54,320.77,349,336.27,336.18,341.9" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5e845b528a605dfd8fbebcc6992f0649]
-reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclEntryImpl--><path codeLine="52" d="M89.9,147.58 C99.05,199.92 121.11,288.36 171,346 C196.54,375.5 231.05,398.99 265.49,417.13 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="82.94,148.4,86.73,127.55,96.77,146.21,82.94,148.4" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[467c6a83ed317248d2 [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.acl.AclManager--><path codeLine="53" d="M859.29,151.43 C840.09,181.76 815.32,220.91 796.73,250.27 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.acl.AclManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="853.53,147.44,870.14,134.29,865.36,154.93,853.53,147.44" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a8e3dc15917c773071ba65d9f289b39f]
-reverse link org.apache.wiki.api.core.AclEntry to org.apache.wiki.auth.acl.AclEntry--><path codeLine="54" d="M323,186.18 C323,215.09 323,245.58 323,266.46 " fill="none" id="org.apache.wiki.api.core.AclEntry-backto-org.apache.wiki.auth.acl.AclEntry" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="316,186.06,323,166.06,330,186.06,316,186.06" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7b805c81259efad0edd759eb8c1ff5d7]
-reverse link org.apache.wiki.auth.acl.AclManager to org.apache.wiki.auth.acl.DefaultAclManager--><path codeLine="55" d="M828.19,350.74 C846.35,368.29 866.49,387.75 885.03,405.67 " fill="none" id="org.apache.wiki.auth.acl.AclManager-backto-org.apache.wiki.auth.acl.DefaultAclManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="823.3,355.75,813.79,336.82,833.03,345.69,823.3,355.75" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1e94b4c [...]
-reverse link java.security.Principal to org.apache.wiki.auth.acl.UnresolvedPrincipal--><path codeLine="56" d="M1098.66,156.95 C1074.91,188.62 1045.24,228.17 1024.1,256.36 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1093.21,152.55,1110.81,140.75,1104.41,160.95,1093.21,152.55" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a27231dfd8b4cb461c [...]
-reverse link java.io.Serializable to org.apache.wiki.auth.acl.UnresolvedPrincipal--><path codeLine="57" d="M113.71,143.01 C129.95,160.89 151.69,180.29 176,190 C212.84,204.71 852.98,183.75 890,198 C920.76,209.84 948.44,234.88 967.94,256.22 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="108.3,147.45,100.69,127.67,118.97,138.39,108.3,147.45" style="str [...]
-reverse link org.apache.wiki.auth.acl.Acl to org.apache.wiki.auth.acl.AclImpl--><path codeLine="58" d="M586.96,361.32 C600.77,375.98 615.33,391.43 628.94,405.87 " fill="none" id="org.apache.wiki.auth.acl.Acl-backto-org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="581.53,365.76,572.91,346.41,591.72,356.16,581.53,365.76" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[12d717298da9b659ac8d160209c7eee3]
-reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclImpl--><path codeLine="59" d="M118.64,143.02 C132.76,159.46 148.81,179.17 162,198 C205.63,260.32 186.09,301.78 248,346 C359.35,425.54 419.64,364.38 550,406 C555.84,407.86 561.76,409.9 567.69,412.07 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="113.25,147.49,105.36,127.83,123.79,138.28,113.25,147. [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="570px" preserveAspectRatio="none" style="width:1256px;height:570px;background:#FFFFFF;" version="1.1" viewBox="0 0 1256 570" width="1256px" zoomAndPan="magnify"><defs><filter height="300%" id="f137i1gy10frg2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
+cluster org.apache.wiki.auth.acl--><polygon fill="#FFFFFF" filter="url(#f137i1gy10frg2)" points="192,206,390,206,397,228.2969,1046,228.2969,1046,547,192,547,192,206" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="192" x2="397" y1="228.2969" y2="228.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="192" x="196" y="220.9951">org.apache.wiki.auth.acl</text><!--MD5=[329450b53 [...]
+cluster org.apache.wiki.api.core--><polygon fill="#FFFFFF" filter="url(#f137i1gy10frg2)" points="176,6,376,6,383,28.2969,741,28.2969,741,182,176,182,176,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="176" x2="383" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="194" x="180" y="20.9951">org.apache.wiki.api.core</text><!--MD5=[0d852700fdad35b7061d46 [...]
+cluster java.io--><polygon fill="#FFFFFF" filter="url(#f137i1gy10frg2)" points="16,44.5,72,44.5,79,66.7969,152,66.7969,152,143.5,16,143.5,16,44.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="79" y1="66.7969" y2="66.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="20" y="59.4951">java.io</text><!--MD5=[67892945c51b45dfa1cd11fc454571f7]
+cluster java.security--><polygon fill="#FFFFFF" filter="url(#f137i1gy10frg2)" points="765,31.5,871,31.5,878,53.7969,967,53.7969,967,156.5,765,156.5,765,31.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="765" x2="878" y1="53.7969" y2="53.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="769" y="46.4951">java.security</text><!--MD5=[06e4b2620a8b168056b961578cd367b2]
+cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#f137i1gy10frg2)" points="991,38,1209,38,1216,60.2969,1239,60.2969,1239,150,991,150,991,38" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="991" x2="1216" y1="60.2969" y2="60.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="995" y="52.9951">org.apache.wiki.api.engine</text><!--MD5=[c115711a15 [...]
+class org.apache.wiki.auth.acl.Acl--><a href="Acl.html" target="_top" title="Acl.html" xlink:actuate="onRequest" xlink:href="Acl.html" xlink:show="new" xlink:title="Acl.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="105.1563" id="org.apache.wiki.auth.acl.Acl" style="stroke:#A80036;stroke-width:1.5;" width="217" x="208.5" y="241"/><ellipse cx="271.25" cy="259.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
+class org.apache.wiki.auth.acl.AclImpl--><a href="AclImpl.html" target="_top" title="AclImpl.html" xlink:actuate="onRequest" xlink:href="AclImpl.html" xlink:show="new" xlink:title="AclImpl.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="124.8281" id="org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.5;" width="238" x="208" y="406"/><ellipse cx="301.25" cy="422" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;str [...]
+class org.apache.wiki.auth.acl.DefaultAclManager--><a href="DefaultAclManager.html" target="_top" title="DefaultAclManager.html" xlink:actuate="onRequest" xlink:href="DefaultAclManager.html" xlink:show="new" xlink:title="DefaultAclManager.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="124.8281" id="org.apache.wiki.auth.acl.DefaultAclManager" style="stroke:#A80036;stroke-width:1.5;" width="215" x="814.5" y="406"/><ellipse cx="858.75" cy= [...]
+class org.apache.wiki.auth.acl.AclEntry--><a href="AclEntry.html" target="_top" title="AclEntry.html" xlink:actuate="onRequest" xlink:href="AclEntry.html" xlink:show="new" xlink:title="AclEntry.html" xlink:type="simple"><rect codeLine="28" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="53.9375" id="org.apache.wiki.auth.acl.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="115" x="460.5" y="266.5"/><ellipse cx="475.5" cy="285.4688" fill="#B4A7E5" rx="11" ry="11" style="strok [...]
+class org.apache.wiki.auth.acl.UnresolvedPrincipal--><a href="UnresolvedPrincipal.html" target="_top" title="UnresolvedPrincipal.html" xlink:actuate="onRequest" xlink:href="UnresolvedPrincipal.html" xlink:show="new" xlink:title="UnresolvedPrincipal.html" xlink:type="simple"><rect codeLine="30" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="73.6094" id="org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.5;" width="180" x="611" y="256.5"/><ellipse cx=" [...]
+class org.apache.wiki.auth.acl.AclManager--><a href="AclManager.html" target="_top" title="AclManager.html" xlink:actuate="onRequest" xlink:href="AclManager.html" xlink:show="new" xlink:title="AclManager.html" xlink:type="simple"><rect codeLine="35" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="86.4141" id="org.apache.wiki.auth.acl.AclManager" style="stroke:#A80036;stroke-width:1.5;" width="204" x="826" y="250.5"/><ellipse cx="887.25" cy="266.5" fill="#B4A7E5" rx="11" ry="11" styl [...]
+class org.apache.wiki.auth.acl.AclEntryImpl--><a href="AclEntryImpl.html" target="_top" title="AclEntryImpl.html" xlink:actuate="onRequest" xlink:href="AclEntryImpl.html" xlink:show="new" xlink:title="AclEntryImpl.html" xlink:type="simple"><rect codeLine="41" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="124.8281" id="org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.5;" width="267" x="481.5" y="406"/><ellipse cx="573.25" cy="422" fill="#ADD1B2" rx="11" r [...]
+class org.apache.wiki.api.core.Acl--><a href="../../api/core/Acl.html" target="_top" title="../../api/core/Acl.html" xlink:actuate="onRequest" xlink:href="../../api/core/Acl.html" xlink:show="new" xlink:title="../../api/core/Acl.html" xlink:type="simple"><rect codeLine="63" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="124.8281" id="org.apache.wiki.api.core.Acl" style="stroke:#A80036;stroke-width:1.5;" width="235" x="192.5" y="41"/><ellipse cx="296.75" cy="57" fill="#B4A7E5" rx="1 [...]
+class org.apache.wiki.api.core.AclEntry--><a href="../../api/core/AclEntry.html" target="_top" title="../../api/core/AclEntry.html" xlink:actuate="onRequest" xlink:href="../../api/core/AclEntry.html" xlink:show="new" xlink:title="../../api/core/AclEntry.html" xlink:type="simple"><rect codeLine="71" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="124.8281" id="org.apache.wiki.api.core.AclEntry" style="stroke:#A80036;stroke-width:1.5;" width="262" x="463" y="41"/><ellipse cx="564.25"  [...]
+class java.io.Serializable--><rect codeLine="82" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="32.5" y="79.5"/><ellipse cx="47.5" cy="95.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M43.4219,91.2656 L43.4219,89.1094 L50.8125,89.1094 L50.8125,91.2656 L48.3438,91.2656 L48.3438,99.3438 L50.8125,99.3438 L50.8125,101.5 L43.4219,101.5 L43.4219,99.3438 L45.8906,99 [...]
+class java.security.Principal--><rect codeLine="86" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="73.6094" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="170" x="781" y="66.5"/><ellipse cx="835.75" cy="82.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M831.6719,78.2656 L831.6719,76.1094 L839.0625,76.1094 L839.0625,78.2656 L836.5938,78.2656 L836.5938,86.3438 L839.0625,86.3438 L839.0625,88.5 L831.6719,88.5 L831.6719 [...]
+class org.apache.wiki.api.engine.Initializable--><a href="../../api/engine/Initializable.html" target="_top" title="../../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../../api/engine/Initializable.html" xlink:show="new" xlink:title="../../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="93" fill="#FEFECE" filter="url(#f137i1gy10frg2)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="2 [...]
+reverse link org.apache.wiki.api.core.Acl to org.apache.wiki.auth.acl.Acl--><path codeLine="50" d="M313.04,186.19 C313.73,204.75 314.45,223.97 315.08,240.87 " fill="none" id="org.apache.wiki.api.core.Acl-backto-org.apache.wiki.auth.acl.Acl" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="306.04,186.3,312.29,166.06,320.03,185.78,306.04,186.3" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e162ff8f161fffef0cb6cd4404c3efb4]
+reverse link org.apache.wiki.auth.acl.Acl to org.apache.wiki.auth.acl.AclImpl--><path codeLine="51" d="M321.16,366.44 C321.92,379.54 322.7,393.1 323.44,405.87 " fill="none" id="org.apache.wiki.auth.acl.Acl-backto-org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="314.17,366.78,320,346.41,328.14,365.97,314.17,366.78" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[12d717298da9b659ac8d160209c7eee3]
+reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclImpl--><path codeLine="52" d="M81.92,147.9 C81.57,199.56 87.97,286.32 129,346 C148.82,374.83 177.95,398.07 207.79,416.21 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.AclImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="74.92,147.6,82.41,127.78,88.92,147.95,74.92,147.6" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7b805c81259efad0edd759eb8c1ff5d7]
+reverse link org.apache.wiki.auth.acl.AclManager to org.apache.wiki.auth.acl.DefaultAclManager--><path codeLine="53" d="M925.84,356.83 C925.29,372.73 924.69,389.8 924.14,405.67 " fill="none" id="org.apache.wiki.auth.acl.AclManager-backto-org.apache.wiki.auth.acl.DefaultAclManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="918.84,356.57,926.53,336.82,932.83,357.05,918.84,356.57" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a8e3dc [...]
+reverse link org.apache.wiki.api.core.AclEntry to org.apache.wiki.auth.acl.AclEntry--><path codeLine="54" d="M561.49,184.92 C549.65,214.2 537.09,245.28 528.53,266.46 " fill="none" id="org.apache.wiki.api.core.AclEntry-backto-org.apache.wiki.auth.acl.AclEntry" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="555.13,181.98,569.11,166.06,568.11,187.22,555.13,181.98" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1e94b4ce71d058013843dd14f44bd521]
+reverse link java.security.Principal to org.apache.wiki.auth.acl.UnresolvedPrincipal--><path codeLine="55" d="M820.73,156.08 C792.81,187.89 757.68,227.91 732.72,256.36 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="815.73,151.16,834.19,140.75,826.25,160.4,815.73,151.16" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a27231dfd8b4cb461cea2f048d7b5d23]
+reverse link java.io.Serializable to org.apache.wiki.auth.acl.UnresolvedPrincipal--><path codeLine="56" d="M113.75,142.93 C129.99,160.78 151.73,180.19 176,190 C218.97,207.36 549.78,181.29 593,198 C623.91,209.95 651.85,234.99 671.57,256.29 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.UnresolvedPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="108.34,147.38,100.71,127.61,119,138.31,108.34,147.38" style="stro [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.acl.AclManager--><path codeLine="57" d="M1070.85,148.89 C1040.35,179.55 1000.03,220.08 970.01,250.27 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.acl.AclManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1066.3,143.53,1085.37,134.29,1076.23,153.41,1066.3,143.53" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[567e058e736d2cac867c7d7dbecf1c10]
+reverse link org.apache.wiki.auth.acl.AclEntry to org.apache.wiki.auth.acl.AclEntryImpl--><path codeLine="58" d="M542.67,338.49 C554.11,358.9 567.91,383.51 580.37,405.74 " fill="none" id="org.apache.wiki.auth.acl.AclEntry-backto-org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="536.41,341.64,532.73,320.77,548.62,334.8,536.41,341.64" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5e845b528a605dfd8fbeb [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclEntryImpl--><path codeLine="59" d="M106.1,145.47 C114.55,161.67 124.06,180.55 132,198 C161.31,262.46 137.02,300.17 191,346 C285.7,426.4 345.38,369.1 464,406 C469.68,407.77 475.44,409.66 481.23,411.64 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.acl.AclEntryImpl" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="99.83,148.59,96.66,127.64,112.2,142.04,99.83,1 [...]
 @startuml
     namespace org.apache.wiki.auth.acl {
 
@@ -36,23 +36,15 @@ reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclImpl--><path co
             +- -removeEntry- -(AclEntry): boolean
         }
 
-        class AclEntryImpl [[AclEntryImpl.html]] {
-            +addPermission(Permission): boolean
-            +checkPermission(Permission): boolean
-            +getPrincipal(): Principal
-            +permissions(): Enumeration<Permission>
-            +removePermission(Permission): boolean
-            +setPrincipal(Principal): boolean
-        }
-
-        interface AclManager [[AclManager.html]] {
-            {abstract} +parseAcl(Page, String): Acl
-            {abstract} +getPermissions(Page): Acl
-            {abstract} +setPermissions(Page, Acl): void
+        class AclImpl [[AclImpl.html]] {
+            +findPrincipals(Permission): Principal[]
+            +addEntry(AclEntry): boolean
+            +removeEntry(AclEntry): boolean
+            +aclEntries(): Enumeration<AclEntry>
+            +getAclEntry(Principal): AclEntry
+            +isEmpty(): boolean
         }
 
-        interface AclEntry <<deprecated>> [[AclEntry.html]]
-
         class DefaultAclManager [[DefaultAclManager.html]] {
             {static} +ACL_PATTERN: Pattern
             +initialize(Engine, Properties): void
@@ -62,30 +54,38 @@ reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclImpl--><path co
             {static} #printAcl(Acl): String
         }
 
+        interface AclEntry <<deprecated>> [[AclEntry.html]]
+
         class UnresolvedPrincipal [[UnresolvedPrincipal.html]] {
             +UnresolvedPrincipal(String)
             +getName(): String
         }
 
-        class AclImpl [[AclImpl.html]] {
-            +findPrincipals(Permission): Principal[]
-            +addEntry(AclEntry): boolean
-            +removeEntry(AclEntry): boolean
-            +aclEntries(): Enumeration<AclEntry>
-            +getAclEntry(Principal): AclEntry
-            +isEmpty(): boolean
+        interface AclManager [[AclManager.html]] {
+            {abstract} +parseAcl(Page, String): Acl
+            {abstract} +getPermissions(Page): Acl
+            {abstract} +setPermissions(Page, Acl): void
+        }
+
+        class AclEntryImpl [[AclEntryImpl.html]] {
+            +addPermission(Permission): boolean
+            +checkPermission(Permission): boolean
+            +getPrincipal(): Principal
+            +permissions(): Enumeration<Permission>
+            +removePermission(Permission): boolean
+            +setPrincipal(Principal): boolean
         }
 
         org.apache.wiki.api.core.Acl <|- - Acl
-        AclEntry <|.. AclEntryImpl
-        java.io.Serializable <|.. AclEntryImpl
-        org.apache.wiki.api.engine.Initializable <|- - AclManager
-        org.apache.wiki.api.core.AclEntry <|- - AclEntry
+        Acl <|.. AclImpl
+        java.io.Serializable <|.. AclImpl
         AclManager <|.. DefaultAclManager
+        org.apache.wiki.api.core.AclEntry <|- - AclEntry
         java.security.Principal <|.. UnresolvedPrincipal
         java.io.Serializable <|.. UnresolvedPrincipal
-        Acl <|.. AclImpl
-        java.io.Serializable <|.. AclImpl
+        org.apache.wiki.api.engine.Initializable <|- - AclManager
+        AclEntry <|.. AclEntryImpl
+        java.io.Serializable <|.. AclEntryImpl
     }
 
     namespace org.apache.wiki.api.core {
@@ -111,12 +111,6 @@ reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclImpl--><path co
         interface Serializable
     }
 
-    namespace org.apache.wiki.api.engine {
-        interface Initializable [[../../api/engine/Initializable.html]] {
-            {abstract} +initialize(Engine, Properties): void
-        }
-    }
-
     namespace java.security {
         interface Principal {
             {abstract} +getName(): String
@@ -124,6 +118,12 @@ reverse link java.io.Serializable to org.apache.wiki.auth.acl.AclImpl--><path co
         }
     }
 
+    namespace org.apache.wiki.api.engine {
+        interface Initializable [[../../api/engine/Initializable.html]] {
+            {abstract} +initialize(Engine, Properties): void
+        }
+    }
+
     center footer UMLDoclet 2.0.15, PlantUML 1.2021.13
 @enduml
 
@@ -133,5 +133,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/DefaultGroupManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/DefaultGroupManager.svg
index 5b6e93fea8..63560c0acf 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/DefaultGroupManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/DefaultGroupManager.svg
@@ -5,7 +5,7 @@ class org.apache.wiki.auth.Authorizer--><a href="../Authorizer.html" target="_to
 class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventListener.html" target="_top" title="../../event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="../../event/WikiEventListener.html" xlink:show="new" xlink:title="../../event/WikiEventListener.html" xlink:type="simple"><rect codeLine="42" fill="#FEFECE" filter="url(#f6w0upel9454x)" height="58.7422" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x=" [...]
 reverse link org.apache.wiki.auth.authorize.GroupManager to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="46" d="M269.81,181.56 C288.47,197.67 308.19,214.69 327.77,231.59 " fill="none" id="org.apache.wiki.auth.authorize.GroupManager-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="264.97,186.63,254.41,168.27,274.12,176.04,264.97,186.63" style="stroke:#A80036;st [...]
 reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="47" d="M480,156.22 C480,178.02 480,203.01 480,227.9 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="473,156,480,136,487,156,473,156" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3a1caeab0bdaeddbaac43802389c9458]
-reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="48" d="M708.6,131.44 C682.71,157.67 648.05,192.78 613.55,227.73 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="703.73,126.41,722.77,117.1,713.7,136.25,703.73,126.41" style="stroke:#A80036;stroke-width: [...]
+reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="48" d="M708.6,131.44 C682.71,157.67 648.05,192.78 613.55,227.73 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="703.73,126.41,722.77,117.1,713.7,136.25,703.73,126.41" style="stroke:#A80036;stroke-width: [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -65,5 +65,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/Group.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/Group.svg
index 393146d508..8317a0fc1e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/Group.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/Group.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="295px" preserveAspectRatio="none" style="width:212px;height:295px;background:#FFFFFF;" version="1.1" viewBox="0 0 212 295" width="212px" zoomAndPan="magnify"><defs><filter height="300%" id="f46gq6cebqj8p" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.auth.authorize.Group--><a href="Group.html" target="_top" title="Group.html" xlink:actuate="onRequest" xlink:href="Group.html" xlink:show="new" xlink:title="Group.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f46gq6cebqj8p)" height="263.6172" id="org.apache.wiki.auth.authorize.Group" style="stroke:#A80036;stroke-width:1.5;" width="191" x="7" y="7"/><ellipse cx="27.4" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke- [...]
+class org.apache.wiki.auth.authorize.Group--><a href="Group.html" target="_top" title="Group.html" xlink:actuate="onRequest" xlink:href="Group.html" xlink:show="new" xlink:title="Group.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f46gq6cebqj8p)" height="263.6172" id="org.apache.wiki.auth.authorize.Group" style="stroke:#A80036;stroke-width:1.5;" width="191" x="7" y="7"/><ellipse cx="27.4" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke- [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -34,5 +34,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/GroupDatabase.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/GroupDatabase.svg
index b59c9a0772..241e5c272b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/GroupDatabase.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/GroupDatabase.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="128px" preserveAspectRatio="none" style="width:237px;height:128px;background:#FFFFFF;" version="1.1" viewBox="0 0 237 128" width="237px" zoomAndPan="magnify"><defs><filter height="300%" id="fpp7rzuerv0vr" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.auth.authorize.GroupDatabase--><a href="GroupDatabase.html" target="_top" title="GroupDatabase.html" xlink:actuate="onRequest" xlink:href="GroupDatabase.html" xlink:show="new" xlink:title="GroupDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fpp7rzuerv0vr)" height="97.1563" id="org.apache.wiki.auth.authorize.GroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="216" x="7" y="7"/><ellipse cx="36.4" cy="25.9688" fill="#B4A7E5 [...]
+class org.apache.wiki.auth.authorize.GroupDatabase--><a href="GroupDatabase.html" target="_top" title="GroupDatabase.html" xlink:actuate="onRequest" xlink:href="GroupDatabase.html" xlink:show="new" xlink:title="GroupDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fpp7rzuerv0vr)" height="97.1563" id="org.apache.wiki.auth.authorize.GroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="216" x="7" y="7"/><ellipse cx="36.4" cy="25.9688" fill="#B4A7E5 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/GroupManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/GroupManager.svg
index 3b3241f0b3..06d247f990 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/GroupManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/GroupManager.svg
@@ -5,7 +5,7 @@ class org.apache.wiki.auth.Authorizer--><a href="../Authorizer.html" target="_to
 class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventListener.html" target="_top" title="../../event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="../../event/WikiEventListener.html" xlink:show="new" xlink:title="../../event/WikiEventListener.html" xlink:type="simple"><rect codeLine="30" fill="#FEFECE" filter="url(#fz8huyipsi1y1)" height="58.7422" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x=" [...]
 reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="34" d="M166.59,97.71 C190.41,116.74 219.94,140.33 249.52,163.97 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="161.96,102.98,150.71,85.03,170.7,92.04,161.96,102.98" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[cd745c40bc785213344f14 [...]
 reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="35" d="M386,124.31 C386,136.94 386,150.43 386,163.93 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="379,124.01,386,104.01,393,124.01,379,124.01" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[925bda55d4bdc1b1d1fafa3019e64129]
-reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="36" d="M605.41,97.71 C581.59,116.74 552.06,140.33 522.48,163.97 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="601.3,92.04,621.29,85.03,610.04,102.98,601.3,92.04" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="s [...]
+reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="36" d="M605.41,97.71 C581.59,116.74 552.06,140.33 522.48,163.97 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="601.3,92.04,621.29,85.03,610.04,102.98,601.3,92.04" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="s [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -53,5 +53,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/JDBCGroupDatabase.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/JDBCGroupDatabase.svg
index c61cd3f3bc..a0a0574f3f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/JDBCGroupDatabase.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/JDBCGroupDatabase.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="543px" preserveAspectRatio="none" style="width:296px;height:543px;background:#FFFFFF;" version="1.1" viewBox="0 0 296 543" width="296px" zoomAndPan="magnify"><defs><filter height="300%" id="fa4bv2m1jadz9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.authorize.JDBCGroupDatabase--><a href="JDBCGroupDatabase.html" target="_top" title="JDBCGroupDatabase.html" xlink:actuate="onRequest" xlink:href="JDBCGroupDatabase.html" xlink:show="new" xlink:title="JDBCGroupDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fa4bv2m1jadz9)" height="348.4453" id="org.apache.wiki.auth.authorize.JDBCGroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="273" x="9" y="164"/><ellipse cx="67.75 [...]
 class org.apache.wiki.auth.authorize.GroupDatabase--><a href="GroupDatabase.html" target="_top" title="GroupDatabase.html" xlink:actuate="onRequest" xlink:href="GroupDatabase.html" xlink:show="new" xlink:title="GroupDatabase.html" xlink:type="simple"><rect codeLine="31" fill="#FEFECE" filter="url(#fa4bv2m1jadz9)" height="97.1563" id="org.apache.wiki.auth.authorize.GroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="216" x="37.5" y="7"/><ellipse cx="66.9" cy="25.9688" fill="#B4 [...]
-reverse link org.apache.wiki.auth.authorize.GroupDatabase to org.apache.wiki.auth.authorize.JDBCGroupDatabase--><path codeLine="38" d="M145.5,124.37 C145.5,136.68 145.5,150.02 145.5,163.81 " fill="none" id="org.apache.wiki.auth.authorize.GroupDatabase-backto-org.apache.wiki.auth.authorize.JDBCGroupDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="138.5,124.08,145.5,104.08,152.5,124.08,138.5,124.08" style="stroke:#A80036;stroke-width [...]
+reverse link org.apache.wiki.auth.authorize.GroupDatabase to org.apache.wiki.auth.authorize.JDBCGroupDatabase--><path codeLine="38" d="M145.5,124.37 C145.5,136.68 145.5,150.02 145.5,163.81 " fill="none" id="org.apache.wiki.auth.authorize.GroupDatabase-backto-org.apache.wiki.auth.authorize.JDBCGroupDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="138.5,124.08,145.5,104.08,152.5,124.08,138.5,124.08" style="stroke:#A80036;stroke-width [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -51,5 +51,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/Role.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/Role.svg
index 1843946d69..01c8798a21 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/Role.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/Role.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.authorize.Role--><a href="Role.html" target="_top" ti
 class java.security.Principal--><rect codeLine="16" fill="#FEFECE" filter="url(#f1oo2hgkmsuyqn)" height="58.7422" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="126" x="7" y="7"/><ellipse cx="35.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M31.4219,21.7344 L31.4219,19.5781 L38.8125,19.5781 L38.8125,21.7344 L36.3438,21.7344 L36.3438,29.8125 L38.8125,29.8125 L38.8125,31.9688 L31.4219,31.9688 L31.4219,29.8125 [...]
 class java.io.Serializable--><rect codeLine="19" fill="#FEFECE" filter="url(#f1oo2hgkmsuyqn)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="168" y="17.5"/><ellipse cx="183" cy="36.4688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M178.9219,32.2344 L178.9219,30.0781 L186.3125,30.0781 L186.3125,32.2344 L183.8438,32.2344 L183.8438,40.3125 L186.3125,40.3125 L186.3125,42.4688 L178.9219,42.4688 L178.9219 [...]
 reverse link java.security.Principal to org.apache.wiki.auth.authorize.Role--><path codeLine="21" d="M91.61,84.55 C97.52,97.42 104.08,111.72 110.55,125.8 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="85.22,87.42,83.24,66.33,97.95,81.58,85.22,87.42" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[8de48516d660c290f3f98bb65755c4ac]
-reverse link java.io.Serializable to org.apache.wiki.auth.authorize.Role--><path codeLine="22" d="M205.31,73.84 C198.29,89.14 189.82,107.57 181.52,125.66 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="199.01,70.78,213.72,55.53,211.74,76.62,199.01,70.78" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" len [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.authorize.Role--><path codeLine="22" d="M205.31,73.84 C198.29,89.14 189.82,107.57 181.52,125.66 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="199.01,70.78,213.72,55.53,211.74,76.62,199.01,70.78" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" len [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -37,5 +37,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebAuthorizer.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebAuthorizer.svg
index 35512fdd5e..8b659fae88 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebAuthorizer.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebAuthorizer.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="253px" preserveAspectRatio="none" style="width:343px;height:253px;background:#FFFFFF;" version="1.1" viewBox="0 0 343 253" width="343px" zoomAndPan="magnify"><defs><filter height="300%" id="f10i9w8nu3foaz" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.authorize.WebAuthorizer--><a href="WebAuthorizer.html" target="_top" title="WebAuthorizer.html" xlink:actuate="onRequest" xlink:href="WebAuthorizer.html" xlink:show="new" xlink:title="WebAuthorizer.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f10i9w8nu3foaz)" height="58.7422" id="org.apache.wiki.auth.authorize.WebAuthorizer" style="stroke:#A80036;stroke-width:1.5;" width="322" x="7" y="164"/><ellipse cx="87.75" cy="182.9688" fill="#B [...]
 class org.apache.wiki.auth.Authorizer--><a href="../Authorizer.html" target="_top" title="../Authorizer.html" xlink:actuate="onRequest" xlink:href="../Authorizer.html" xlink:show="new" xlink:title="../Authorizer.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f10i9w8nu3foaz)" height="97.1563" id="org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.5;" width="256" x="40" y="7"/><ellipse cx="112.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" styl [...]
-reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.WebAuthorizer--><path codeLine="16" d="M168,124.23 C168,138.19 168,152.16 168,163.79 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.WebAuthorizer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="161,124.07,168,104.07,175,124.07,161,124.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" length [...]
+reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.WebAuthorizer--><path codeLine="16" d="M168,124.23 C168,138.19 168,152.16 168,163.79 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.WebAuthorizer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="161,124.07,168,104.07,175,124.07,161,124.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" length [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -29,5 +29,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebContainerAuthorizer.LocalEntityResolver.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebContainerAuthorizer.LocalEntityResolver.svg
index 82fdc8c3e6..a452b58aa3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebContainerAuthorizer.LocalEntityResolver.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebContainerAuthorizer.LocalEntityResolver.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver-
 class org.xml.sax.EntityResolver--><rect codeLine="9" fill="#FEFECE" filter="url(#f1sqt30o2o5alx)" height="58.7422" id="org.xml.sax.EntityResolver" style="stroke:#A80036;stroke-width:1.5;" width="257" x="7" y="7"/><ellipse cx="81.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M77.6719,21.7344 L77.6719,19.5781 L85.0625,19.5781 L85.0625,21.7344 L82.5938,21.7344 L82.5938,29.8125 L85.0625,29.8125 L85.0625,31.9688 L77.6719,31.9688 L77.6719,2 [...]
 class org.apache.wiki.auth.authorize.WebContainerAuthorizer--><a href="WebContainerAuthorizer.html" target="_top" title="WebContainerAuthorizer.html" xlink:actuate="onRequest" xlink:href="WebContainerAuthorizer.html" xlink:show="new" xlink:title="WebContainerAuthorizer.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f1sqt30o2o5alx)" height="37.9375" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer" style="stroke:#A80036;stroke-width:1.5;" width="201" x= [...]
 reverse link org.xml.sax.EntityResolver to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="14" d="M182.99,79.6 C200.28,94.92 219.41,111.87 235.09,125.77 " fill="none" id="org.xml.sax.EntityResolver-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="178.11,84.63,167.79,66.12,187.4,74.15,178.11,84.63" style="stroke:#A8003 [...]
-reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="15" d="M367.83,65.57 C347.22,83.84 320.4,107.61 299.68,125.98 " fill="none" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="373.174" cy="60.8273" fill="#FFFFFF" rx="8" ry="8" style="s [...]
+reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="15" d="M367.83,65.57 C347.22,83.84 320.4,107.61 299.68,125.98 " fill="none" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="373.174" cy="60.8273" fill="#FFFFFF" rx="8" ry="8" style="s [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -30,5 +30,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebContainerAuthorizer.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebContainerAuthorizer.svg
index 1b2bd99af8..2ee99678d3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebContainerAuthorizer.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/WebContainerAuthorizer.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.authorize.WebContainerAuthorizer--><a href="WebContai
 class org.apache.wiki.auth.authorize.WebAuthorizer--><a href="WebAuthorizer.html" target="_top" title="WebAuthorizer.html" xlink:actuate="onRequest" xlink:href="WebAuthorizer.html" xlink:show="new" xlink:title="WebAuthorizer.html" xlink:type="simple"><rect codeLine="20" fill="#FEFECE" filter="url(#f124n43jtfoh10)" height="58.7422" id="org.apache.wiki.auth.authorize.WebAuthorizer" style="stroke:#A80036;stroke-width:1.5;" width="322" x="15" y="7"/><ellipse cx="95.75" cy="25.9688" fill="#B4 [...]
 class org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><a href="WebContainerAuthorizer.LocalEntityResolver.html" target="_top" title="WebContainerAuthorizer.LocalEntityResolver.html" xlink:actuate="onRequest" xlink:href="WebContainerAuthorizer.LocalEntityResolver.html" xlink:show="new" xlink:title="WebContainerAuthorizer.LocalEntityResolver.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#f124n43jtfoh10)" height="37.9375" id="org.apache [...]
 reverse link org.apache.wiki.auth.authorize.WebAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer--><path codeLine="25" d="M176,86.43 C176,98.63 176,112.17 176,125.91 " fill="none" id="org.apache.wiki.auth.authorize.WebAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="169,86.17,176,66.17,183,86.17,169,86.17" style="stroke:#A80036;stroke-width:1.0;"/><!-- [...]
-reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="26" d="M176,349.33 C176,366.61 176,382.38 176,393.78 " fill="none" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="176" cy="342.19" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036; [...]
+reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="26" d="M176,349.33 C176,366.61 176,382.38 176,393.78 " fill="none" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="176" cy="342.19" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036; [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -41,5 +41,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/XMLGroupDatabase.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/XMLGroupDatabase.svg
index dbb1c80fe6..e260d2af56 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/XMLGroupDatabase.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/XMLGroupDatabase.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="312px" preserveAspectRatio="none" style="width:237px;height:312px;background:#FFFFFF;" version="1.1" viewBox="0 0 237 312" width="237px" zoomAndPan="magnify"><defs><filter height="300%" id="f1soj40khys17v" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.authorize.XMLGroupDatabase--><a href="XMLGroupDatabase.html" target="_top" title="XMLGroupDatabase.html" xlink:actuate="onRequest" xlink:href="XMLGroupDatabase.html" xlink:show="new" xlink:title="XMLGroupDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1soj40khys17v)" height="117.9609" id="org.apache.wiki.auth.authorize.XMLGroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="215" x="7.5" y="164"/><ellipse cx="38.7" cy [...]
 class org.apache.wiki.auth.authorize.GroupDatabase--><a href="GroupDatabase.html" target="_top" title="GroupDatabase.html" xlink:actuate="onRequest" xlink:href="GroupDatabase.html" xlink:show="new" xlink:title="GroupDatabase.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#f1soj40khys17v)" height="97.1563" id="org.apache.wiki.auth.authorize.GroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="216" x="7" y="7"/><ellipse cx="36.4" cy="25.9688" fill="#B4A7 [...]
-reverse link org.apache.wiki.auth.authorize.GroupDatabase to org.apache.wiki.auth.authorize.XMLGroupDatabase--><path codeLine="20" d="M115,124.39 C115,137.53 115,151.18 115,163.97 " fill="none" id="org.apache.wiki.auth.authorize.GroupDatabase-backto-org.apache.wiki.auth.authorize.XMLGroupDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="108,124.37,115,104.37,122,124.37,108,124.37" style="stroke:#A80036;stroke-width:1.0;"/><text fill [...]
+reverse link org.apache.wiki.auth.authorize.GroupDatabase to org.apache.wiki.auth.authorize.XMLGroupDatabase--><path codeLine="20" d="M115,124.39 C115,137.53 115,151.18 115,163.97 " fill="none" id="org.apache.wiki.auth.authorize.GroupDatabase-backto-org.apache.wiki.auth.authorize.XMLGroupDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="108,124.37,115,104.37,122,124.37,108,124.37" style="stroke:#A80036;stroke-width:1.0;"/><text fill [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/package.svg
index 7f37417112..a6712d4360 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/authorize/package.svg
@@ -1,52 +1,76 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1423px" preserveAspectRatio="none" style="width:1873px;height:1423px;background:#FFFFFF;" version="1.1" viewBox="0 0 1873 1423" width="1873px" zoomAndPan="magnify"><defs><filter height="300%" id="f1na5iodt2snly" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdD [...]
-cluster org.apache.wiki.auth.authorize--><polygon fill="#FFFFFF" filter="url(#f1na5iodt2snly)" points="177,189,428,189,435,211.2969,1156,211.2969,1156,1400,177,1400,177,189" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="177" x2="435" y1="211.2969" y2="211.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="245" x="181" y="203.9951">org.apache.wiki.auth.authorize</text><!-- [...]
-cluster org.apache.wiki.auth--><polygon fill="#FFFFFF" filter="url(#f1na5iodt2snly)" points="782,6,953,6,960,28.2969,1070,28.2969,1070,156,782,156,782,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="782" x2="960" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="165" x="786" y="20.9951">org.apache.wiki.auth</text><!--MD5=[73faa91e05492c377d111539776da6fd]
-cluster org.apache.wiki.event--><polygon fill="#FFFFFF" filter="url(#f1na5iodt2snly)" points="16,25,197,25,204,47.2969,264,47.2969,264,137,16,137,16,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="204" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="175" x="20" y="39.9951">org.apache.wiki.event</text><!--MD5=[06e4b2620a8b168056b961578cd367b2]
-cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#f1na5iodt2snly)" points="288,25,506,25,513,47.2969,536,47.2969,536,137,288,137,288,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="288" x2="513" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="292" y="39.9951">org.apache.wiki.api.engine</text><!--MD5=[67892945c51b45d [...]
-cluster java.security--><polygon fill="#FFFFFF" filter="url(#f1na5iodt2snly)" points="1180,605.5,1286,605.5,1293,627.7969,1382,627.7969,1382,730.5,1180,730.5,1180,605.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1180" x2="1293" y1="627.7969" y2="627.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="1184" y="620.4951">java.security</text><!--MD5=[0d852700fdad3 [...]
-cluster java.io--><polygon fill="#FFFFFF" filter="url(#f1na5iodt2snly)" points="1406,618.5,1462,618.5,1469,640.7969,1542,640.7969,1542,717.5,1406,717.5,1406,618.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1406" x2="1469" y1="640.7969" y2="640.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="1410" y="633.4951">java.io</text><!--MD5=[230b62fc53fb9022a524bc4955e1db02]
-cluster org.xml.sax--><polygon fill="#FFFFFF" filter="url(#f1na5iodt2snly)" points="1566,612,1663,612,1670,634.2969,1856,634.2969,1856,724,1566,724,1566,612" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1566" x2="1670" y1="634.2969" y2="634.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="91" x="1570" y="626.9951">org.xml.sax</text><!--MD5=[eb52c5f5726315e2b7891c0ae06a04f0]
-class org.apache.wiki.auth.authorize.GroupDatabase--><a href="GroupDatabase.html" target="_top" title="GroupDatabase.html" xlink:actuate="onRequest" xlink:href="GroupDatabase.html" xlink:show="new" xlink:title="GroupDatabase.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="99.2188" id="org.apache.wiki.auth.authorize.GroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="216" x="193" y="881"/><ellipse cx="247.75" cy="897" fill="#B4A [...]
-class org.apache.wiki.auth.authorize.JDBCGroupDatabase--><a href="JDBCGroupDatabase.html" target="_top" title="JDBCGroupDatabase.html" xlink:actuate="onRequest" xlink:href="JDBCGroupDatabase.html" xlink:show="new" xlink:title="JDBCGroupDatabase.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="342.5078" id="org.apache.wiki.auth.authorize.JDBCGroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="273" x="193.5" y="1041"/><ellipse cx [...]
-class org.apache.wiki.auth.authorize.DefaultGroupManager--><a href="DefaultGroupManager.html" target="_top" title="DefaultGroupManager.html" xlink:actuate="onRequest" xlink:href="DefaultGroupManager.html" xlink:show="new" xlink:title="DefaultGroupManager.html" xlink:type="simple"><rect codeLine="36" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="252.875" id="org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.5;" width="304" x="194" y="551"/><el [...]
-class org.apache.wiki.auth.authorize.GroupManager--><a href="GroupManager.html" target="_top" title="GroupManager.html" xlink:actuate="onRequest" xlink:href="GroupManager.html" xlink:show="new" xlink:title="GroupManager.html" xlink:type="simple"><rect codeLine="55" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="214.4609" id="org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.5;" width="310" x="193" y="250"/><ellipse cx="297.25" cy="266" fill="#B4A7E5" [...]
-class org.apache.wiki.auth.authorize.Group--><a href="Group.html" target="_top" title="Group.html" xlink:actuate="onRequest" xlink:href="Group.html" xlink:show="new" xlink:title="Group.html" xlink:type="simple"><rect codeLine="71" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="265.6797" id="org.apache.wiki.auth.authorize.Group" style="stroke:#A80036;stroke-width:1.5;" width="191" x="538.5" y="224"/><ellipse cx="610.75" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;s [...]
-class org.apache.wiki.auth.authorize.WebAuthorizer--><a href="WebAuthorizer.html" target="_top" title="WebAuthorizer.html" xlink:actuate="onRequest" xlink:href="WebAuthorizer.html" xlink:show="new" xlink:title="WebAuthorizer.html" xlink:type="simple"><rect codeLine="91" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="60.8047" id="org.apache.wiki.auth.authorize.WebAuthorizer" style="stroke:#A80036;stroke-width:1.5;" width="322" x="765" y="326.5"/><ellipse cx="875.75" cy="342.5" fill= [...]
-class org.apache.wiki.auth.authorize.Role--><a href="Role.html" target="_top" title="Role.html" xlink:actuate="onRequest" xlink:href="Role.html" xlink:show="new" xlink:title="Role.html" xlink:type="simple"><rect codeLine="95" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="99.2188" id="org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.5;" width="217" x="444.5" y="881"/><ellipse cx="535.25" cy="897" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-w [...]
-class org.apache.wiki.auth.authorize.XMLGroupDatabase--><a href="XMLGroupDatabase.html" target="_top" title="XMLGroupDatabase.html" xlink:actuate="onRequest" xlink:href="XMLGroupDatabase.html" xlink:show="new" xlink:title="XMLGroupDatabase.html" xlink:type="simple"><rect codeLine="102" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="112.0234" id="org.apache.wiki.auth.authorize.XMLGroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="215" x="501.5" y="1156.5"/><ellipse cx="5 [...]
-class org.apache.wiki.auth.authorize.WebContainerAuthorizer--><a href="WebContainerAuthorizer.html" target="_top" title="WebContainerAuthorizer.html" xlink:actuate="onRequest" xlink:href="WebContainerAuthorizer.html" xlink:show="new" xlink:title="WebContainerAuthorizer.html" xlink:type="simple"><rect codeLine="110" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="188.8516" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer" style="stroke:#A80036;stroke-width:1.5;" width="323"  [...]
-class org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><a href="WebContainerAuthorizer.LocalEntityResolver.html" target="_top" title="WebContainerAuthorizer.LocalEntityResolver.html" xlink:actuate="onRequest" xlink:href="WebContainerAuthorizer.LocalEntityResolver.html" xlink:show="new" xlink:title="WebContainerAuthorizer.LocalEntityResolver.html" xlink:type="simple"><rect codeLine="124" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="60.8047" id="org.apach [...]
-class org.apache.wiki.auth.Authorizer--><a href="../Authorizer.html" target="_top" title="../Authorizer.html" xlink:actuate="onRequest" xlink:href="../Authorizer.html" xlink:show="new" xlink:title="../Authorizer.html" xlink:type="simple"><rect codeLine="148" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="99.2188" id="org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.5;" width="256" x="798" y="41"/><ellipse cx="889.75" cy="57" fill="#B4A7E5" rx="11" ry="11" style [...]
-class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventListener.html" target="_top" title="../../event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="../../event/WikiEventListener.html" xlink:show="new" xlink:title="../../event/WikiEventListener.html" xlink:type="simple"><rect codeLine="157" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="60.8047" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x [...]
-class org.apache.wiki.api.engine.Initializable--><a href="../../api/engine/Initializable.html" target="_top" title="../../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../../api/engine/Initializable.html" xlink:show="new" xlink:title="../../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="163" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width=" [...]
-class java.security.Principal--><rect codeLine="169" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="73.6094" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="170" x="1196" y="640.5"/><ellipse cx="1250.75" cy="656.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1246.6719,652.2656 L1246.6719,650.1094 L1254.0625,650.1094 L1254.0625,652.2656 L1251.5938,652.2656 L1251.5938,660.3438 L1254.0625,660.3438 L1254.0625,662.5 L12 [...]
-class java.io.Serializable--><rect codeLine="176" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="1422.5" y="653.5"/><ellipse cx="1437.5" cy="669.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1433.4219,665.2656 L1433.4219,663.1094 L1440.8125,663.1094 L1440.8125,665.2656 L1438.3438,665.2656 L1438.3438,673.3438 L1440.8125,673.3438 L1440.8125,675.5 L1433.4219,67 [...]
-class org.xml.sax.EntityResolver--><rect codeLine="180" fill="#FEFECE" filter="url(#f1na5iodt2snly)" height="60.8047" id="org.xml.sax.EntityResolver" style="stroke:#A80036;stroke-width:1.5;" width="257" x="1582.5" y="647"/><ellipse cx="1662.75" cy="663" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1658.6719,658.7656 L1658.6719,656.6094 L1666.0625,656.6094 L1666.0625,658.7656 L1663.5938,658.7656 L1663.5938,666.8438 L1666.0625,666.8438 L1666.0625,669 L [...]
-reverse link org.apache.wiki.auth.authorize.GroupDatabase to org.apache.wiki.auth.authorize.JDBCGroupDatabase--><path codeLine="128" d="M308.14,1000.4 C309.44,1013.01 310.86,1026.66 312.32,1040.76 " fill="none" id="org.apache.wiki.auth.authorize.GroupDatabase-backto-org.apache.wiki.auth.authorize.JDBCGroupDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="301.15,1000.89,306.05,980.27,315.07,999.44,301.15,1000.89" style="stroke:#A8003 [...]
-reverse link org.apache.wiki.auth.authorize.GroupManager to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="129" d="M347.21,484.27 C347.07,506.15 346.93,528.89 346.79,550.75 " fill="none" id="org.apache.wiki.auth.authorize.GroupManager-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="340.21,484.01,347.33,464.06,354.21,484.1,340.21,484.01" style="stroke:#A80036;st [...]
-reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="130" d="M1071.13,144.65 C1084.47,154.81 1096.23,166.82 1105,181 C1177.2,297.82 1193.58,385.05 1105,490 C1052.95,551.67 825.46,532.13 747,551 C663.84,571 572.74,599.01 498.41,623.49 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="non [...]
-reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="131" d="M134.48,141.18 C127.93,219.14 123.63,373.35 175,490 C184.38,511.31 197.21,531.79 211.65,550.87 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="127.52,140.35,136.36,121.09,141.46,141.65,127.52,14 [...]
-link org.apache.wiki.auth.authorize.DefaultGroupManager to org.apache.wiki.auth.authorize.GroupDatabase--><path codeLine="132" d="M323.5,804 C318.96,829.3 314.43,854.6 310.63,875.79 " fill="none" id="org.apache.wiki.auth.authorize.DefaultGroupManager-to-org.apache.wiki.auth.authorize.GroupDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="309.73,880.81,315.24,872.6467,310.603,875.8868,307.3629,871.2498,309.73,880.81" style="stroke:#A80036;stroke-width:1.0 [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="133" d="M400.13,140.55 C392.7,171.25 382.84,212.02 373.69,249.82 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="393.34,138.86,404.84,121.07,406.94,142.16,393.34,138.86" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[cd745c40bc78521334 [...]
-reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="134" d="M777.68,103.74 C697.71,115.26 599.61,137.62 521,181 C489.21,198.55 459.45,223.73 433.89,249.55 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="776.84,96.79,797.6,101.04,778.72,110.67,776.84,96.79" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[9 [...]
-reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="135" d="M175.83,137.06 C200.25,168.11 233.63,210.56 264.5,249.82 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="170.12,141.12,163.25,121.07,181.12,132.47,170.12,141.12" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c9f956e0e52a3dbbb964 [...]
-reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.WebAuthorizer--><path codeLine="136" d="M926,160.36 C926,214.18 926,286.34 926,326.27 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.WebAuthorizer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="919,160.01,926,140.01,933,160.01,919,160.01" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ae73d3ae6e092238caceb29e878485ca]
-reverse link java.security.Principal to org.apache.wiki.auth.authorize.Role--><path codeLine="137" d="M1241.99,730.09 C1219.61,756.13 1189.37,785.93 1156,804 C1134.27,815.77 829.45,875.99 661.74,908.55 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1236.72,725.47,1254.86,714.51,1247.52,734.39,1236.72,725.47" style="stroke:#A80036;stroke-width:1.0;"/><!--M [...]
-reverse link java.io.Serializable to org.apache.wiki.auth.authorize.Role--><path codeLine="138" d="M1454.79,719.95 C1439.31,748.45 1414.73,784.53 1382,804 C1163.82,933.81 1066.68,840.86 816,881 C765.11,889.15 708.91,899.35 661.57,908.29 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1448.75,716.4,1464.04,701.73,1461.23,722.74,1448.75,716.4" style="stroke:#A8 [...]
-link org.apache.wiki.auth.authorize.Role to org.apache.wiki.auth.authorize.Role--><path codeLine="139" d="M661.57,916.24 C682.05,917.97 696.5,922.73 696.5,930.5 C696.5,937.61 684.43,942.19 666.71,944.24 " fill="none" id="org.apache.wiki.auth.authorize.Role-to-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="661.57,944.76,670.9251,947.8393,666.5449,944.2597,670.1245,939.8794,661.57,944.76" style="stroke:#A80036;stroke-width:1.0 [...]
-reverse link org.apache.wiki.auth.authorize.GroupDatabase to org.apache.wiki.auth.authorize.XMLGroupDatabase--><path codeLine="140" d="M415.84,990.61 C439.63,1005.42 463.62,1022.44 484,1041 C520.91,1074.61 553.88,1120.63 576.68,1156.39 " fill="none" id="org.apache.wiki.auth.authorize.GroupDatabase-backto-org.apache.wiki.auth.authorize.XMLGroupDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="412.12,996.54,398.6,980.22,419.35,984.55, [...]
-reverse link org.apache.wiki.auth.authorize.WebAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer--><path codeLine="141" d="M926,407.89 C926,454.59 926,525.56 926,582.83 " fill="none" id="org.apache.wiki.auth.authorize.WebAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="919,407.68,926,387.68,933,407.68,919,407.68" style="stroke:#A80036;stroke-width:1.0; [...]
-link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache.wiki.auth.authorize.Role--><path codeLine="142" d="M786.84,772.14 C733.6,807.97 674.83,847.52 629.54,878 " fill="none" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer-to-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="625.2,880.92,634.9033,879.2328,629.3537,878.1366,630.4499,872.587,625.2,880.92" style="stroke:#A80036;stroke-width:1.0;"/><text  [...]
-reverse link org.xml.sax.EntityResolver to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="143" d="M1663.57,721.27 C1631.31,748.37 1586.54,782.29 1542,804 C1414.57,866.11 1255.61,898.02 1140.51,914.07 " fill="none" id="org.xml.sax.EntityResolver-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1659.05,715.92,1678.79,7 [...]
-reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="144" d="M952.38,787.03 C962.37,828.16 972.97,871.76 979.77,899.73 " fill="none" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="950.69" cy="780.0935" fill="#FFFFFF" rx="8" ry="8" styl [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1423px" preserveAspectRatio="none" style="width:1772px;height:1423px;background:#FFFFFF;" version="1.1" viewBox="0 0 1772 1423" width="1772px" zoomAndPan="magnify"><defs><filter height="300%" id="f1dvl5p4ju0q1m" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdD [...]
+cluster org.apache.wiki.auth.authorize--><polygon fill="#FFFFFF" filter="url(#f1dvl5p4ju0q1m)" points="76.32,189,327.32,189,334.32,211.2969,1055.32,211.2969,1055.32,1400,76.32,1400,76.32,189" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="76.32" x2="334.32" y1="211.2969" y2="211.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="245" x="80.32" y="203.9951">org.apache.wiki. [...]
+cluster org.apache.wiki.auth--><polygon fill="#FFFFFF" filter="url(#f1dvl5p4ju0q1m)" points="83.32,6,254.32,6,261.32,28.2969,371.32,28.2969,371.32,156,83.32,156,83.32,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="83.32" x2="261.32" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="165" x="87.32" y="20.9951">org.apache.wiki.auth</text><!--MD5=[67892 [...]
+cluster java.security--><polygon fill="#FFFFFF" filter="url(#f1dvl5p4ju0q1m)" points="1079.32,605.5,1185.32,605.5,1192.32,627.7969,1281.32,627.7969,1281.32,730.5,1079.32,730.5,1079.32,605.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1079.32" x2="1192.32" y1="627.7969" y2="627.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="1083.32" y="620.4951">java.securit [...]
+cluster java.io--><polygon fill="#FFFFFF" filter="url(#f1dvl5p4ju0q1m)" points="1305.32,618.5,1361.32,618.5,1368.32,640.7969,1441.32,640.7969,1441.32,717.5,1305.32,717.5,1305.32,618.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1305.32" x2="1368.32" y1="640.7969" y2="640.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="1309.32" y="633.4951">java.io</text><!--M [...]
+cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#f1dvl5p4ju0q1m)" points="395.32,25,613.32,25,620.32,47.2969,643.32,47.2969,643.32,137,395.32,137,395.32,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="395.32" x2="620.32" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="399.32" y="39.9951">org.apache.wiki.api.engine< [...]
+cluster org.apache.wiki.event--><polygon fill="#FFFFFF" filter="url(#f1dvl5p4ju0q1m)" points="795.32,25,976.32,25,983.32,47.2969,1043.32,47.2969,1043.32,137,795.32,137,795.32,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="795.32" x2="983.32" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="175" x="799.32" y="39.9951">org.apache.wiki.event</text><! [...]
+cluster org.xml.sax--><polygon fill="#FFFFFF" filter="url(#f1dvl5p4ju0q1m)" points="1465.32,612,1562.32,612,1569.32,634.2969,1755.32,634.2969,1755.32,724,1465.32,724,1465.32,612" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1465.32" x2="1569.32" y1="634.2969" y2="634.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="91" x="1469.32" y="626.9951">org.xml.sax</text><!--MD5 [...]
+class org.apache.wiki.auth.authorize.Group--><a href="Group.html" target="_top" title="Group.html" xlink:actuate="onRequest" xlink:href="Group.html" xlink:show="new" xlink:title="Group.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="265.6797" id="org.apache.wiki.auth.authorize.Group" style="stroke:#A80036;stroke-width:1.5;" width="191" x="794.82" y="224"/><ellipse cx="867.07" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;s [...]
+class org.apache.wiki.auth.authorize.WebAuthorizer--><a href="WebAuthorizer.html" target="_top" title="WebAuthorizer.html" xlink:actuate="onRequest" xlink:href="WebAuthorizer.html" xlink:show="new" xlink:title="WebAuthorizer.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="60.8047" id="org.apache.wiki.auth.authorize.WebAuthorizer" style="stroke:#A80036;stroke-width:1.5;" width="322" x="437.32" y="326.5"/><ellipse cx="548.07" cy="342.5" fi [...]
+class org.apache.wiki.auth.authorize.Role--><a href="Role.html" target="_top" title="Role.html" xlink:actuate="onRequest" xlink:href="Role.html" xlink:show="new" xlink:title="Role.html" xlink:type="simple"><rect codeLine="27" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="99.2188" id="org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.5;" width="217" x="343.82" y="881"/><ellipse cx="434.57" cy="897" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke- [...]
+class org.apache.wiki.auth.authorize.JDBCGroupDatabase--><a href="JDBCGroupDatabase.html" target="_top" title="JDBCGroupDatabase.html" xlink:actuate="onRequest" xlink:href="JDBCGroupDatabase.html" xlink:show="new" xlink:title="JDBCGroupDatabase.html" xlink:type="simple"><rect codeLine="34" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="342.5078" id="org.apache.wiki.auth.authorize.JDBCGroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="273" x="92.82" y="1041"/><ellipse cx [...]
+class org.apache.wiki.auth.authorize.GroupManager--><a href="GroupManager.html" target="_top" title="GroupManager.html" xlink:actuate="onRequest" xlink:href="GroupManager.html" xlink:show="new" xlink:title="GroupManager.html" xlink:type="simple"><rect codeLine="60" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="214.4609" id="org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.5;" width="310" x="92.32" y="250"/><ellipse cx="196.57" cy="266" fill="#B4A7E [...]
+class org.apache.wiki.auth.authorize.DefaultGroupManager--><a href="DefaultGroupManager.html" target="_top" title="DefaultGroupManager.html" xlink:actuate="onRequest" xlink:href="DefaultGroupManager.html" xlink:show="new" xlink:title="DefaultGroupManager.html" xlink:type="simple"><rect codeLine="76" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="252.875" id="org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.5;" width="304" x="93.32" y="551"/>< [...]
+class org.apache.wiki.auth.authorize.WebContainerAuthorizer--><a href="WebContainerAuthorizer.html" target="_top" title="WebContainerAuthorizer.html" xlink:actuate="onRequest" xlink:href="WebContainerAuthorizer.html" xlink:show="new" xlink:title="WebContainerAuthorizer.html" xlink:type="simple"><rect codeLine="95" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="188.8516" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer" style="stroke:#A80036;stroke-width:1.5;" width="323" x [...]
+class org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><a href="WebContainerAuthorizer.LocalEntityResolver.html" target="_top" title="WebContainerAuthorizer.LocalEntityResolver.html" xlink:actuate="onRequest" xlink:href="WebContainerAuthorizer.LocalEntityResolver.html" xlink:show="new" xlink:title="WebContainerAuthorizer.LocalEntityResolver.html" xlink:type="simple"><rect codeLine="109" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="60.8047" id="org.apach [...]
+class org.apache.wiki.auth.authorize.XMLGroupDatabase--><a href="XMLGroupDatabase.html" target="_top" title="XMLGroupDatabase.html" xlink:actuate="onRequest" xlink:href="XMLGroupDatabase.html" xlink:show="new" xlink:title="XMLGroupDatabase.html" xlink:type="simple"><rect codeLine="113" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="112.0234" id="org.apache.wiki.auth.authorize.XMLGroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="215" x="400.82" y="1156.5"/><ellipse cx=" [...]
+class org.apache.wiki.auth.authorize.GroupDatabase--><a href="GroupDatabase.html" target="_top" title="GroupDatabase.html" xlink:actuate="onRequest" xlink:href="GroupDatabase.html" xlink:show="new" xlink:title="GroupDatabase.html" xlink:type="simple"><rect codeLine="121" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="99.2188" id="org.apache.wiki.auth.authorize.GroupDatabase" style="stroke:#A80036;stroke-width:1.5;" width="216" x="92.32" y="881"/><ellipse cx="147.07" cy="897" fill=" [...]
+class org.apache.wiki.auth.Authorizer--><a href="../Authorizer.html" target="_top" title="../Authorizer.html" xlink:actuate="onRequest" xlink:href="../Authorizer.html" xlink:show="new" xlink:title="../Authorizer.html" xlink:type="simple"><rect codeLine="148" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="99.2188" id="org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.5;" width="256" x="99.32" y="41"/><ellipse cx="191.07" cy="57" fill="#B4A7E5" rx="11" ry="11" sty [...]
+class java.security.Principal--><rect codeLine="157" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="73.6094" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="170" x="1095.32" y="640.5"/><ellipse cx="1150.07" cy="656.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1145.9919,652.2656 L1145.9919,650.1094 L1153.3825,650.1094 L1153.3825,652.2656 L1150.9138,652.2656 L1150.9138,660.3438 L1153.3825,660.3438 L1153.3825,662.5  [...]
+class java.io.Serializable--><rect codeLine="164" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="1321.82" y="653.5"/><ellipse cx="1336.82" cy="669.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1332.7419,665.2656 L1332.7419,663.1094 L1340.1325,663.1094 L1340.1325,665.2656 L1337.6638,665.2656 L1337.6638,673.3438 L1340.1325,673.3438 L1340.1325,675.5 L1332.7419, [...]
+class org.apache.wiki.api.engine.Initializable--><a href="../../api/engine/Initializable.html" target="_top" title="../../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../../api/engine/Initializable.html" xlink:show="new" xlink:title="../../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="168" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width=" [...]
+class org.apache.wiki.event.WikiEventListener--><a href="../../event/WikiEventListener.html" target="_top" title="../../event/WikiEventListener.html" xlink:actuate="onRequest" xlink:href="../../event/WikiEventListener.html" xlink:show="new" xlink:title="../../event/WikiEventListener.html" xlink:type="simple"><rect codeLine="174" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="60.8047" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x [...]
+class org.xml.sax.EntityResolver--><rect codeLine="180" fill="#FEFECE" filter="url(#f1dvl5p4ju0q1m)" height="60.8047" id="org.xml.sax.EntityResolver" style="stroke:#A80036;stroke-width:1.5;" width="257" x="1481.82" y="647"/><ellipse cx="1562.07" cy="663" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1557.9919,658.7656 L1557.9919,656.6094 L1565.3825,656.6094 L1565.3825,658.7656 L1562.9138,658.7656 L1562.9138,666.8438 L1565.3825,666.8438 L1565.3825,669  [...]
+reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.WebAuthorizer--><path codeLine="128" d="M366.6,149.03 C385.23,158.73 403.64,169.45 420.32,181 C481.97,223.68 541.58,288.59 573.76,326.2 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.WebAuthorizer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="363.44,155.28,348.72,140.04,369.73,142.77,363.44,155.28" style="stroke:#A80036;stroke-width:1.0;"/><!-- [...]
+reverse link java.security.Principal to org.apache.wiki.auth.authorize.Role--><path codeLine="129" d="M1141.31,730.09 C1118.93,756.13 1088.69,785.93 1055.32,804 C1033.6,815.77 728.77,875.99 561.07,908.55 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1136.05,725.47,1154.18,714.51,1146.84,734.39,1136.05,725.47" style="stroke:#A80036;stroke-width:1.0;"/><!- [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.authorize.Role--><path codeLine="130" d="M1354.12,719.95 C1338.63,748.45 1314.05,784.53 1281.32,804 C1063.15,933.81 966,840.86 715.32,881 C664.44,889.15 608.23,899.35 560.89,908.29 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1348.07,716.4,1363.37,701.73,1360.55,722.74,1348.07,716.4" style="stroke:# [...]
+link org.apache.wiki.auth.authorize.Role to org.apache.wiki.auth.authorize.Role--><path codeLine="131" d="M560.89,916.24 C581.37,917.97 595.82,922.73 595.82,930.5 C595.82,937.61 583.75,942.19 566.04,944.24 " fill="none" id="org.apache.wiki.auth.authorize.Role-to-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="560.89,944.76,570.2363,947.8659,565.8663,944.2738,569.4584,939.9038,560.89,944.76" style="stroke:#A80036;stroke-width: [...]
+reverse link org.apache.wiki.auth.authorize.GroupDatabase to org.apache.wiki.auth.authorize.JDBCGroupDatabase--><path codeLine="132" d="M207.46,1000.4 C208.77,1013.01 210.18,1026.66 211.64,1040.76 " fill="none" id="org.apache.wiki.auth.authorize.GroupDatabase-backto-org.apache.wiki.auth.authorize.JDBCGroupDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="200.47,1000.89,205.38,980.27,214.4,999.44,200.47,1000.89" style="stroke:#A80036 [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="133" d="M470.11,135.01 C454.06,149.45 436.27,165.75 420.32,181 C397.48,202.85 373.38,226.69 350.67,249.55 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="465.87,129.4,485.44,121.28,475.21,139.84,465.87,129.4" style="stroke:#A80036;stroke-w [...]
+reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="134" d="M232.53,160.35 C234.6,187.69 237.02,219.78 239.31,249.97 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="225.52,160.48,230.99,140.01,239.48,159.43,225.52,160.48" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[925bda55d4bdc1b1d1fafa3019e64129]
+reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.auth.authorize.GroupManager--><path codeLine="135" d="M804.7,126.58 C755.46,140.34 697.01,154.98 643.32,164 C618.82,168.12 442.87,170.56 420.32,181 C386.02,196.89 354.75,222.7 328.53,249.68 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.auth.authorize.GroupManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="802.98,119.79,824.13,121.05,806.81,133.25,802.98, [...]
+reverse link org.apache.wiki.auth.authorize.GroupManager to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="136" d="M246.53,484.27 C246.39,506.15 246.25,528.89 246.11,550.75 " fill="none" id="org.apache.wiki.auth.authorize.GroupManager-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="239.53,484.01,246.66,464.06,253.53,484.1,239.53,484.01" style="stroke:#A80036;st [...]
+reverse link org.apache.wiki.auth.Authorizer to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="137" d="M96.6,153.12 C87.9,161.39 80.26,170.65 74.32,181 C6,300.13 24.53,362.01 74.32,490 C82.65,511.39 94.7,531.82 108.6,550.79 " fill="none" id="org.apache.wiki.auth.Authorizer-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="92.3,147.59,112.13,140.11,101.29,158.32,9 [...]
+reverse link org.apache.wiki.event.WikiEventListener to org.apache.wiki.auth.authorize.DefaultGroupManager--><path codeLine="138" d="M972.85,135.49 C985.21,148.7 996.67,164.19 1003.32,181 C1053.86,308.7 1095.25,387.97 1003.32,490 C915.98,586.94 541.24,504.49 419.32,551 C412.02,553.79 404.74,556.96 397.53,560.44 " fill="none" id="org.apache.wiki.event.WikiEventListener-backto-org.apache.wiki.auth.authorize.DefaultGroupManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7. [...]
+link org.apache.wiki.auth.authorize.DefaultGroupManager to org.apache.wiki.auth.authorize.GroupDatabase--><path codeLine="139" d="M222.82,804 C218.29,829.3 213.75,854.6 209.95,875.79 " fill="none" id="org.apache.wiki.auth.authorize.DefaultGroupManager-to-org.apache.wiki.auth.authorize.GroupDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="209.05,880.81,214.5559,872.6439,209.9206,875.8864,206.6781,871.251,209.05,880.81" style="stroke:#A80036;stroke-width: [...]
+reverse link org.apache.wiki.auth.authorize.WebAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer--><path codeLine="140" d="M598.32,407.89 C598.32,454.59 598.32,525.56 598.32,582.83 " fill="none" id="org.apache.wiki.auth.authorize.WebAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="591.33,407.68,598.32,387.68,605.33,407.68,591.33,407.68" style="stroke:# [...]
+link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache.wiki.auth.authorize.Role--><path codeLine="141" d="M533.73,772.09 C520.77,792.18 507.67,813.53 496.32,834 C488.93,847.34 481.68,862.15 475.26,876.04 " fill="none" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer-to-org.apache.wiki.auth.authorize.Role" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="473.11,880.71,480.5004,874.1998,475.1962,876.166,473.23,870.8619,473.11,880.71" styl [...]
+reverse link org.xml.sax.EntityResolver to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="142" d="M1563.83,721.43 C1531.66,748.91 1486.64,783.19 1441.32,804 C1312.84,863.01 1154.55,895.27 1039.93,912.24 " fill="none" id="org.xml.sax.EntityResolver-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1559.31,716.08,1578.9 [...]
+reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver--><path codeLine="143" d="M717.29,782.18 C766.07,824.7 818.81,870.66 852.17,899.73 " fill="none" id="org.apache.wiki.auth.authorize.WebContainerAuthorizer-backto-org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="712.0086" cy="777.5789" fill="#FFFFFF" rx="8" ry="8" sty [...]
+reverse link org.apache.wiki.auth.authorize.GroupDatabase to org.apache.wiki.auth.authorize.XMLGroupDatabase--><path codeLine="144" d="M315.16,990.61 C338.95,1005.42 362.95,1022.44 383.32,1041 C420.23,1074.61 453.2,1120.63 476,1156.39 " fill="none" id="org.apache.wiki.auth.authorize.GroupDatabase-backto-org.apache.wiki.auth.authorize.XMLGroupDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="311.45,996.54,297.93,980.22,318.67,984.55, [...]
 @startuml
     namespace org.apache.wiki.auth.authorize {
 
-        interface GroupDatabase [[GroupDatabase.html]] {
-            {abstract} +delete(Group): void
-            {abstract} +initialize(Engine, Properties): void
-            {abstract} +save(Group, Principal): void
-            {abstract} +groups(): Group[]
+        class Group [[Group.html]] {
+            #Group(String, String)
+            +add(Principal): boolean
+            +clear(): void
+            +getCreated(): Date
+            +getCreator(): String
+            +getLastModified(): Date
+            +getModifier(): String
+            +getName(): String
+            +getPrincipal(): Principal
+            +getWiki(): String
+            +isMember(Principal): boolean
+            +members(): Principal[]
+            +remove(Principal): boolean
+            +setCreated(Date): void
+            +setCreator(String): void
+            +setLastModified(Date): void
+            +setModifier(String): void
+        }
+
+        interface WebAuthorizer [[WebAuthorizer.html]] {
+            {abstract} +isUserInRole(HttpServletRequest, Principal): boolean
+        }
+
+        class Role [[Role.html]] {
+            +Role(String)
+            {static} +isBuiltInRole(Role): boolean
+            {static} +isReservedName(String): boolean
+            +getName(): String
         }
 
         class JDBCGroupDatabase [[JDBCGroupDatabase.html]] {
@@ -75,25 +99,6 @@ reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache
             +initialize(Engine, Properties): void
         }
 
-        class DefaultGroupManager [[DefaultGroupManager.html]] {
-            #m_engine: Engine
-            #m_groupListener: WikiEventListener
-            +findRole(String): Principal
-            +getGroup(String): Group
-            +getRoles(): Principal[]
-            +initialize(Engine, Properties): void
-            +isUserInRole(Session, Principal): boolean
-            +parseGroup(String, String, boolean): Group
-            +removeGroup(String): void
-            +setGroup(Session, Group): void
-            +validateGroup(Context, Group): void
-            +checkGroupName(Context, String): void
-            #extractMembers(String): String[]
-            +addWikiEventListener(WikiEventListener): void
-            +removeWikiEventListener(WikiEventListener): void
-            +actionPerformed(WikiEvent): void
-        }
-
         interface GroupManager [[GroupManager.html]] {
             {static} +MESSAGES_KEY: String
             {static} +PROP_GROUPDATABASE: String
@@ -110,43 +115,23 @@ reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache
             +fireEvent(int, Object): void
         }
 
-        class Group [[Group.html]] {
-            #Group(String, String)
-            +add(Principal): boolean
-            +clear(): void
-            +getCreated(): Date
-            +getCreator(): String
-            +getLastModified(): Date
-            +getModifier(): String
-            +getName(): String
-            +getPrincipal(): Principal
-            +getWiki(): String
-            +isMember(Principal): boolean
-            +members(): Principal[]
-            +remove(Principal): boolean
-            +setCreated(Date): void
-            +setCreator(String): void
-            +setLastModified(Date): void
-            +setModifier(String): void
-        }
-
-        interface WebAuthorizer [[WebAuthorizer.html]] {
-            {abstract} +isUserInRole(HttpServletRequest, Principal): boolean
-        }
-
-        class Role [[Role.html]] {
-            +Role(String)
-            {static} +isBuiltInRole(Role): boolean
-            {static} +isReservedName(String): boolean
-            +getName(): String
-        }
-
-        class XMLGroupDatabase [[XMLGroupDatabase.html]] {
-            {static} +PROP_DATABASE: String
-            +delete(Group): void
-            +groups(): Group[]
+        class DefaultGroupManager [[DefaultGroupManager.html]] {
+            #m_engine: Engine
+            #m_groupListener: WikiEventListener
+            +findRole(String): Principal
+            +getGroup(String): Group
+            +getRoles(): Principal[]
             +initialize(Engine, Properties): void
-            +save(Group, Principal): void
+            +isUserInRole(Session, Principal): boolean
+            +parseGroup(String, String, boolean): Group
+            +removeGroup(String): void
+            +setGroup(Session, Group): void
+            +validateGroup(Context, Group): void
+            +checkGroupName(Context, String): void
+            #extractMembers(String): String[]
+            +addWikiEventListener(WikiEventListener): void
+            +removeWikiEventListener(WikiEventListener): void
+            +actionPerformed(WikiEvent): void
         }
 
         class WebContainerAuthorizer [[WebContainerAuthorizer.html]] {
@@ -167,23 +152,38 @@ reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache
             +resolveEntity(String, String): InputSource
         }
 
+        class XMLGroupDatabase [[XMLGroupDatabase.html]] {
+            {static} +PROP_DATABASE: String
+            +delete(Group): void
+            +groups(): Group[]
+            +initialize(Engine, Properties): void
+            +save(Group, Principal): void
+        }
+
+        interface GroupDatabase [[GroupDatabase.html]] {
+            {abstract} +delete(Group): void
+            {abstract} +initialize(Engine, Properties): void
+            {abstract} +save(Group, Principal): void
+            {abstract} +groups(): Group[]
+        }
+
+        org.apache.wiki.auth.Authorizer <|- - WebAuthorizer
+        java.security.Principal <|.. Role
+        java.io.Serializable <|.. Role
+        Role - -> Role: ALL\nANONYMOUS\nASSERTED\nAUTHENTICATED
         GroupDatabase <|.. JDBCGroupDatabase
+        org.apache.wiki.api.engine.Initializable <|- - GroupManager
+        org.apache.wiki.auth.Authorizer <|- - GroupManager
+        org.apache.wiki.event.WikiEventListener <|- - GroupManager
         GroupManager <|.. DefaultGroupManager
         org.apache.wiki.auth.Authorizer <|.. DefaultGroupManager
         org.apache.wiki.event.WikiEventListener <|.. DefaultGroupManager
         DefaultGroupManager - -> GroupDatabase: groupDatabase
-        org.apache.wiki.api.engine.Initializable <|- - GroupManager
-        org.apache.wiki.auth.Authorizer <|- - GroupManager
-        org.apache.wiki.event.WikiEventListener <|- - GroupManager
-        org.apache.wiki.auth.Authorizer <|- - WebAuthorizer
-        java.security.Principal <|.. Role
-        java.io.Serializable <|.. Role
-        Role - -> Role: ALL\nANONYMOUS\nASSERTED\nAUTHENTICATED
-        GroupDatabase <|.. XMLGroupDatabase
         WebAuthorizer <|.. WebContainerAuthorizer
         WebContainerAuthorizer - -> "*" Role: m_containerRoles
         org.xml.sax.EntityResolver <|.. org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver
         WebContainerAuthorizer +- - org.apache.wiki.auth.authorize.WebContainerAuthorizer.LocalEntityResolver
+        GroupDatabase <|.. XMLGroupDatabase
     }
 
     namespace org.apache.wiki.auth {
@@ -195,29 +195,29 @@ reverse link org.apache.wiki.auth.authorize.WebContainerAuthorizer to org.apache
         }
     }
 
-    namespace org.apache.wiki.event {
-        interface WikiEventListener [[../../event/WikiEventListener.html]] {
-            {abstract} +actionPerformed(WikiEvent): void
+    namespace java.security {
+        interface Principal {
+            {abstract} +getName(): String
+            +implies(Subject): boolean
         }
     }
 
+    namespace java.io {
+        interface Serializable
+    }
+
     namespace org.apache.wiki.api.engine {
         interface Initializable [[../../api/engine/Initializable.html]] {
             {abstract} +initialize(Engine, Properties): void
         }
     }
 
-    namespace java.security {
-        interface Principal {
-            {abstract} +getName(): String
-            +implies(Subject): boolean
+    namespace org.apache.wiki.event {
+        interface WikiEventListener [[../../event/WikiEventListener.html]] {
+            {abstract} +actionPerformed(WikiEvent): void
         }
     }
 
-    namespace java.io {
-        interface Serializable
-    }
-
     namespace org.xml.sax {
         interface EntityResolver {
             {abstract} +resolveEntity(String, String): InputSource
@@ -233,5 +233,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AbstractLoginModule.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AbstractLoginModule.svg
index 9b65dd8568..89ce1cade0 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AbstractLoginModule.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AbstractLoginModule.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:468px;height:402px;background:#FFFFFF;" version="1.1" viewBox="0 0 468 402" width="468px" zoomAndPan="magnify"><defs><filter height="300%" id="fytdip9bd021j" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.login.AbstractLoginModule--><a href="AbstractLoginModule.html" target="_top" title="AbstractLoginModule.html" xlink:actuate="onRequest" xlink:href="AbstractLoginModule.html" xlink:show="new" xlink:title="AbstractLoginModule.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fytdip9bd021j)" height="194.7891" id="org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="445" x="9" y="177"/><ellipse cx="1 [...]
 class javax.security.auth.spi.LoginModule--><rect codeLine="19" fill="#FEFECE" filter="url(#fytdip9bd021j)" height="109.9609" id="javax.security.auth.spi.LoginModule" style="stroke:#A80036;stroke-width:1.5;" width="444" x="9.5" y="7"/><ellipse cx="171.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M167.1719,21.7344 L167.1719,19.5781 L174.5625,19.5781 L174.5625,21.7344 L172.0938,21.7344 L172.0938,29.8125 L174.5625,29.8125 L174.5625,31.96 [...]
-reverse link javax.security.auth.spi.LoginModule to org.apache.wiki.auth.login.AbstractLoginModule--><path codeLine="27" d="M231.5,137.35 C231.5,150.18 231.5,163.68 231.5,177 " fill="none" id="javax.security.auth.spi.LoginModule-backto-org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="224.5,137.21,231.5,117.21,238.5,137.21,224.5,137.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#8888 [...]
+reverse link javax.security.auth.spi.LoginModule to org.apache.wiki.auth.login.AbstractLoginModule--><path codeLine="27" d="M231.5,137.35 C231.5,150.18 231.5,163.68 231.5,177 " fill="none" id="javax.security.auth.spi.LoginModule-backto-org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="224.5,137.21,231.5,117.21,238.5,137.21,224.5,137.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#8888 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -40,5 +40,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AnonymousLoginModule.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AnonymousLoginModule.svg
index 4d514ca87c..f4ce49f568 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AnonymousLoginModule.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AnonymousLoginModule.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="249px" preserveAspectRatio="none" style="width:225px;height:249px;background:#FFFFFF;" version="1.1" viewBox="0 0 225 249" width="225px" zoomAndPan="magnify"><defs><filter height="300%" id="f17na7zhcl9rp" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.login.AnonymousLoginModule--><a href="AnonymousLoginModule.html" target="_top" title="AnonymousLoginModule.html" xlink:actuate="onRequest" xlink:href="AnonymousLoginModule.html" xlink:show="new" xlink:title="AnonymousLoginModule.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f17na7zhcl9rp)" height="92.3516" id="org.apache.wiki.auth.login.AnonymousLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="202" x="9" y="126"/><ellipse  [...]
 class org.apache.wiki.auth.login.AbstractLoginModule--><a href="AbstractLoginModule.html" target="_top" title="AbstractLoginModule.html" xlink:actuate="onRequest" xlink:href="AbstractLoginModule.html" xlink:show="new" xlink:title="AbstractLoginModule.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f17na7zhcl9rp)" height="58.7422" id="org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="178" x="21" y="7"/><ellipse cx="36 [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.AnonymousLoginModule--><path codeLine="15" d="M110,86.53 C110,99.4 110,113.21 110,125.86 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.AnonymousLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="103,86.14,110,66.14,117,86.14,103,86.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.AnonymousLoginModule--><path codeLine="15" d="M110,86.53 C110,99.4 110,113.21 110,125.86 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.AnonymousLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="103,86.14,110,66.14,117,86.14,103,86.14" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AuthorizerCallback.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AuthorizerCallback.svg
index 90cf5487c0..98f80da227 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AuthorizerCallback.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/AuthorizerCallback.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:218px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 218 207" width="218px" zoomAndPan="magnify"><defs><filter height="300%" id="fbgtevg71ull8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.login.AuthorizerCallback--><a href="AuthorizerCallback.html" target="_top" title="AuthorizerCallback.html" xlink:actuate="onRequest" xlink:href="AuthorizerCallback.html" xlink:show="new" xlink:title="AuthorizerCallback.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fbgtevg71ull8)" height="71.5469" id="org.apache.wiki.auth.login.AuthorizerCallback" style="stroke:#A80036;stroke-width:1.5;" width="197" x="7" y="105"/><ellipse cx="38.65" c [...]
 class javax.security.auth.callback.Callback--><rect codeLine="10" fill="#FEFECE" filter="url(#fbgtevg71ull8)" height="37.9375" id="javax.security.auth.callback.Callback" style="stroke:#A80036;stroke-width:1.5;" width="172" x="19.5" y="7"/><ellipse cx="34.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M30.4219,21.7344 L30.4219,19.5781 L37.8125,19.5781 L37.8125,21.7344 L35.3438,21.7344 L35.3438,29.8125 L37.8125,29.8125 L37.8125,31.9688 L30 [...]
-reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.AuthorizerCallback--><path codeLine="12" d="M105.5,65.3 C105.5,78 105.5,92.08 105.5,104.56 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.AuthorizerCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="98.5,65.16,105.5,45.16,112.5,65.16,98.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font [...]
+reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.AuthorizerCallback--><path codeLine="12" d="M105.5,65.3 C105.5,78 105.5,92.08 105.5,104.56 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.AuthorizerCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="98.5,65.16,105.5,45.16,112.5,65.16,98.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/CookieAssertionLoginModule.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/CookieAssertionLoginModule.svg
index d54ef1f2ab..160c64f3aa 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/CookieAssertionLoginModule.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/CookieAssertionLoginModule.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="274px" preserveAspectRatio="none" style="width:330px;height:274px;background:#FFFFFF;" version="1.1" viewBox="0 0 330 274" width="330px" zoomAndPan="magnify"><defs><filter height="300%" id="f1xhkfu8r7ls7d" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.login.CookieAssertionLoginModule--><a href="CookieAssertionLoginModule.html" target="_top" title="CookieAssertionLoginModule.html" xlink:actuate="onRequest" xlink:href="CookieAssertionLoginModule.html" xlink:show="new" xlink:title="CookieAssertionLoginModule.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1xhkfu8r7ls7d)" height="117.9609" id="org.apache.wiki.auth.login.CookieAssertionLoginModule" style="stroke:#A80036;stroke-width:1.5; [...]
 class org.apache.wiki.auth.login.AbstractLoginModule--><a href="AbstractLoginModule.html" target="_top" title="AbstractLoginModule.html" xlink:actuate="onRequest" xlink:href="AbstractLoginModule.html" xlink:show="new" xlink:title="AbstractLoginModule.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#f1xhkfu8r7ls7d)" height="58.7422" id="org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="178" x="72.5" y="7"/><ellipse cx= [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.CookieAssertionLoginModule--><path codeLine="17" d="M161.5,86.1 C161.5,98.8 161.5,112.63 161.5,125.77 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.CookieAssertionLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="154.5,86.09,161.5,66.09,168.5,86.09,154.5,86.09" style="stroke:#A80036;stroke-width:1.0;"/><text fill= [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.CookieAssertionLoginModule--><path codeLine="17" d="M161.5,86.1 C161.5,98.8 161.5,112.63 161.5,125.77 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.CookieAssertionLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="154.5,86.09,161.5,66.09,168.5,86.09,154.5,86.09" style="stroke:#A80036;stroke-width:1.0;"/><text fill= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -30,5 +30,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.svg
index a738b9ca85..226a533aa4 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/CookieAuthenticationLoginModule.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="274px" preserveAspectRatio="none" style="width:466px;height:274px;background:#FFFFFF;" version="1.1" viewBox="0 0 466 274" width="466px" zoomAndPan="magnify"><defs><filter height="300%" id="f1w67x5h4u80f7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.login.CookieAuthenticationLoginModule--><a href="CookieAuthenticationLoginModule.html" target="_top" title="CookieAuthenticationLoginModule.html" xlink:actuate="onRequest" xlink:href="CookieAuthenticationLoginModule.html" xlink:show="new" xlink:title="CookieAuthenticationLoginModule.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1w67x5h4u80f7)" height="117.9609" id="org.apache.wiki.auth.login.CookieAuthenticationLoginModule" style="st [...]
 class org.apache.wiki.auth.login.AbstractLoginModule--><a href="AbstractLoginModule.html" target="_top" title="AbstractLoginModule.html" xlink:actuate="onRequest" xlink:href="AbstractLoginModule.html" xlink:show="new" xlink:title="AbstractLoginModule.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#f1w67x5h4u80f7)" height="58.7422" id="org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="178" x="141.5" y="7"/><ellipse cx [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.CookieAuthenticationLoginModule--><path codeLine="17" d="M230.5,86.1 C230.5,98.8 230.5,112.63 230.5,125.77 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.CookieAuthenticationLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="223.5,86.09,230.5,66.09,237.5,86.09,223.5,86.09" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.CookieAuthenticationLoginModule--><path codeLine="17" d="M230.5,86.1 C230.5,98.8 230.5,112.63 230.5,125.77 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.CookieAuthenticationLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="223.5,86.09,230.5,66.09,237.5,86.09,223.5,86.09" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -30,5 +30,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/HttpRequestCallback.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/HttpRequestCallback.svg
index 9acb701131..449746fbb3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/HttpRequestCallback.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/HttpRequestCallback.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:259px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 259 207" width="259px" zoomAndPan="magnify"><defs><filter height="300%" id="fuxggzr0rrpcc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.login.HttpRequestCallback--><a href="HttpRequestCallback.html" target="_top" title="HttpRequestCallback.html" xlink:actuate="onRequest" xlink:href="HttpRequestCallback.html" xlink:show="new" xlink:title="HttpRequestCallback.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fuxggzr0rrpcc)" height="71.5469" id="org.apache.wiki.auth.login.HttpRequestCallback" style="stroke:#A80036;stroke-width:1.5;" width="238" x="7" y="105"/><ellipse cx="49 [...]
 class javax.security.auth.callback.Callback--><rect codeLine="10" fill="#FEFECE" filter="url(#fuxggzr0rrpcc)" height="37.9375" id="javax.security.auth.callback.Callback" style="stroke:#A80036;stroke-width:1.5;" width="172" x="40" y="7"/><ellipse cx="55" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M50.9219,21.7344 L50.9219,19.5781 L58.3125,19.5781 L58.3125,21.7344 L55.8438,21.7344 L55.8438,29.8125 L58.3125,29.8125 L58.3125,31.9688 L50.921 [...]
-reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.HttpRequestCallback--><path codeLine="12" d="M126,65.3 C126,78 126,92.08 126,104.56 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.HttpRequestCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="119,65.16,126,45.16,133,65.16,119,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="san [...]
+reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.HttpRequestCallback--><path codeLine="12" d="M126,65.3 C126,78 126,92.08 126,104.56 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.HttpRequestCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="119,65.16,126,45.16,133,65.16,119,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="san [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/PrincipalWrapper.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/PrincipalWrapper.svg
index e1e23999d4..e9639492a1 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/PrincipalWrapper.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/PrincipalWrapper.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:201px;height:241px;background:#FFFFFF;" version="1.1" viewBox="0 0 201 241" width="201px" zoomAndPan="magnify"><defs><filter height="300%" id="f18i444lxvewp8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.login.PrincipalWrapper--><a href="PrincipalWrapper.html" target="_top" title="PrincipalWrapper.html" xlink:actuate="onRequest" xlink:href="PrincipalWrapper.html" xlink:show="new" xlink:title="PrincipalWrapper.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f18i444lxvewp8)" height="84.3516" id="org.apache.wiki.auth.login.PrincipalWrapper" style="stroke:#A80036;stroke-width:1.5;" width="177" x="10.5" y="126"/><ellipse cx="34.95" cy="144.9 [...]
 class java.security.Principal--><rect codeLine="11" fill="#FEFECE" filter="url(#f18i444lxvewp8)" height="58.7422" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="126" x="36" y="7"/><ellipse cx="64.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M60.4219,21.7344 L60.4219,19.5781 L67.8125,19.5781 L67.8125,21.7344 L65.3438,21.7344 L65.3438,29.8125 L67.8125,29.8125 L67.8125,31.9688 L60.4219,31.9688 L60.4219,29.812 [...]
-reverse link java.security.Principal to org.apache.wiki.auth.login.PrincipalWrapper--><path codeLine="15" d="M99,86.63 C99,99.47 99,113.17 99,125.56 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.login.PrincipalWrapper" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="92,86.24,99,66.24,106,86.24,92,86.24" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust [...]
+reverse link java.security.Principal to org.apache.wiki.auth.login.PrincipalWrapper--><path codeLine="15" d="M99,86.63 C99,99.47 99,113.17 99,125.56 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.login.PrincipalWrapper" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="92,86.24,99,66.24,106,86.24,92,86.24" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/UserDatabaseCallback.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/UserDatabaseCallback.svg
index 0503c91ac4..025813ba25 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/UserDatabaseCallback.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/UserDatabaseCallback.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:266px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 266 207" width="266px" zoomAndPan="magnify"><defs><filter height="300%" id="f1759do7w0ubci" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.login.UserDatabaseCallback--><a href="UserDatabaseCallback.html" target="_top" title="UserDatabaseCallback.html" xlink:actuate="onRequest" xlink:href="UserDatabaseCallback.html" xlink:show="new" xlink:title="UserDatabaseCallback.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1759do7w0ubci)" height="71.5469" id="org.apache.wiki.auth.login.UserDatabaseCallback" style="stroke:#A80036;stroke-width:1.5;" width="245" x="7" y="105"/><ellipse [...]
 class javax.security.auth.callback.Callback--><rect codeLine="10" fill="#FEFECE" filter="url(#f1759do7w0ubci)" height="37.9375" id="javax.security.auth.callback.Callback" style="stroke:#A80036;stroke-width:1.5;" width="172" x="43.5" y="7"/><ellipse cx="58.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M54.4219,21.7344 L54.4219,19.5781 L61.8125,19.5781 L61.8125,21.7344 L59.3438,21.7344 L59.3438,29.8125 L61.8125,29.8125 L61.8125,31.9688 L5 [...]
-reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.UserDatabaseCallback--><path codeLine="12" d="M129.5,65.3 C129.5,78 129.5,92.08 129.5,104.56 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.UserDatabaseCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="122.5,65.16,129.5,45.16,136.5,65.16,122.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888 [...]
+reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.UserDatabaseCallback--><path codeLine="12" d="M129.5,65.3 C129.5,78 129.5,92.08 129.5,104.56 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.UserDatabaseCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="122.5,65.16,129.5,45.16,136.5,65.16,122.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/UserDatabaseLoginModule.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/UserDatabaseLoginModule.svg
index ca6fdb0025..8f04bde413 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/UserDatabaseLoginModule.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/UserDatabaseLoginModule.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="215px" preserveAspectRatio="none" style="width:239px;height:215px;background:#FFFFFF;" version="1.1" viewBox="0 0 239 215" width="239px" zoomAndPan="magnify"><defs><filter height="300%" id="ftt5pyyb3degc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.login.UserDatabaseLoginModule--><a href="UserDatabaseLoginModule.html" target="_top" title="UserDatabaseLoginModule.html" xlink:actuate="onRequest" xlink:href="UserDatabaseLoginModule.html" xlink:show="new" xlink:title="UserDatabaseLoginModule.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ftt5pyyb3degc)" height="58.7422" id="org.apache.wiki.auth.login.UserDatabaseLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="218" x="7"  [...]
 class org.apache.wiki.auth.login.AbstractLoginModule--><a href="AbstractLoginModule.html" target="_top" title="AbstractLoginModule.html" xlink:actuate="onRequest" xlink:href="AbstractLoginModule.html" xlink:show="new" xlink:title="AbstractLoginModule.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#ftt5pyyb3degc)" height="58.7422" id="org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="178" x="27" y="7"/><ellipse cx="42" [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.UserDatabaseLoginModule--><path codeLine="13" d="M116,86.25 C116,99.7 116,113.86 116,125.77 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.UserDatabaseLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="109,86.12,116,66.12,123,86.12,109,86.12" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.UserDatabaseLoginModule--><path codeLine="13" d="M116,86.25 C116,99.7 116,113.86 116,125.77 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.UserDatabaseLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="109,86.12,116,66.12,123,86.12,109,86.12" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WebContainerCallbackHandler.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WebContainerCallbackHandler.svg
index 06299d75a7..98a6fceec3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WebContainerCallbackHandler.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WebContainerCallbackHandler.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="228px" preserveAspectRatio="none" style="width:379px;height:228px;background:#FFFFFF;" version="1.1" viewBox="0 0 379 228" width="379px" zoomAndPan="magnify"><defs><filter height="300%" id="f4akbknbuaico" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.login.WebContainerCallbackHandler--><a href="WebContainerCallbackHandler.html" target="_top" title="WebContainerCallbackHandler.html" xlink:actuate="onRequest" xlink:href="WebContainerCallbackHandler.html" xlink:show="new" xlink:title="WebContainerCallbackHandler.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f4akbknbuaico)" height="71.5469" id="org.apache.wiki.auth.login.WebContainerCallbackHandler" style="stroke:#A80036;stroke-width: [...]
 class javax.security.auth.callback.CallbackHandler--><rect codeLine="10" fill="#FEFECE" filter="url(#f4akbknbuaico)" height="58.7422" id="javax.security.auth.callback.CallbackHandler" style="stroke:#A80036;stroke-width:1.5;" width="172" x="100" y="7"/><ellipse cx="115" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M110.9219,21.7344 L110.9219,19.5781 L118.3125,19.5781 L118.3125,21.7344 L115.8438,21.7344 L115.8438,29.8125 L118.3125,29.8125 L [...]
-reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.auth.login.WebContainerCallbackHandler--><path codeLine="14" d="M186,86.46 C186,99.64 186,113.64 186,125.9 " fill="none" id="javax.security.auth.callback.CallbackHandler-backto-org.apache.wiki.auth.login.WebContainerCallbackHandler" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="179,86.14,186,66.14,193,86.14,179,86.14" style="stroke:#A80036;stroke-width:1.0;"/><te [...]
+reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.auth.login.WebContainerCallbackHandler--><path codeLine="14" d="M186,86.46 C186,99.64 186,113.64 186,125.9 " fill="none" id="javax.security.auth.callback.CallbackHandler-backto-org.apache.wiki.auth.login.WebContainerCallbackHandler" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="179,86.14,186,66.14,193,86.14,179,86.14" style="stroke:#A80036;stroke-width:1.0;"/><te [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WebContainerLoginModule.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WebContainerLoginModule.svg
index d08f85dc31..e7bace2595 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WebContainerLoginModule.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WebContainerLoginModule.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="236px" preserveAspectRatio="none" style="width:241px;height:236px;background:#FFFFFF;" version="1.1" viewBox="0 0 241 236" width="241px" zoomAndPan="magnify"><defs><filter height="300%" id="fvrnfdcv0g1tm" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.login.WebContainerLoginModule--><a href="WebContainerLoginModule.html" target="_top" title="WebContainerLoginModule.html" xlink:actuate="onRequest" xlink:href="WebContainerLoginModule.html" xlink:show="new" xlink:title="WebContainerLoginModule.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fvrnfdcv0g1tm)" height="79.5469" id="org.apache.wiki.auth.login.WebContainerLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="218" x="9"  [...]
 class org.apache.wiki.auth.login.AbstractLoginModule--><a href="AbstractLoginModule.html" target="_top" title="AbstractLoginModule.html" xlink:actuate="onRequest" xlink:href="AbstractLoginModule.html" xlink:show="new" xlink:title="AbstractLoginModule.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#fvrnfdcv0g1tm)" height="58.7422" id="org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="178" x="29" y="7"/><ellipse cx="44 [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.WebContainerLoginModule--><path codeLine="14" d="M118,86.25 C118,99.35 118,113.34 118,125.85 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.WebContainerLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="111,86.11,118,66.11,125,86.11,111,86.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-famil [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.WebContainerLoginModule--><path codeLine="14" d="M118,86.25 C118,99.35 118,113.34 118,125.85 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.WebContainerLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="111,86.11,118,66.11,125,86.11,111,86.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-famil [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WikiCallbackHandler.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WikiCallbackHandler.svg
index 02de19c10f..d924830d7b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WikiCallbackHandler.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WikiCallbackHandler.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="228px" preserveAspectRatio="none" style="width:406px;height:228px;background:#FFFFFF;" version="1.1" viewBox="0 0 406 228" width="406px" zoomAndPan="magnify"><defs><filter height="300%" id="f16pm1nst9wfz5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.login.WikiCallbackHandler--><a href="WikiCallbackHandler.html" target="_top" title="WikiCallbackHandler.html" xlink:actuate="onRequest" xlink:href="WikiCallbackHandler.html" xlink:show="new" xlink:title="WikiCallbackHandler.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f16pm1nst9wfz5)" height="71.5469" id="org.apache.wiki.auth.login.WikiCallbackHandler" style="stroke:#A80036;stroke-width:1.5;" width="385" x="7" y="126"/><ellipse cx="1 [...]
 class javax.security.auth.callback.CallbackHandler--><rect codeLine="10" fill="#FEFECE" filter="url(#f16pm1nst9wfz5)" height="58.7422" id="javax.security.auth.callback.CallbackHandler" style="stroke:#A80036;stroke-width:1.5;" width="172" x="113.5" y="7"/><ellipse cx="128.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M124.4219,21.7344 L124.4219,19.5781 L131.8125,19.5781 L131.8125,21.7344 L129.3438,21.7344 L129.3438,29.8125 L131.8125,29.8 [...]
-reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.auth.login.WikiCallbackHandler--><path codeLine="14" d="M199.5,86.46 C199.5,99.64 199.5,113.64 199.5,125.9 " fill="none" id="javax.security.auth.callback.CallbackHandler-backto-org.apache.wiki.auth.login.WikiCallbackHandler" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="192.5,86.14,199.5,66.14,206.5,86.14,192.5,86.14" style="stroke:#A80036;stroke-width:1.0;"/><te [...]
+reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.auth.login.WikiCallbackHandler--><path codeLine="14" d="M199.5,86.46 C199.5,99.64 199.5,113.64 199.5,125.9 " fill="none" id="javax.security.auth.callback.CallbackHandler-backto-org.apache.wiki.auth.login.WikiCallbackHandler" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="192.5,86.14,199.5,66.14,206.5,86.14,192.5,86.14" style="stroke:#A80036;stroke-width:1.0;"/><te [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WikiEngineCallback.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WikiEngineCallback.svg
index 2b0cf1f898..9c44b0152b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WikiEngineCallback.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/WikiEngineCallback.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:199px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 207" width="199px" zoomAndPan="magnify"><defs><filter height="300%" id="fdd5otyp2s2re" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.login.WikiEngineCallback--><a href="WikiEngineCallback.html" target="_top" title="WikiEngineCallback.html" xlink:actuate="onRequest" xlink:href="WikiEngineCallback.html" xlink:show="new" xlink:title="WikiEngineCallback.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fdd5otyp2s2re)" height="71.5469" id="org.apache.wiki.auth.login.WikiEngineCallback" style="stroke:#A80036;stroke-width:1.5;" width="164" x="17" y="105"/><ellipse cx="32" cy= [...]
 class javax.security.auth.callback.Callback--><rect codeLine="10" fill="#FEFECE" filter="url(#fdd5otyp2s2re)" height="37.9375" id="javax.security.auth.callback.Callback" style="stroke:#A80036;stroke-width:1.5;" width="172" x="13" y="7"/><ellipse cx="28" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M23.9219,21.7344 L23.9219,19.5781 L31.3125,19.5781 L31.3125,21.7344 L28.8438,21.7344 L28.8438,29.8125 L31.3125,29.8125 L31.3125,31.9688 L23.921 [...]
-reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.WikiEngineCallback--><path codeLine="12" d="M99,65.3 C99,78 99,92.08 99,104.56 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.WikiEngineCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="92,65.16,99,45.16,106,65.16,92,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif"  [...]
+reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.WikiEngineCallback--><path codeLine="12" d="M99,65.3 C99,78 99,92.08 99,104.56 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.WikiEngineCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="92,65.16,99,45.16,106,65.16,92,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/package.svg
index fb3bad5bda..ec36d82d1b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/login/package.svg
@@ -1,79 +1,65 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="628px" preserveAspectRatio="none" style="width:2516px;height:628px;background:#FFFFFF;" version="1.1" viewBox="0 0 2516 628" width="2516px" zoomAndPan="magnify"><defs><filter height="300%" id="f1men2bfjfswlf" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
-cluster org.apache.wiki.auth.login--><polygon fill="#FFFFFF" filter="url(#f1men2bfjfswlf)" points="16,193,230,193,237,215.2969,2499,215.2969,2499,605,16,605,16,193" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="237" y1="215.2969" y2="215.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="208" x="20" y="207.9951">org.apache.wiki.auth.login</text><!--MD5=[67892945c5 [...]
-cluster java.security--><polygon fill="#FFFFFF" filter="url(#f1men2bfjfswlf)" points="19,25,125,25,132,47.2969,221,47.2969,221,150,19,150,19,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="19" x2="132" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="23" y="39.9951">java.security</text><!--MD5=[d7797f00cb30ea3af9ad0e10e60b005b]
-cluster javax.security.auth.callback--><polygon fill="#FFFFFF" filter="url(#f1men2bfjfswlf)" points="1031,31.5,1254,31.5,1261,53.7969,1340,53.7969,1340,143.5,1031,143.5,1031,31.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1031" x2="1261" y1="53.7969" y2="53.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="217" x="1035" y="46.4951">javax.security.auth.callback</text> [...]
-cluster javax.security.auth.spi--><polygon fill="#FFFFFF" filter="url(#f1men2bfjfswlf)" points="2022,6,2205,6,2212,28.2969,2498,28.2969,2498,169,2022,169,2022,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="2022" x2="2212" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="177" x="2026" y="20.9951">javax.security.auth.spi</text><!--MD5=[eee4e73ecf1023 [...]
-class org.apache.wiki.auth.login.PrincipalWrapper--><a href="PrincipalWrapper.html" target="_top" title="PrincipalWrapper.html" xlink:actuate="onRequest" xlink:href="PrincipalWrapper.html" xlink:show="new" xlink:title="PrincipalWrapper.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="86.4141" id="org.apache.wiki.auth.login.PrincipalWrapper" style="stroke:#A80036;stroke-width:1.5;" width="177" x="31.5" y="279.5"/><ellipse cx="64.05" cy="295 [...]
-class org.apache.wiki.auth.login.UserDatabaseCallback--><a href="UserDatabaseCallback.html" target="_top" title="UserDatabaseCallback.html" xlink:actuate="onRequest" xlink:href="UserDatabaseCallback.html" xlink:show="new" xlink:title="UserDatabaseCallback.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="73.6094" id="org.apache.wiki.auth.login.UserDatabaseCallback" style="stroke:#A80036;stroke-width:1.5;" width="245" x="1563.5" y="285.5"/>< [...]
-class org.apache.wiki.auth.login.CookieAuthenticationLoginModule--><a href="CookieAuthenticationLoginModule.html" target="_top" title="CookieAuthenticationLoginModule.html" xlink:actuate="onRequest" xlink:href="CookieAuthenticationLoginModule.html" xlink:show="new" xlink:title="CookieAuthenticationLoginModule.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="112.0234" id="org.apache.wiki.auth.login.CookieAuthenticationLoginModule" style="s [...]
-class org.apache.wiki.auth.login.WebContainerCallbackHandler--><a href="WebContainerCallbackHandler.html" target="_top" title="WebContainerCallbackHandler.html" xlink:actuate="onRequest" xlink:href="WebContainerCallbackHandler.html" xlink:show="new" xlink:title="WebContainerCallbackHandler.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="73.6094" id="org.apache.wiki.auth.login.WebContainerCallbackHandler" style="stroke:#A80036;stroke-widt [...]
-class org.apache.wiki.auth.login.HttpRequestCallback--><a href="HttpRequestCallback.html" target="_top" title="HttpRequestCallback.html" xlink:actuate="onRequest" xlink:href="HttpRequestCallback.html" xlink:show="new" xlink:title="HttpRequestCallback.html" xlink:type="simple"><rect codeLine="27" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="73.6094" id="org.apache.wiki.auth.login.HttpRequestCallback" style="stroke:#A80036;stroke-width:1.5;" width="238" x="1290" y="285.5"/><ellipse [...]
-class org.apache.wiki.auth.login.AnonymousLoginModule--><a href="AnonymousLoginModule.html" target="_top" title="AnonymousLoginModule.html" xlink:actuate="onRequest" xlink:href="AnonymousLoginModule.html" xlink:show="new" xlink:title="AnonymousLoginModule.html" xlink:type="simple"><rect codeLine="32" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="86.4141" id="org.apache.wiki.auth.login.AnonymousLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="182" x="1488" y="490"/><ell [...]
-class org.apache.wiki.auth.login.AuthorizerCallback--><a href="AuthorizerCallback.html" target="_top" title="AuthorizerCallback.html" xlink:actuate="onRequest" xlink:href="AuthorizerCallback.html" xlink:show="new" xlink:title="AuthorizerCallback.html" xlink:type="simple"><rect codeLine="38" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="73.6094" id="org.apache.wiki.auth.login.AuthorizerCallback" style="stroke:#A80036;stroke-width:1.5;" width="197" x="1057.5" y="285.5"/><ellipse cx= [...]
-class org.apache.wiki.auth.login.AbstractLoginModule--><a href="AbstractLoginModule.html" target="_top" title="AbstractLoginModule.html" xlink:actuate="onRequest" xlink:href="AbstractLoginModule.html" xlink:show="new" xlink:title="AbstractLoginModule.html" xlink:type="simple"><rect codeLine="43" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="188.8516" id="org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="445" x="2037.5" y="228"/><ellips [...]
-class org.apache.wiki.auth.login.WikiEngineCallback--><a href="WikiEngineCallback.html" target="_top" title="WikiEngineCallback.html" xlink:actuate="onRequest" xlink:href="WikiEngineCallback.html" xlink:show="new" xlink:title="WikiEngineCallback.html" xlink:type="simple"><rect codeLine="57" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="73.6094" id="org.apache.wiki.auth.login.WikiEngineCallback" style="stroke:#A80036;stroke-width:1.5;" width="159" x="1843.5" y="285.5"/><ellipse cx= [...]
-class org.apache.wiki.auth.login.CookieAssertionLoginModule--><a href="CookieAssertionLoginModule.html" target="_top" title="CookieAssertionLoginModule.html" xlink:actuate="onRequest" xlink:href="CookieAssertionLoginModule.html" xlink:show="new" xlink:title="CookieAssertionLoginModule.html" xlink:type="simple"><rect codeLine="62" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="112.0234" id="org.apache.wiki.auth.login.CookieAssertionLoginModule" style="stroke:#A80036;stroke-width:1.5 [...]
-class org.apache.wiki.auth.login.WebContainerLoginModule--><a href="WebContainerLoginModule.html" target="_top" title="WebContainerLoginModule.html" xlink:actuate="onRequest" xlink:href="WebContainerLoginModule.html" xlink:show="new" xlink:title="WebContainerLoginModule.html" xlink:type="simple"><rect codeLine="70" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="73.6094" id="org.apache.wiki.auth.login.WebContainerLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="198" x="2 [...]
-class org.apache.wiki.auth.login.UserDatabaseLoginModule--><a href="UserDatabaseLoginModule.html" target="_top" title="UserDatabaseLoginModule.html" xlink:actuate="onRequest" xlink:href="UserDatabaseLoginModule.html" xlink:show="new" xlink:title="UserDatabaseLoginModule.html" xlink:type="simple"><rect codeLine="75" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="60.8047" id="org.apache.wiki.auth.login.UserDatabaseLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="200" x="2 [...]
-class org.apache.wiki.auth.login.WikiCallbackHandler--><a href="WikiCallbackHandler.html" target="_top" title="WikiCallbackHandler.html" xlink:actuate="onRequest" xlink:href="WikiCallbackHandler.html" xlink:show="new" xlink:title="WikiCallbackHandler.html" xlink:type="simple"><rect codeLine="79" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="73.6094" id="org.apache.wiki.auth.login.WikiCallbackHandler" style="stroke:#A80036;stroke-width:1.5;" width="385" x="243.5" y="285.5"/><ellips [...]
-class java.security.Principal--><rect codeLine="100" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="73.6094" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="170" x="35" y="60"/><ellipse cx="89.75" cy="76" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M85.6719,71.7656 L85.6719,69.6094 L93.0625,69.6094 L93.0625,71.7656 L90.5938,71.7656 L90.5938,79.8438 L93.0625,79.8438 L93.0625,82 L85.6719,82 L85.6719,79.8438 L88.1406,7 [...]
-class javax.security.auth.callback.Callback--><rect codeLine="107" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="48" id="javax.security.auth.callback.Callback" style="stroke:#A80036;stroke-width:1.5;" width="84" x="1240" y="73"/><ellipse cx="1255" cy="89" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1250.9219,84.7656 L1250.9219,82.6094 L1258.3125,82.6094 L1258.3125,84.7656 L1255.8438,84.7656 L1255.8438,92.8438 L1258.3125,92.8438 L1258.3125,95  [...]
-class javax.security.auth.callback.CallbackHandler--><rect codeLine="108" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="60.8047" id="javax.security.auth.callback.CallbackHandler" style="stroke:#A80036;stroke-width:1.5;" width="159" x="1046.5" y="66.5"/><ellipse cx="1073.2" cy="82.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1069.1219,78.2656 L1069.1219,76.1094 L1076.5125,76.1094 L1076.5125,78.2656 L1074.0438,78.2656 L1074.0438,86.3438 L1076 [...]
-class javax.security.auth.spi.LoginModule--><rect codeLine="114" fill="#FEFECE" filter="url(#f1men2bfjfswlf)" height="112.0234" id="javax.security.auth.spi.LoginModule" style="stroke:#A80036;stroke-width:1.5;" width="444" x="2038" y="41"/><ellipse cx="2216.25" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M2212.1719,52.7656 L2212.1719,50.6094 L2219.5625,50.6094 L2219.5625,52.7656 L2217.0938,52.7656 L2217.0938,60.8438 L2219.5625,60.8438 L2219.56 [...]
-reverse link java.security.Principal to org.apache.wiki.auth.login.PrincipalWrapper--><path codeLine="84" d="M120,154.59 C120,193.42 120,244.11 120,279.39 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.login.PrincipalWrapper" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="113,154.41,120,134.41,127,154.41,113,154.41" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[63028a033f800fc9b545d30fab199748]
-reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.UserDatabaseCallback--><path codeLine="85" d="M1343.88,110.02 C1399.64,122.73 1482.39,146.39 1546,185 C1590.11,211.77 1631.19,254.87 1657.3,285.48 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.UserDatabaseCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1342.33,116.85,1324.28,105.75,1345.31,103.17,1342.33,116 [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.CookieAuthenticationLoginModule--><path codeLine="86" d="M2017.9,417.16 C1777.93,473.41 1706.77,437.24 1471,477 C1464.99,478.01 1458.91,479.08 1452.78,480.2 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.CookieAuthenticationLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2016.3,410.34,2037.39,412.47,2019.57,423.9 [...]
-reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.auth.login.WebContainerCallbackHandler--><path codeLine="87" d="M1072.55,140.21 C1019.46,182.14 938.92,245.75 888.71,285.4 " fill="none" id="javax.security.auth.callback.CallbackHandler-backto-org.apache.wiki.auth.login.WebContainerCallbackHandler" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1068.39,134.58,1088.42,127.68,1077.06,145.57,1068.39,134.58" style="st [...]
-reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.HttpRequestCallback--><path codeLine="88" d="M1305.03,138.54 C1328.83,180.41 1365.61,245.14 1388.45,285.33 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.HttpRequestCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1298.91,141.92,1295.11,121.08,1311.08,135.01,1298.91,141.92" style="stroke:#A80036;stroke-width:1 [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.AnonymousLoginModule--><path codeLine="89" d="M2017.94,417.2 C1871.8,455.54 1824.36,431.35 1688,477 C1677.25,480.6 1666.23,485.1 1655.52,489.96 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.AnonymousLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2016.11,410.45,2037.24,411.93,2019.79,423.95,2016.11,410.45" style [...]
-reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.AuthorizerCallback--><path codeLine="90" d="M1259.15,138.54 C1235.54,180.41 1199.05,245.14 1176.39,285.33 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.AuthorizerCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1253.07,135.06,1268.99,121.08,1265.27,141.94,1253.07,135.06" style="stroke:#A80036;stroke-width:1.0 [...]
-reverse link javax.security.auth.spi.LoginModule to org.apache.wiki.auth.login.AbstractLoginModule--><path codeLine="91" d="M2260,173.37 C2260,190.83 2260,209.61 2260,227.74 " fill="none" id="javax.security.auth.spi.LoginModule-backto-org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2253,173.25,2260,153.25,2267,173.25,2253,173.25" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[825437e7dd1c8 [...]
-reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.WikiEngineCallback--><path codeLine="92" d="M1344.23,101.93 C1469.36,110.78 1746.31,135.51 1826,185 C1864.16,208.7 1891.59,253.51 1907.34,285.32 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.WikiEngineCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1343.58,108.9,1324.1,100.55,1344.53,94.93,1343.58,108.9" sty [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.CookieAssertionLoginModule--><path codeLine="93" d="M2062.48,426.46 C2029.06,443.88 1995.54,461.35 1965.66,476.92 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.CookieAssertionLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2059.51,420.11,2080.48,417.08,2065.98,432.53,2059.51,420.11" style="stroke:#A80036;stroke- [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.WebContainerLoginModule--><path codeLine="94" d="M2200.74,434.81 C2188.98,456.91 2177.44,478.58 2168.25,495.83 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.WebContainerLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2194.6,431.44,2210.18,417.08,2206.96,438.02,2194.6,431.44" style="stroke:#A80036;stroke-width:1. [...]
-reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.UserDatabaseLoginModule--><path codeLine="95" d="M2325.44,434.43 C2340.22,459.48 2354.69,484.02 2365.43,502.22 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.UserDatabaseLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2319.34,437.86,2315.2,417.08,2331.39,430.75,2319.34,437.86" style="stroke:#A80036;stroke-width:1 [...]
-reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.auth.login.WikiCallbackHandler--><path codeLine="96" d="M1026.47,104.51 C927.14,113.64 771.62,135.14 646,185 C583.96,209.62 520.82,253.79 480.2,285.22 " fill="none" id="javax.security.auth.callback.CallbackHandler-backto-org.apache.wiki.auth.login.WikiCallbackHandler" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1025.95,97.53,1046.48,102.77,1027.16,111.48,1025.9 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="628px" preserveAspectRatio="none" style="width:2516px;height:628px;background:#FFFFFF;" version="1.1" viewBox="0 0 2516 628" width="2516px" zoomAndPan="magnify"><defs><filter height="300%" id="f132vm8fvbej0p" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
+cluster org.apache.wiki.auth.login--><polygon fill="#FFFFFF" filter="url(#f132vm8fvbej0p)" points="16,193,230,193,237,215.2969,2499,215.2969,2499,605,16,605,16,193" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="237" y1="215.2969" y2="215.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="208" x="20" y="207.9951">org.apache.wiki.auth.login</text><!--MD5=[d7797f00cb [...]
+cluster javax.security.auth.callback--><polygon fill="#FFFFFF" filter="url(#f132vm8fvbej0p)" points="780,31.5,1003,31.5,1010,53.7969,1089,53.7969,1089,143.5,780,143.5,780,31.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="780" x2="1010" y1="53.7969" y2="53.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="217" x="784" y="46.4951">javax.security.auth.callback</text><!--M [...]
+cluster java.security--><polygon fill="#FFFFFF" filter="url(#f132vm8fvbej0p)" points="1796,25,1902,25,1909,47.2969,1998,47.2969,1998,150,1796,150,1796,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1796" x2="1909" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="1800" y="39.9951">java.security</text><!--MD5=[72426e69503430e05417dfb523e3f35c]
+cluster javax.security.auth.spi--><polygon fill="#FFFFFF" filter="url(#f132vm8fvbej0p)" points="2022,6,2205,6,2212,28.2969,2498,28.2969,2498,169,2022,169,2022,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="2022" x2="2212" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="177" x="2026" y="20.9951">javax.security.auth.spi</text><!--MD5=[0cbcbe34bfe595 [...]
+class org.apache.wiki.auth.login.UserDatabaseCallback--><a href="UserDatabaseCallback.html" target="_top" title="UserDatabaseCallback.html" xlink:actuate="onRequest" xlink:href="UserDatabaseCallback.html" xlink:show="new" xlink:title="UserDatabaseCallback.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="73.6094" id="org.apache.wiki.auth.login.UserDatabaseCallback" style="stroke:#A80036;stroke-width:1.5;" width="245" x="1545.5" y="285.5"/>< [...]
+class org.apache.wiki.auth.login.HttpRequestCallback--><a href="HttpRequestCallback.html" target="_top" title="HttpRequestCallback.html" xlink:actuate="onRequest" xlink:href="HttpRequestCallback.html" xlink:show="new" xlink:title="HttpRequestCallback.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="73.6094" id="org.apache.wiki.auth.login.HttpRequestCallback" style="stroke:#A80036;stroke-width:1.5;" width="238" x="1272" y="285.5"/><ellipse  [...]
+class org.apache.wiki.auth.login.WikiCallbackHandler--><a href="WikiCallbackHandler.html" target="_top" title="WikiCallbackHandler.html" xlink:actuate="onRequest" xlink:href="WikiCallbackHandler.html" xlink:show="new" xlink:title="WikiCallbackHandler.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="73.6094" id="org.apache.wiki.auth.login.WikiCallbackHandler" style="stroke:#A80036;stroke-width:1.5;" width="385" x="425.5" y="285.5"/><ellips [...]
+class org.apache.wiki.auth.login.WebContainerLoginModule--><a href="WebContainerLoginModule.html" target="_top" title="WebContainerLoginModule.html" xlink:actuate="onRequest" xlink:href="WebContainerLoginModule.html" xlink:show="new" xlink:title="WebContainerLoginModule.html" xlink:type="simple"><rect codeLine="18" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="73.6094" id="org.apache.wiki.auth.login.WebContainerLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="198" x="1 [...]
+class org.apache.wiki.auth.login.PrincipalWrapper--><a href="PrincipalWrapper.html" target="_top" title="PrincipalWrapper.html" xlink:actuate="onRequest" xlink:href="PrincipalWrapper.html" xlink:show="new" xlink:title="PrincipalWrapper.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="86.4141" id="org.apache.wiki.auth.login.PrincipalWrapper" style="stroke:#A80036;stroke-width:1.5;" width="177" x="1825.5" y="279.5"/><ellipse cx="1858.05" cy [...]
+class org.apache.wiki.auth.login.AbstractLoginModule--><a href="AbstractLoginModule.html" target="_top" title="AbstractLoginModule.html" xlink:actuate="onRequest" xlink:href="AbstractLoginModule.html" xlink:show="new" xlink:title="AbstractLoginModule.html" xlink:type="simple"><rect codeLine="29" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="188.8516" id="org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="445" x="2037.5" y="228"/><ellips [...]
+class org.apache.wiki.auth.login.WebContainerCallbackHandler--><a href="WebContainerCallbackHandler.html" target="_top" title="WebContainerCallbackHandler.html" xlink:actuate="onRequest" xlink:href="WebContainerCallbackHandler.html" xlink:show="new" xlink:title="WebContainerCallbackHandler.html" xlink:type="simple"><rect codeLine="43" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="73.6094" id="org.apache.wiki.auth.login.WebContainerCallbackHandler" style="stroke:#A80036;stroke-widt [...]
+class org.apache.wiki.auth.login.AnonymousLoginModule--><a href="AnonymousLoginModule.html" target="_top" title="AnonymousLoginModule.html" xlink:actuate="onRequest" xlink:href="AnonymousLoginModule.html" xlink:show="new" xlink:title="AnonymousLoginModule.html" xlink:type="simple"><rect codeLine="48" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="86.4141" id="org.apache.wiki.auth.login.AnonymousLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="182" x="1243" y="490"/><ell [...]
+class org.apache.wiki.auth.login.CookieAuthenticationLoginModule--><a href="CookieAuthenticationLoginModule.html" target="_top" title="CookieAuthenticationLoginModule.html" xlink:actuate="onRequest" xlink:href="CookieAuthenticationLoginModule.html" xlink:show="new" xlink:title="CookieAuthenticationLoginModule.html" xlink:type="simple"><rect codeLine="54" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="112.0234" id="org.apache.wiki.auth.login.CookieAuthenticationLoginModule" style="s [...]
+class org.apache.wiki.auth.login.CookieAssertionLoginModule--><a href="CookieAssertionLoginModule.html" target="_top" title="CookieAssertionLoginModule.html" xlink:actuate="onRequest" xlink:href="CookieAssertionLoginModule.html" xlink:show="new" xlink:title="CookieAssertionLoginModule.html" xlink:type="simple"><rect codeLine="62" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="112.0234" id="org.apache.wiki.auth.login.CookieAssertionLoginModule" style="stroke:#A80036;stroke-width:1.5 [...]
+class org.apache.wiki.auth.login.UserDatabaseLoginModule--><a href="UserDatabaseLoginModule.html" target="_top" title="UserDatabaseLoginModule.html" xlink:actuate="onRequest" xlink:href="UserDatabaseLoginModule.html" xlink:show="new" xlink:title="UserDatabaseLoginModule.html" xlink:type="simple"><rect codeLine="70" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="60.8047" id="org.apache.wiki.auth.login.UserDatabaseLoginModule" style="stroke:#A80036;stroke-width:1.5;" width="200" x="2 [...]
+class org.apache.wiki.auth.login.AuthorizerCallback--><a href="AuthorizerCallback.html" target="_top" title="AuthorizerCallback.html" xlink:actuate="onRequest" xlink:href="AuthorizerCallback.html" xlink:show="new" xlink:title="AuthorizerCallback.html" xlink:type="simple"><rect codeLine="74" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="73.6094" id="org.apache.wiki.auth.login.AuthorizerCallback" style="stroke:#A80036;stroke-width:1.5;" width="197" x="1039.5" y="285.5"/><ellipse cx= [...]
+class org.apache.wiki.auth.login.WikiEngineCallback--><a href="WikiEngineCallback.html" target="_top" title="WikiEngineCallback.html" xlink:actuate="onRequest" xlink:href="WikiEngineCallback.html" xlink:show="new" xlink:title="WikiEngineCallback.html" xlink:type="simple"><rect codeLine="79" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="73.6094" id="org.apache.wiki.auth.login.WikiEngineCallback" style="stroke:#A80036;stroke-width:1.5;" width="159" x="845.5" y="285.5"/><ellipse cx=" [...]
+class javax.security.auth.callback.Callback--><rect codeLine="100" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="48" id="javax.security.auth.callback.Callback" style="stroke:#A80036;stroke-width:1.5;" width="84" x="989" y="73"/><ellipse cx="1004" cy="89" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M999.9219,84.7656 L999.9219,82.6094 L1007.3125,82.6094 L1007.3125,84.7656 L1004.8438,84.7656 L1004.8438,92.8438 L1007.3125,92.8438 L1007.3125,95 L99 [...]
+class javax.security.auth.callback.CallbackHandler--><rect codeLine="101" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="60.8047" id="javax.security.auth.callback.CallbackHandler" style="stroke:#A80036;stroke-width:1.5;" width="159" x="795.5" y="66.5"/><ellipse cx="822.2" cy="82.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M818.1219,78.2656 L818.1219,76.1094 L825.5125,76.1094 L825.5125,78.2656 L823.0438,78.2656 L823.0438,86.3438 L825.5125,86. [...]
+class java.security.Principal--><rect codeLine="107" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="73.6094" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="170" x="1812" y="60"/><ellipse cx="1866.75" cy="76" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1862.6719,71.7656 L1862.6719,69.6094 L1870.0625,69.6094 L1870.0625,71.7656 L1867.5938,71.7656 L1867.5938,79.8438 L1870.0625,79.8438 L1870.0625,82 L1862.6719,82 L1862 [...]
+class javax.security.auth.spi.LoginModule--><rect codeLine="114" fill="#FEFECE" filter="url(#f132vm8fvbej0p)" height="112.0234" id="javax.security.auth.spi.LoginModule" style="stroke:#A80036;stroke-width:1.5;" width="444" x="2038" y="41"/><ellipse cx="2216.25" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M2212.1719,52.7656 L2212.1719,50.6094 L2219.5625,50.6094 L2219.5625,52.7656 L2217.0938,52.7656 L2217.0938,60.8438 L2219.5625,60.8438 L2219.56 [...]
+reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.UserDatabaseCallback--><path codeLine="84" d="M1093.46,97.36 C1191.44,98.81 1384.85,111.74 1528,185 C1574.69,208.89 1616.01,253.66 1641.45,285.41 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.UserDatabaseCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1093.16,104.36,1073.21,97.21,1093.26,90.36,1093.16,104.36 [...]
+reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.HttpRequestCallback--><path codeLine="85" d="M1092.76,114.57 C1139.43,128.82 1203.81,152.28 1254,185 C1296.47,212.69 1336.5,255.2 1362.2,285.42 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.HttpRequestCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1090.51,121.21,1073.3,108.85,1094.46,107.78,1090.51,121.21"  [...]
+reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.auth.login.WikiCallbackHandler--><path codeLine="86" d="M825.52,141.03 C777.3,182.96 704.81,246.01 659.51,285.4 " fill="none" id="javax.security.auth.callback.CallbackHandler-backto-org.apache.wiki.auth.login.WikiCallbackHandler" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="821.19,135.52,840.87,127.68,830.37,146.09,821.19,135.52" style="stroke:#A80036;stroke-wid [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.WebContainerLoginModule--><path codeLine="87" d="M2017.76,417.09 C1670.47,491.57 1561.24,387.9 1225,477 C1207.98,481.51 1190.42,488.47 1174.27,495.95 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.WebContainerLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2016.41,410.22,2037.45,412.73,2019.43,423.89,2016.41,410. [...]
+reverse link java.security.Principal to org.apache.wiki.auth.login.PrincipalWrapper--><path codeLine="88" d="M1901.3,154.59 C1904.26,193.42 1908.11,244.11 1910.8,279.39 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.login.PrincipalWrapper" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1894.31,154.88,1899.77,134.41,1908.27,153.82,1894.31,154.88" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5c4e346c140d950b9e074 [...]
+reverse link javax.security.auth.spi.LoginModule to org.apache.wiki.auth.login.AbstractLoginModule--><path codeLine="89" d="M2260,173.37 C2260,190.83 2260,209.61 2260,227.74 " fill="none" id="javax.security.auth.spi.LoginModule-backto-org.apache.wiki.auth.login.AbstractLoginModule" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2253,173.25,2260,153.25,2267,173.25,2253,173.25" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[95b2dec7c7619 [...]
+reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.auth.login.WebContainerCallbackHandler--><path codeLine="90" d="M775.11,104.43 C678.12,113.44 528.33,134.83 408,185 C349.05,209.58 289.97,253.76 252.1,285.2 " fill="none" id="javax.security.auth.callback.CallbackHandler-backto-org.apache.wiki.auth.login.WebContainerCallbackHandler" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="774.74,97.43,795.27,102.66,775.96,11 [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.AnonymousLoginModule--><path codeLine="91" d="M2017.72,417.13 C1765.37,474.11 1684.23,406.2 1443,477 C1431.51,480.37 1419.78,484.94 1408.48,490 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.AnonymousLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2016.33,410.27,2037.4,412.51,2019.52,423.9,2016.33,410.27" style=" [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.CookieAuthenticationLoginModule--><path codeLine="92" d="M2018.27,417.57 C1953.69,440.98 1898.41,460.07 1848.4,476.99 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.CookieAuthenticationLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2016.01,410.94,2037.2,410.68,2020.8,424.1,2016.01,410.94" style="stroke:#A80036;s [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.CookieAssertionLoginModule--><path codeLine="93" d="M2172.33,432.96 C2160.12,448.2 2148.03,463.29 2137.11,476.92 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.CookieAssertionLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2167.08,428.31,2185.05,417.08,2178.01,437.06,2167.08,428.31" style="stroke:#A80036;stroke-w [...]
+reverse link org.apache.wiki.auth.login.AbstractLoginModule to org.apache.wiki.auth.login.UserDatabaseLoginModule--><path codeLine="94" d="M2325.44,434.43 C2340.22,459.48 2354.69,484.02 2365.43,502.22 " fill="none" id="org.apache.wiki.auth.login.AbstractLoginModule-backto-org.apache.wiki.auth.login.UserDatabaseLoginModule" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2319.34,437.86,2315.2,417.08,2331.39,430.75,2319.34,437.86" style="stroke:#A80036;stroke-width:1 [...]
+reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.AuthorizerCallback--><path codeLine="95" d="M1050.81,139.39 C1070.87,181.28 1101.57,245.41 1120.68,285.33 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.AuthorizerCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1044.37,142.14,1042.05,121.08,1057,136.09,1044.37,142.14" style="stroke:#A80036;stroke-width:1.0;"/ [...]
+reverse link javax.security.auth.callback.Callback to org.apache.wiki.auth.login.WikiEngineCallback--><path codeLine="96" d="M1011.37,139.39 C991.5,181.28 961.09,245.41 942.15,285.33 " fill="none" id="javax.security.auth.callback.Callback-backto-org.apache.wiki.auth.login.WikiEngineCallback" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1005.16,136.15,1020.06,121.08,1017.81,142.15,1005.16,136.15" style="stroke:#A80036;stroke-width:1.0;"/> [...]
 @startuml
     namespace org.apache.wiki.auth.login {
 
-        class PrincipalWrapper [[PrincipalWrapper.html]] {
-            +PrincipalWrapper(Principal)
-            +getPrincipal(): Principal
-            +getName(): String
-        }
-
         class UserDatabaseCallback [[UserDatabaseCallback.html]] {
             +getUserDatabase(): UserDatabase
             +setUserDatabase(UserDatabase): void
         }
 
-        class CookieAuthenticationLoginModule [[CookieAuthenticationLoginModule.html]] {
-            {static} #COOKIE_DIR: String
-            {static} +PROP_LOGIN_EXPIRY_DAYS: String
-            +login(): boolean
-            {static} +setLoginCookie(Engine, HttpServletResponse, String): void
-            {static} +clearLoginCookie(Engine, HttpServletRequest, HttpServletResponse): void
-        }
-
-        class WebContainerCallbackHandler [[WebContainerCallbackHandler.html]] {
-            +WebContainerCallbackHandler(Engine, HttpServletRequest)
-            +handle(Callback[]): void
-        }
-
         class HttpRequestCallback [[HttpRequestCallback.html]] {
             +setRequest(HttpServletRequest): void
             +getRequest(): HttpServletRequest
         }
 
-        class AnonymousLoginModule [[AnonymousLoginModule.html]] {
-            {static} +PROMPT: String
+        class WikiCallbackHandler [[WikiCallbackHandler.html]] {
+            +WikiCallbackHandler(Engine, HttpServletRequest, String, String)
+            +handle(Callback[]): void
+        }
+
+        class WebContainerLoginModule [[WebContainerLoginModule.html]] {
             {static} #LOG: Logger
             +login(): boolean
         }
 
-        class AuthorizerCallback [[AuthorizerCallback.html]] {
-            +setAuthorizer(Authorizer): void
-            +getAuthorizer(): Authorizer
+        class PrincipalWrapper [[PrincipalWrapper.html]] {
+            +PrincipalWrapper(Principal)
+            +getPrincipal(): Principal
+            +getName(): String
         }
 
         abstract class AbstractLoginModule [[AbstractLoginModule.html]] {
@@ -90,9 +76,23 @@ reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.aut
             +logout(): boolean
         }
 
-        class WikiEngineCallback [[WikiEngineCallback.html]] {
-            +setEngine(Engine): void
-            +getEngine(): Engine
+        class WebContainerCallbackHandler [[WebContainerCallbackHandler.html]] {
+            +WebContainerCallbackHandler(Engine, HttpServletRequest)
+            +handle(Callback[]): void
+        }
+
+        class AnonymousLoginModule [[AnonymousLoginModule.html]] {
+            {static} +PROMPT: String
+            {static} #LOG: Logger
+            +login(): boolean
+        }
+
+        class CookieAuthenticationLoginModule [[CookieAuthenticationLoginModule.html]] {
+            {static} #COOKIE_DIR: String
+            {static} +PROP_LOGIN_EXPIRY_DAYS: String
+            +login(): boolean
+            {static} +setLoginCookie(Engine, HttpServletResponse, String): void
+            {static} +clearLoginCookie(Engine, HttpServletRequest, HttpServletResponse): void
         }
 
         class CookieAssertionLoginModule [[CookieAssertionLoginModule.html]] {
@@ -103,40 +103,33 @@ reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.aut
             {static} +clearUserCookie(HttpServletResponse): void
         }
 
-        class WebContainerLoginModule [[WebContainerLoginModule.html]] {
-            {static} #LOG: Logger
+        class UserDatabaseLoginModule [[UserDatabaseLoginModule.html]] {
             +login(): boolean
         }
 
-        class UserDatabaseLoginModule [[UserDatabaseLoginModule.html]] {
-            +login(): boolean
+        class AuthorizerCallback [[AuthorizerCallback.html]] {
+            +setAuthorizer(Authorizer): void
+            +getAuthorizer(): Authorizer
         }
 
-        class WikiCallbackHandler [[WikiCallbackHandler.html]] {
-            +WikiCallbackHandler(Engine, HttpServletRequest, String, String)
-            +handle(Callback[]): void
+        class WikiEngineCallback [[WikiEngineCallback.html]] {
+            +setEngine(Engine): void
+            +getEngine(): Engine
         }
 
-        java.security.Principal <|.. PrincipalWrapper
         javax.security.auth.callback.Callback <|.. UserDatabaseCallback
-        AbstractLoginModule <|- - CookieAuthenticationLoginModule
-        javax.security.auth.callback.CallbackHandler <|.. WebContainerCallbackHandler
         javax.security.auth.callback.Callback <|.. HttpRequestCallback
-        AbstractLoginModule <|- - AnonymousLoginModule
-        javax.security.auth.callback.Callback <|.. AuthorizerCallback
+        javax.security.auth.callback.CallbackHandler <|.. WikiCallbackHandler
+        AbstractLoginModule <|- - WebContainerLoginModule
+        java.security.Principal <|.. PrincipalWrapper
         javax.security.auth.spi.LoginModule <|.. AbstractLoginModule
-        javax.security.auth.callback.Callback <|.. WikiEngineCallback
+        javax.security.auth.callback.CallbackHandler <|.. WebContainerCallbackHandler
+        AbstractLoginModule <|- - AnonymousLoginModule
+        AbstractLoginModule <|- - CookieAuthenticationLoginModule
         AbstractLoginModule <|- - CookieAssertionLoginModule
-        AbstractLoginModule <|- - WebContainerLoginModule
         AbstractLoginModule <|- - UserDatabaseLoginModule
-        javax.security.auth.callback.CallbackHandler <|.. WikiCallbackHandler
-    }
-
-    namespace java.security {
-        interface Principal {
-            {abstract} +getName(): String
-            +implies(Subject): boolean
-        }
+        javax.security.auth.callback.Callback <|.. AuthorizerCallback
+        javax.security.auth.callback.Callback <|.. WikiEngineCallback
     }
 
     namespace javax.security.auth.callback {
@@ -146,6 +139,13 @@ reverse link javax.security.auth.callback.CallbackHandler to org.apache.wiki.aut
         }
     }
 
+    namespace java.security {
+        interface Principal {
+            {abstract} +getName(): String
+            +implies(Subject): boolean
+        }
+    }
+
     namespace javax.security.auth.spi {
         interface LoginModule {
             {abstract} +initialize(Subject, CallbackHandler, Map<String, ?>, Map<String, ?>): void
@@ -165,5 +165,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/package.svg
index 105031ff92..808ebf80e4 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/package.svg
@@ -1,127 +1,56 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1032px" preserveAspectRatio="none" style="width:3600px;height:1032px;background:#FFFFFF;" version="1.1" viewBox="0 0 3600 1032" width="3600px" zoomAndPan="magnify"><defs><filter height="300%" id="f3p81pthq2olc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDe [...]
-cluster org.apache.wiki.auth--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="534,164,705,164,712,186.2969,3337,186.2969,3337,1009,534,1009,534,164" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="534" x2="712" y1="186.2969" y2="186.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="165" x="538" y="178.9951">org.apache.wiki.auth</text><!--MD5=[737c6b32201ecf86 [...]
-cluster javax.servlet.http--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="554,6,697,6,704,28.2969,850,28.2969,850,131,554,131,554,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="554" x2="704" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="137" x="558" y="20.9951">javax.servlet.http</text><!--MD5=[06e4b2620a8b168056b961578cd367b2]
-cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="1738,12.5,1956,12.5,1963,34.7969,1986,34.7969,1986,124.5,1738,124.5,1738,12.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1738" x2="1963" y1="34.7969" y2="34.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="1742" y="27.4951">org.apache.wiki.api.engine</text><!--M [...]
-cluster java.security--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="2563,6,2669,6,2676,28.2969,2765,28.2969,2765,131,2563,131,2563,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="2563" x2="2676" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="2567" y="20.9951">java.security</text><!--MD5=[0d852700fdad35b7061d461d6907a324]
-cluster java.io--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="2789,19,2845,19,2852,41.2969,2925,41.2969,2925,118,2789,118,2789,19" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="2789" x2="2852" y1="41.2969" y2="41.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="2793" y="33.9951">java.io</text><!--MD5=[aa8f7b917213fcc1c2766e2d59b49067]
-cluster java.lang--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="2949,12.5,3024,12.5,3031,34.7969,3109,34.7969,3109,124.5,2949,124.5,2949,12.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="2949" x2="3031" y1="34.7969" y2="34.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69" x="2953" y="27.4951">java.lang</text><!--MD5=[033be043fb277336b8890b347fde2a9a]
-cluster org.apache.wiki.api.exceptions--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="3133,19,3384,19,3391,41.2969,3394,41.2969,3394,118,3133,118,3133,19" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="3133" x2="3391" y1="41.2969" y2="41.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="245" x="3137" y="33.9951">org.apache.wiki.api.exceptions</text><!--MD5 [...]
-cluster org.apache.wiki.auth.user--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="3361,884.5,3573,884.5,3580,906.7969,3583,906.7969,3583,983.5,3361,983.5,3361,884.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="3361" x2="3580" y1="906.7969" y2="906.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="206" x="3365" y="899.4951">org.apache.wiki.auth.user</text [...]
-cluster org.apache.wiki.ajax--><polygon fill="#FFFFFF" filter="url(#f3p81pthq2olc)" points="16,638,183,638,190,660.2969,510,660.2969,510,763,16,763,16,638" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="190" y1="660.2969" y2="660.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="161" x="20" y="652.9951">org.apache.wiki.ajax</text><!--MD5=[cc5c02042f148c9c41b9601fa [...]
-class org.apache.wiki.auth.DefaultAuthenticationManager--><a href="DefaultAuthenticationManager.html" target="_top" title="DefaultAuthenticationManager.html" xlink:actuate="onRequest" xlink:href="DefaultAuthenticationManager.html" xlink:show="new" xlink:title="DefaultAuthenticationManager.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="214.4609" id="org.apache.wiki.auth.DefaultAuthenticationManager" style="stroke:#A80036;stroke-width:1.5;" [...]
-class org.apache.wiki.auth.SessionMonitor--><a href="SessionMonitor.html" target="_top" title="SessionMonitor.html" xlink:actuate="onRequest" xlink:href="SessionMonitor.html" xlink:show="new" xlink:title="SessionMonitor.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="214.4609" id="org.apache.wiki.auth.SessionMonitor" style="stroke:#A80036;stroke-width:1.5;" width="304" x="550" y="263.5"/><ellipse cx="649.75" cy="279.5" fill="#ADD1B2" rx=" [...]
-class org.apache.wiki.auth.UserManager--><a href="UserManager.html" target="_top" title="UserManager.html" xlink:actuate="onRequest" xlink:href="UserManager.html" xlink:show="new" xlink:title="UserManager.html" xlink:type="simple"><rect codeLine="35" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="201.6563" id="org.apache.wiki.auth.UserManager" style="stroke:#A80036;stroke-width:1.5;" width="368" x="889" y="269.5"/><ellipse cx="1027.25" cy="285.5" fill="#B4A7E5" rx="11" ry="11" style [...]
-class org.apache.wiki.auth.GroupPrincipal--><a href="GroupPrincipal.html" target="_top" title="GroupPrincipal.html" xlink:actuate="onRequest" xlink:href="GroupPrincipal.html" xlink:show="new" xlink:title="GroupPrincipal.html" xlink:type="simple"><rect codeLine="50" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="73.6094" id="org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.5;" width="151" x="2598.5" y="333.5"/><ellipse cx="2626.1" cy="349.5" fill="#ADD1B2" rx [...]
-class org.apache.wiki.auth.WikiPrincipal--><a href="WikiPrincipal.html" target="_top" title="WikiPrincipal.html" xlink:actuate="onRequest" xlink:href="WikiPrincipal.html" xlink:show="new" xlink:title="WikiPrincipal.html" xlink:type="simple"><rect codeLine="55" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="188.8516" id="org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.5;" width="245" x="2784.5" y="276"/><ellipse cx="2864.25" cy="292" fill="#ADD1B2" rx="11" ry [...]
-class org.apache.wiki.auth.WikiSecurityException--><a href="WikiSecurityException.html" target="_top" title="WikiSecurityException.html" xlink:actuate="onRequest" xlink:href="WikiSecurityException.html" xlink:show="new" xlink:title="WikiSecurityException.html" xlink:type="simple"><rect codeLine="69" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="73.6094" id="org.apache.wiki.auth.WikiSecurityException" style="stroke:#A80036;stroke-width:1.5;" width="256" x="3065" y="333.5"/><ellipse  [...]
-class org.apache.wiki.auth.Authorizer--><a href="Authorizer.html" target="_top" title="Authorizer.html" xlink:actuate="onRequest" xlink:href="Authorizer.html" xlink:show="new" xlink:title="Authorizer.html" xlink:type="simple"><rect codeLine="74" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="99.2188" id="org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.5;" width="256" x="2252" y="894"/><ellipse cx="2343.75" cy="910" fill="#B4A7E5" rx="11" ry="11" style="stroke:# [...]
-class org.apache.wiki.auth.DefaultAuthorizationManager--><a href="DefaultAuthorizationManager.html" target="_top" title="DefaultAuthorizationManager.html" xlink:actuate="onRequest" xlink:href="DefaultAuthorizationManager.html" xlink:show="new" xlink:title="DefaultAuthorizationManager.html" xlink:type="simple"><rect codeLine="81" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="163.2422" id="org.apache.wiki.auth.DefaultAuthorizationManager" style="stroke:#A80036;stroke-width:1.5;" widt [...]
-class org.apache.wiki.auth.NoSuchPrincipalException--><a href="NoSuchPrincipalException.html" target="_top" title="NoSuchPrincipalException.html" xlink:actuate="onRequest" xlink:href="NoSuchPrincipalException.html" xlink:show="new" xlink:title="NoSuchPrincipalException.html" xlink:type="simple"><rect codeLine="93" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="60.8047" id="org.apache.wiki.auth.NoSuchPrincipalException" style="stroke:#A80036;stroke-width:1.5;" width="213" x="3086.5"  [...]
-class org.apache.wiki.auth.SecurityVerifier--><a href="SecurityVerifier.html" target="_top" title="SecurityVerifier.html" xlink:actuate="onRequest" xlink:href="SecurityVerifier.html" xlink:show="new" xlink:title="SecurityVerifier.html" xlink:type="simple"><rect codeLine="97" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="342.5078" id="org.apache.wiki.auth.SecurityVerifier" style="stroke:#A80036;stroke-width:1.5;" width="237" x="1292.5" y="199"/><ellipse cx="1359.75" cy="215" fill="# [...]
-class org.apache.wiki.auth.DefaultUserManager--><a href="DefaultUserManager.html" target="_top" title="DefaultUserManager.html" xlink:actuate="onRequest" xlink:href="DefaultUserManager.html" xlink:show="new" xlink:title="DefaultUserManager.html" xlink:type="simple"><rect codeLine="123" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="163.2422" id="org.apache.wiki.auth.DefaultUserManager" style="stroke:#A80036;stroke-width:1.5;" width="367" x="889.5" y="628.5"/><ellipse cx="1004.25" cy [...]
-class org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><a href="DefaultUserManager.JSONUserModule.html" target="_top" title="DefaultUserManager.JSONUserModule.html" xlink:actuate="onRequest" xlink:href="DefaultUserManager.JSONUserModule.html" xlink:show="new" xlink:title="DefaultUserManager.JSONUserModule.html" xlink:type="simple"><rect codeLine="135" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="99.2188" id="org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="st [...]
-class org.apache.wiki.auth.AuthenticationManager--><a href="AuthenticationManager.html" target="_top" title="AuthenticationManager.html" xlink:actuate="onRequest" xlink:href="AuthenticationManager.html" xlink:show="new" xlink:title="AuthenticationManager.html" xlink:type="simple"><rect codeLine="142" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="291.2891" id="org.apache.wiki.auth.AuthenticationManager" style="stroke:#A80036;stroke-width:1.5;" width="595" x="1564.5" y="225"/><ellips [...]
-class org.apache.wiki.auth.AuthorizationManager--><a href="AuthorizationManager.html" target="_top" title="AuthorizationManager.html" xlink:actuate="onRequest" xlink:href="AuthorizationManager.html" xlink:show="new" xlink:title="AuthorizationManager.html" xlink:type="simple"><rect codeLine="164" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="252.875" id="org.apache.wiki.auth.AuthorizationManager" style="stroke:#A80036;stroke-width:1.5;" width="369" x="2194.5" y="244"/><ellipse cx="2 [...]
-class javax.servlet.http.HttpSessionListener--><rect codeLine="204" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="73.6094" id="javax.servlet.http.HttpSessionListener" style="stroke:#A80036;stroke-width:1.5;" width="264" x="570" y="41"/><ellipse cx="635.75" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M631.6719,52.7656 L631.6719,50.6094 L639.0625,50.6094 L639.0625,52.7656 L636.5938,52.7656 L636.5938,60.8438 L639.0625,60.8438 L639.0625,63  [...]
-class org.apache.wiki.api.engine.Initializable--><a href="../api/engine/Initializable.html" target="_top" title="../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../api/engine/Initializable.html" xlink:show="new" xlink:title="../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="211" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="1754" [...]
-class java.security.Principal--><rect codeLine="217" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="73.6094" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="170" x="2579" y="41"/><ellipse cx="2633.75" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M2629.6719,52.7656 L2629.6719,50.6094 L2637.0625,50.6094 L2637.0625,52.7656 L2634.5938,52.7656 L2634.5938,60.8438 L2637.0625,60.8438 L2637.0625,63 L2629.6719,63 L2629. [...]
-class java.io.Serializable--><rect codeLine="224" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="2805.5" y="54"/><ellipse cx="2820.5" cy="70" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M2816.4219,65.7656 L2816.4219,63.6094 L2823.8125,63.6094 L2823.8125,65.7656 L2821.3438,65.7656 L2821.3438,73.8438 L2823.8125,73.8438 L2823.8125,76 L2816.4219,76 L2816.4219,73.84 [...]
-class java.lang.Comparable--><rect codeLine="228" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="60.8047" id="java.lang.Comparable" style="stroke:#A80036;stroke-width:1.5;" width="127" x="2965.5" y="47.5"/><ellipse cx="2984.55" cy="63.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M2980.4719,59.2656 L2980.4719,57.1094 L2987.8625,57.1094 L2987.8625,59.2656 L2985.3938,59.2656 L2985.3938,67.3438 L2987.8625,67.3438 L2987.8625,69.5 L2980.4719,69.5 L2 [...]
-class org.apache.wiki.api.exceptions.WikiException--><a href="../api/exceptions/WikiException.html" target="_top" title="../api/exceptions/WikiException.html" xlink:actuate="onRequest" xlink:href="../api/exceptions/WikiException.html" xlink:show="new" xlink:title="../api/exceptions/WikiException.html" xlink:type="simple"><rect codeLine="234" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="48" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;" w [...]
-class org.apache.wiki.auth.user.UserDatabase--><rect fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="48" id="org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="122" x="3377" y="919.5"/><ellipse cx="3392" cy="935.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M3394.9688,941.1406 Q3394.3906,941.4375 3393.75,941.5781 Q3393.1094,941.7344 3392.4063,941.7344 Q3389.9063,941.7344 3388.5781,940.0938 Q3387.2656,938.4375 [...]
-class org.apache.wiki.ajax.WikiAjaxServlet--><a href="../ajax/WikiAjaxServlet.html" target="_top" title="../ajax/WikiAjaxServlet.html" xlink:actuate="onRequest" xlink:href="../ajax/WikiAjaxServlet.html" xlink:show="new" xlink:title="../ajax/WikiAjaxServlet.html" xlink:type="simple"><rect codeLine="239" fill="#FEFECE" filter="url(#f3p81pthq2olc)" height="73.6094" id="org.apache.wiki.ajax.WikiAjaxServlet" style="stroke:#A80036;stroke-width:1.5;" width="461" x="32.5" y="673"/><ellipse cx="2 [...]
-reverse link org.apache.wiki.auth.AuthenticationManager to org.apache.wiki.auth.DefaultAuthenticationManager--><path codeLine="183" d="M1861.02,536.38 C1860.89,559.02 1860.75,581.76 1860.63,602.95 " fill="none" id="org.apache.wiki.auth.AuthenticationManager-backto-org.apache.wiki.auth.DefaultAuthenticationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1854.02,536.06,1861.14,516.1,1868.02,536.14,1854.02,536.06" style="stroke:#A8003 [...]
-reverse link javax.servlet.http.HttpSessionListener to org.apache.wiki.auth.SessionMonitor--><path codeLine="184" d="M702,135.31 C702,171.61 702,219.95 702,263.28 " fill="none" id="javax.servlet.http.HttpSessionListener-backto-org.apache.wiki.auth.SessionMonitor" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="695,135.2,702,115.2,709,135.2,695,135.2" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b986c65e3b200e485ed26a9e909b8bd0]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.UserManager--><path codeLine="185" d="M1733.51,85.83 C1585.5,95.43 1352.72,116.35 1275,156 C1223.3,182.38 1177.66,227.47 1142.9,269.43 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.UserManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1733.4,78.82,1753.8,84.55,1734.28,92.79,1733.4,78.82" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[31d [...]
-reverse link java.security.Principal to org.apache.wiki.auth.GroupPrincipal--><path codeLine="186" d="M2665.93,135.21 C2667.95,193.71 2671.04,283.58 2672.75,333.3 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2658.94,135.43,2665.25,115.2,2672.93,134.95,2658.94,135.43" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[296ff7e5d1ef75d18adc80e02449a383]
-reverse link java.io.Serializable to org.apache.wiki.auth.GroupPrincipal--><path codeLine="187" d="M2807.16,114.77 C2792.89,126.71 2778.2,140.87 2767,156 C2725.76,211.74 2698.04,288.62 2684.23,333.29 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2802.85,109.25,2822.87,102.29,2811.56,120.21,2802.85,109.25" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[0 [...]
-reverse link java.security.Principal to org.apache.wiki.auth.WikiPrincipal--><path codeLine="188" d="M2735.75,127.49 C2746.77,136.36 2757.6,146 2767,156 C2800.63,191.76 2831.36,236.54 2855.41,275.84 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2731.19,132.82,2719.6,115.09,2739.72,121.72,2731.19,132.82" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d [...]
-reverse link java.lang.Comparable to org.apache.wiki.auth.WikiPrincipal--><path codeLine="189" d="M3008.75,127.21 C2991.8,167.58 2967.1,226.39 2946.28,275.96 " fill="none" id="java.lang.Comparable-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="3002.32,124.45,3016.52,108.72,3015.23,129.87,3002.32,124.45" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ec8e80d48d4435410905123bd859e267]
-reverse link java.io.Serializable to org.apache.wiki.auth.WikiPrincipal--><path codeLine="190" d="M2864.41,122.06 C2871.36,162.43 2881.99,224.16 2890.88,275.86 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2857.5,123.18,2861.01,102.28,2871.3,120.8,2857.5,123.18" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b8e8c2f2fca36c20709e88c300cc0513]
-reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.auth.WikiSecurityException--><path codeLine="191" d="M3205.76,122.3 C3202.8,179.61 3197.64,279.62 3194.88,333.19 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.auth.WikiSecurityException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="3198.78,121.89,3206.8,102.28,3212.76,122.62,3198.78,121.89" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[bebed7 [...]
-reverse link org.apache.wiki.auth.AuthorizationManager to org.apache.wiki.auth.DefaultAuthorizationManager--><path codeLine="192" d="M2379.43,517.2 C2379.54,555.27 2379.66,594.94 2379.76,628.25 " fill="none" id="org.apache.wiki.auth.AuthorizationManager-backto-org.apache.wiki.auth.DefaultAuthorizationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2372.43,517.19,2379.37,497.17,2386.43,517.15,2372.43,517.19" style="stroke:#A80036;st [...]
-link org.apache.wiki.auth.DefaultAuthorizationManager to org.apache.wiki.auth.Authorizer--><path codeLine="193" d="M2380,791.64 C2380,823.7 2380,859.74 2380,888.54 " fill="none" id="org.apache.wiki.auth.DefaultAuthorizationManager-to-org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="2380,893.84,2384,884.84,2380,888.84,2376,884.84,2380,893.84" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" fo [...]
-reverse link org.apache.wiki.auth.WikiSecurityException to org.apache.wiki.auth.NoSuchPrincipalException--><path codeLine="194" d="M3193,427.85 C3193,500.08 3193,622.67 3193,679.03 " fill="none" id="org.apache.wiki.auth.WikiSecurityException-backto-org.apache.wiki.auth.NoSuchPrincipalException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="3186,427.62,3193,407.62,3200,427.62,3186,427.62" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d3449ecf8885dc4175dc0aca3 [...]
-reverse link org.apache.wiki.auth.UserManager to org.apache.wiki.auth.DefaultUserManager--><path codeLine="195" d="M1073,491.9 C1073,537.16 1073,587.48 1073,628.28 " fill="none" id="org.apache.wiki.auth.UserManager-backto-org.apache.wiki.auth.DefaultUserManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1066,491.85,1073,471.85,1080,491.85,1066,491.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ef27b81832d8b33659859a3fd124d42d]
-link org.apache.wiki.auth.DefaultUserManager to org.apache.wiki.auth.user.UserDatabase--><path codeLine="196" d="M1256.56,760.86 C1342.82,782.1 1447.48,804.77 1543,817 C1938.66,867.66 2956.66,756.29 3337,876.5 C3362.81,884.66 3388.3,901.4 3407.21,915.98 " fill="none" id="org.apache.wiki.auth.DefaultUserManager-to-org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3411.39,919.24,3406.7677,910.5432,3407.4525,916.1585,3401.8372, [...]
-reverse link org.apache.wiki.ajax.WikiAjaxServlet to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="197" d="M373.86,754.36 C422.93,773.56 481.34,796.41 534,817 C598.92,842.39 671.23,870.66 730.76,893.93 " fill="none" id="org.apache.wiki.ajax.WikiAjaxServlet-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="371.27,760.87,355.19,747.06,376.37,747.83,371.27, [...]
-reverse link org.apache.wiki.auth.DefaultUserManager to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="198" d="M986.4,802.96 C957.15,834.02 925.65,867.47 900.83,893.84 " fill="none" id="org.apache.wiki.auth.DefaultUserManager-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="991.5771" cy="797.4656" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036 [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.AuthenticationManager--><path codeLine="199" d="M1862,128.83 C1862,155.64 1862,190.24 1862,224.79 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.AuthenticationManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1855,128.72,1862,108.72,1869,128.72,1855,128.72" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[61591a8d79d564c97a0e9c15fb47b58b]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.AuthorizationManager--><path codeLine="200" d="M1990.04,93.3 C2049.88,104.12 2120.26,123.03 2177,156 C2215.93,178.63 2252.03,211.02 2282.62,243.77 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.AuthorizationManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1988.74,100.18,1970.19,89.93,1991.08,86.38,1988.74,100.18" style="stroke:#A80036;stroke [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1032px" preserveAspectRatio="none" style="width:3601px;height:1032px;background:#FFFFFF;" version="1.1" viewBox="0 0 3601 1032" width="3601px" zoomAndPan="magnify"><defs><filter height="300%" id="f1pkc0kzcc41hm" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdD [...]
+cluster org.apache.wiki.auth--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="262,164,433,164,440,186.2969,3066,186.2969,3066,1009,262,1009,262,164" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="262" x2="440" y1="186.2969" y2="186.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="165" x="266" y="178.9951">org.apache.wiki.auth</text><!--MD5=[06e4b2620a8b168 [...]
+cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="855,12.5,1073,12.5,1080,34.7969,1103,34.7969,1103,124.5,855,124.5,855,12.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="855" x2="1080" y1="34.7969" y2="34.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="859" y="27.4951">org.apache.wiki.api.engine</text><!--MD5=[ [...]
+cluster org.apache.wiki.auth.user--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="16,884.5,228,884.5,235,906.7969,238,906.7969,238,983.5,16,983.5,16,884.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="235" y1="906.7969" y2="906.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="206" x="20" y="899.4951">org.apache.wiki.auth.user</text><!--MD5=[dbc0 [...]
+cluster org.apache.wiki.ajax--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="3090,638,3257,638,3264,660.2969,3584,660.2969,3584,763,3090,763,3090,638" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="3090" x2="3264" y1="660.2969" y2="660.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="161" x="3094" y="652.9951">org.apache.wiki.ajax</text><!--MD5=[67892945c [...]
+cluster java.security--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="1650,6,1756,6,1763,28.2969,1852,28.2969,1852,131,1650,131,1650,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1650" x2="1763" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="1654" y="20.9951">java.security</text><!--MD5=[0d852700fdad35b7061d461d6907a324]
+cluster java.io--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="1876,19,1932,19,1939,41.2969,2012,41.2969,2012,118,1876,118,1876,19" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1876" x2="1939" y1="41.2969" y2="41.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="1880" y="33.9951">java.io</text><!--MD5=[aa8f7b917213fcc1c2766e2d59b49067]
+cluster java.lang--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="2036,12.5,2111,12.5,2118,34.7969,2196,34.7969,2196,124.5,2036,124.5,2036,12.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="2036" x2="2118" y1="34.7969" y2="34.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="69" x="2040" y="27.4951">java.lang</text><!--MD5=[033be043fb277336b8890b347fde2a9a]
+cluster org.apache.wiki.api.exceptions--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="2220,19,2471,19,2478,41.2969,2481,41.2969,2481,118,2220,118,2220,19" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="2220" x2="2478" y1="41.2969" y2="41.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="245" x="2224" y="33.9951">org.apache.wiki.api.exceptions</text><!--MD [...]
+cluster javax.servlet.http--><polygon fill="#FFFFFF" filter="url(#f1pkc0kzcc41hm)" points="2505,6,2648,6,2655,28.2969,2801,28.2969,2801,131,2505,131,2505,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="2505" x2="2655" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="137" x="2509" y="20.9951">javax.servlet.http</text><!--MD5=[870124c8629261e080393a7c [...]
+class org.apache.wiki.auth.Authorizer--><a href="Authorizer.html" target="_top" title="Authorizer.html" xlink:actuate="onRequest" xlink:href="Authorizer.html" xlink:show="new" xlink:title="Authorizer.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="99.2188" id="org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.5;" width="256" x="1372" y="894"/><ellipse cx="1463.75" cy="910" fill="#B4A7E5" rx="11" ry="11" style="stroke:# [...]
+class org.apache.wiki.auth.SecurityVerifier--><a href="SecurityVerifier.html" target="_top" title="SecurityVerifier.html" xlink:actuate="onRequest" xlink:href="SecurityVerifier.html" xlink:show="new" xlink:title="SecurityVerifier.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="342.5078" id="org.apache.wiki.auth.SecurityVerifier" style="stroke:#A80036;stroke-width:1.5;" width="237" x="2812.5" y="199"/><ellipse cx="2879.75" cy="215" fill=" [...]
+class org.apache.wiki.auth.DefaultAuthenticationManager--><a href="DefaultAuthenticationManager.html" target="_top" title="DefaultAuthenticationManager.html" xlink:actuate="onRequest" xlink:href="DefaultAuthenticationManager.html" xlink:show="new" xlink:title="DefaultAuthenticationManager.html" xlink:type="simple"><rect codeLine="36" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="214.4609" id="org.apache.wiki.auth.DefaultAuthenticationManager" style="stroke:#A80036;stroke-width:1.5 [...]
+class org.apache.wiki.auth.NoSuchPrincipalException--><a href="NoSuchPrincipalException.html" target="_top" title="NoSuchPrincipalException.html" xlink:actuate="onRequest" xlink:href="NoSuchPrincipalException.html" xlink:show="new" xlink:title="NoSuchPrincipalException.html" xlink:type="simple"><rect codeLine="52" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="60.8047" id="org.apache.wiki.auth.NoSuchPrincipalException" style="stroke:#A80036;stroke-width:1.5;" width="213" x="2203.5" [...]
+class org.apache.wiki.auth.AuthorizationManager--><a href="AuthorizationManager.html" target="_top" title="AuthorizationManager.html" xlink:actuate="onRequest" xlink:href="AuthorizationManager.html" xlink:show="new" xlink:title="AuthorizationManager.html" xlink:type="simple"><rect codeLine="56" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="252.875" id="org.apache.wiki.auth.AuthorizationManager" style="stroke:#A80036;stroke-width:1.5;" width="369" x="1311.5" y="244"/><ellipse cx="1 [...]
+class org.apache.wiki.auth.DefaultUserManager--><a href="DefaultUserManager.html" target="_top" title="DefaultUserManager.html" xlink:actuate="onRequest" xlink:href="DefaultUserManager.html" xlink:show="new" xlink:title="DefaultUserManager.html" xlink:type="simple"><rect codeLine="75" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="163.2422" id="org.apache.wiki.auth.DefaultUserManager" style="stroke:#A80036;stroke-width:1.5;" width="367" x="278.5" y="628.5"/><ellipse cx="393.25" cy= [...]
+class org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><a href="DefaultUserManager.JSONUserModule.html" target="_top" title="DefaultUserManager.JSONUserModule.html" xlink:actuate="onRequest" xlink:href="DefaultUserManager.JSONUserModule.html" xlink:show="new" xlink:title="DefaultUserManager.JSONUserModule.html" xlink:type="simple"><rect codeLine="87" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="99.2188" id="org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="st [...]
+class org.apache.wiki.auth.GroupPrincipal--><a href="GroupPrincipal.html" target="_top" title="GroupPrincipal.html" xlink:actuate="onRequest" xlink:href="GroupPrincipal.html" xlink:show="new" xlink:title="GroupPrincipal.html" xlink:type="simple"><rect codeLine="94" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="73.6094" id="org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.5;" width="151" x="1715.5" y="333.5"/><ellipse cx="1743.1" cy="349.5" fill="#ADD1B2" r [...]
+class org.apache.wiki.auth.DefaultAuthorizationManager--><a href="DefaultAuthorizationManager.html" target="_top" title="DefaultAuthorizationManager.html" xlink:actuate="onRequest" xlink:href="DefaultAuthorizationManager.html" xlink:show="new" xlink:title="DefaultAuthorizationManager.html" xlink:type="simple"><rect codeLine="99" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="163.2422" id="org.apache.wiki.auth.DefaultAuthorizationManager" style="stroke:#A80036;stroke-width:1.5;" wid [...]
+class org.apache.wiki.auth.WikiPrincipal--><a href="WikiPrincipal.html" target="_top" title="WikiPrincipal.html" xlink:actuate="onRequest" xlink:href="WikiPrincipal.html" xlink:show="new" xlink:title="WikiPrincipal.html" xlink:type="simple"><rect codeLine="111" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="188.8516" id="org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.5;" width="245" x="1901.5" y="276"/><ellipse cx="1981.25" cy="292" fill="#ADD1B2" rx="11"  [...]
+class org.apache.wiki.auth.AuthenticationManager--><a href="AuthenticationManager.html" target="_top" title="AuthenticationManager.html" xlink:actuate="onRequest" xlink:href="AuthenticationManager.html" xlink:show="new" xlink:title="AuthenticationManager.html" xlink:type="simple"><rect codeLine="125" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="291.2891" id="org.apache.wiki.auth.AuthenticationManager" style="stroke:#A80036;stroke-width:1.5;" width="595" x="681.5" y="225"/><ellips [...]
+class org.apache.wiki.auth.UserManager--><a href="UserManager.html" target="_top" title="UserManager.html" xlink:actuate="onRequest" xlink:href="UserManager.html" xlink:show="new" xlink:title="UserManager.html" xlink:type="simple"><rect codeLine="147" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="201.6563" id="org.apache.wiki.auth.UserManager" style="stroke:#A80036;stroke-width:1.5;" width="368" x="278" y="269.5"/><ellipse cx="416.25" cy="285.5" fill="#B4A7E5" rx="11" ry="11" styl [...]
+class org.apache.wiki.auth.WikiSecurityException--><a href="WikiSecurityException.html" target="_top" title="WikiSecurityException.html" xlink:actuate="onRequest" xlink:href="WikiSecurityException.html" xlink:show="new" xlink:title="WikiSecurityException.html" xlink:type="simple"><rect codeLine="162" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="73.6094" id="org.apache.wiki.auth.WikiSecurityException" style="stroke:#A80036;stroke-width:1.5;" width="256" x="2182" y="333.5"/><ellips [...]
+class org.apache.wiki.auth.SessionMonitor--><a href="SessionMonitor.html" target="_top" title="SessionMonitor.html" xlink:actuate="onRequest" xlink:href="SessionMonitor.html" xlink:show="new" xlink:title="SessionMonitor.html" xlink:type="simple"><rect codeLine="167" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="214.4609" id="org.apache.wiki.auth.SessionMonitor" style="stroke:#A80036;stroke-width:1.5;" width="304" x="2473" y="263.5"/><ellipse cx="2572.75" cy="279.5" fill="#ADD1B2"  [...]
+class org.apache.wiki.api.engine.Initializable--><a href="../api/engine/Initializable.html" target="_top" title="../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../api/engine/Initializable.html" xlink:show="new" xlink:title="../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="204" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="871" [...]
+class org.apache.wiki.auth.user.UserDatabase--><rect fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="48" id="org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="122" x="100" y="919.5"/><ellipse cx="115" cy="935.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M117.9688,941.1406 Q117.3906,941.4375 116.75,941.5781 Q116.1094,941.7344 115.4063,941.7344 Q112.9063,941.7344 111.5781,940.0938 Q110.2656,938.4375 110.2656 [...]
+class org.apache.wiki.ajax.WikiAjaxServlet--><a href="../ajax/WikiAjaxServlet.html" target="_top" title="../ajax/WikiAjaxServlet.html" xlink:actuate="onRequest" xlink:href="../ajax/WikiAjaxServlet.html" xlink:show="new" xlink:title="../ajax/WikiAjaxServlet.html" xlink:type="simple"><rect codeLine="210" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="73.6094" id="org.apache.wiki.ajax.WikiAjaxServlet" style="stroke:#A80036;stroke-width:1.5;" width="461" x="3106.5" y="673"/><ellipse cx [...]
+class java.security.Principal--><rect codeLine="217" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="73.6094" id="java.security.Principal" style="stroke:#A80036;stroke-width:1.5;" width="170" x="1666" y="41"/><ellipse cx="1720.75" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1716.6719,52.7656 L1716.6719,50.6094 L1724.0625,50.6094 L1724.0625,52.7656 L1721.5938,52.7656 L1721.5938,60.8438 L1724.0625,60.8438 L1724.0625,63 L1716.6719,63 L1716 [...]
+class java.io.Serializable--><rect codeLine="224" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="1892.5" y="54"/><ellipse cx="1907.5" cy="70" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1903.4219,65.7656 L1903.4219,63.6094 L1910.8125,63.6094 L1910.8125,65.7656 L1908.3438,65.7656 L1908.3438,73.8438 L1910.8125,73.8438 L1910.8125,76 L1903.4219,76 L1903.4219,73.8 [...]
+class java.lang.Comparable--><rect codeLine="228" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="60.8047" id="java.lang.Comparable" style="stroke:#A80036;stroke-width:1.5;" width="127" x="2052.5" y="47.5"/><ellipse cx="2071.55" cy="63.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M2067.4719,59.2656 L2067.4719,57.1094 L2074.8625,57.1094 L2074.8625,59.2656 L2072.3938,59.2656 L2072.3938,67.3438 L2074.8625,67.3438 L2074.8625,69.5 L2067.4719,69.5 L [...]
+class org.apache.wiki.api.exceptions.WikiException--><a href="../api/exceptions/WikiException.html" target="_top" title="../api/exceptions/WikiException.html" xlink:actuate="onRequest" xlink:href="../api/exceptions/WikiException.html" xlink:show="new" xlink:title="../api/exceptions/WikiException.html" xlink:type="simple"><rect codeLine="234" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="48" id="org.apache.wiki.api.exceptions.WikiException" style="stroke:#A80036;stroke-width:1.5;"  [...]
+class javax.servlet.http.HttpSessionListener--><rect codeLine="239" fill="#FEFECE" filter="url(#f1pkc0kzcc41hm)" height="73.6094" id="javax.servlet.http.HttpSessionListener" style="stroke:#A80036;stroke-width:1.5;" width="264" x="2521" y="41"/><ellipse cx="2586.75" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M2582.6719,52.7656 L2582.6719,50.6094 L2590.0625,50.6094 L2590.0625,52.7656 L2587.5938,52.7656 L2587.5938,60.8438 L2590.0625,60.8438 L25 [...]
+reverse link org.apache.wiki.auth.AuthenticationManager to org.apache.wiki.auth.DefaultAuthenticationManager--><path codeLine="183" d="M979.49,536.38 C979.56,559.02 979.62,581.76 979.69,602.95 " fill="none" id="org.apache.wiki.auth.AuthenticationManager-backto-org.apache.wiki.auth.DefaultAuthenticationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="972.49,536.12,979.43,516.1,986.49,536.08,972.49,536.12" style="stroke:#A80036;stroke [...]
+reverse link org.apache.wiki.auth.WikiSecurityException to org.apache.wiki.auth.NoSuchPrincipalException--><path codeLine="184" d="M2310,427.85 C2310,500.08 2310,622.67 2310,679.03 " fill="none" id="org.apache.wiki.auth.WikiSecurityException-backto-org.apache.wiki.auth.NoSuchPrincipalException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2303,427.62,2310,407.62,2317,427.62,2303,427.62" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[61591a8d79d564c97a0e9c15f [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.AuthorizationManager--><path codeLine="185" d="M1107.04,93.3 C1166.88,104.12 1237.26,123.03 1294,156 C1332.93,178.63 1369.03,211.02 1399.62,243.77 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.AuthorizationManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1105.74,100.18,1087.19,89.93,1108.08,86.38,1105.74,100.18" style="stroke:#A80036;stroke [...]
+reverse link org.apache.wiki.auth.UserManager to org.apache.wiki.auth.DefaultUserManager--><path codeLine="186" d="M462,491.9 C462,537.16 462,587.48 462,628.28 " fill="none" id="org.apache.wiki.auth.UserManager-backto-org.apache.wiki.auth.DefaultUserManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="455,491.85,462,471.85,469,491.85,455,491.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ef27b81832d8b33659859a3fd124d42d]
+link org.apache.wiki.auth.DefaultUserManager to org.apache.wiki.auth.user.UserDatabase--><path codeLine="187" d="M357.15,791.64 C300.51,835.2 234.34,886.09 195.15,916.24 " fill="none" id="org.apache.wiki.auth.DefaultUserManager-to-org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="190.97,919.45,200.5469,917.1514,194.939,916.409,195.6813,910.8011,190.97,919.45" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" fon [...]
+reverse link org.apache.wiki.ajax.WikiAjaxServlet to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="188" d="M3246.31,755.38 C3194.75,778.32 3128.24,804.14 3066,817 C2693.42,894 1734.31,847.08 1355,876.5 C1251.41,884.54 1137.24,897.64 1040.13,910.05 " fill="none" id="org.apache.wiki.ajax.WikiAjaxServlet-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="324 [...]
+reverse link org.apache.wiki.auth.DefaultUserManager to org.apache.wiki.auth.DefaultUserManager.JSONUserModule--><path codeLine="189" d="M595.18,800.11 C642.79,831.96 694.66,866.67 735.27,893.84 " fill="none" id="org.apache.wiki.auth.DefaultUserManager-backto-org.apache.wiki.auth.DefaultUserManager.JSONUserModule" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="589.1829" cy="796.0829" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A8003 [...]
+reverse link java.security.Principal to org.apache.wiki.auth.GroupPrincipal--><path codeLine="190" d="M1758.74,135.21 C1766.79,193.71 1779.17,283.58 1786.02,333.3 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1751.78,135.97,1755.99,115.2,1765.65,134.06,1751.78,135.97" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[296ff7e5d1ef75d18adc80e02449a383]
+reverse link java.io.Serializable to org.apache.wiki.auth.GroupPrincipal--><path codeLine="191" d="M1910.78,117.71 C1901.46,129.56 1891.77,142.93 1884,156 C1848.88,215.08 1819.39,289.84 1803.54,333.41 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.GroupPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1905.39,113.24,1923.45,102.16,1916.24,122.09,1905.39,113.24" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ [...]
+reverse link org.apache.wiki.auth.AuthorizationManager to org.apache.wiki.auth.DefaultAuthorizationManager--><path codeLine="192" d="M1497.73,517.2 C1498.18,555.27 1498.65,594.94 1499.04,628.25 " fill="none" id="org.apache.wiki.auth.AuthorizationManager-backto-org.apache.wiki.auth.DefaultAuthorizationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1490.73,517.25,1497.49,497.17,1504.73,517.09,1490.73,517.25" style="stroke:#A80036;st [...]
+link org.apache.wiki.auth.DefaultAuthorizationManager to org.apache.wiki.auth.Authorizer--><path codeLine="193" d="M1500,791.64 C1500,823.7 1500,859.74 1500,888.54 " fill="none" id="org.apache.wiki.auth.DefaultAuthorizationManager-to-org.apache.wiki.auth.Authorizer" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1500,893.84,1504,884.84,1500,888.84,1496,884.84,1500,893.84" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" fo [...]
+reverse link java.security.Principal to org.apache.wiki.auth.WikiPrincipal--><path codeLine="194" d="M1844.51,125.6 C1858.53,134.66 1872.22,144.86 1884,156 C1920.23,190.27 1951.65,235.65 1975.5,275.76 " fill="none" id="java.security.Principal-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1840.77,131.51,1827.35,115.11,1848.07,119.56,1840.77,131.51" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5 [...]
+reverse link java.lang.Comparable to org.apache.wiki.auth.WikiPrincipal--><path codeLine="195" d="M2100.47,128.04 C2087.69,168.39 2069.21,226.73 2053.62,275.96 " fill="none" id="java.lang.Comparable-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2093.87,125.68,2106.59,108.72,2107.22,129.9,2093.87,125.68" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ec8e80d48d4435410905123bd859e267]
+reverse link java.io.Serializable to org.apache.wiki.auth.WikiPrincipal--><path codeLine="196" d="M1955.78,121.78 C1966.9,162.15 1983.94,224.04 1998.21,275.86 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.WikiPrincipal" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1948.97,123.42,1950.41,102.28,1962.47,119.71,1948.97,123.42" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[349cb1d3cc3a09d1afca115e056ef158]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.AuthenticationManager--><path codeLine="197" d="M979,128.83 C979,155.64 979,190.24 979,224.79 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.AuthenticationManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="972,128.72,979,108.72,986,128.72,972,128.72" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b986c65e3b200e485ed26a9e909b8bd0]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.UserManager--><path codeLine="198" d="M850.96,93.3 C791.12,104.12 720.74,123.03 664,156 C614.92,184.52 570.35,228.57 535.64,269.27 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.auth.UserManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="849.92,86.38,870.81,89.93,852.26,100.18,849.92,86.38" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b8e8c2f [...]
+reverse link org.apache.wiki.api.exceptions.WikiException to org.apache.wiki.auth.WikiSecurityException--><path codeLine="199" d="M2310,122.3 C2310,179.61 2310,279.62 2310,333.19 " fill="none" id="org.apache.wiki.api.exceptions.WikiException-backto-org.apache.wiki.auth.WikiSecurityException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="2303,122.28,2310,102.28,2317,122.28,2303,122.28" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[9573032af22ab7a4aa75816553c8475a]
+reverse link javax.servlet.http.HttpSessionListener to org.apache.wiki.auth.SessionMonitor--><path codeLine="200" d="M2647.57,135.31 C2644.07,171.61 2639.41,219.95 2635.24,263.28 " fill="none" id="javax.servlet.http.HttpSessionListener-backto-org.apache.wiki.auth.SessionMonitor" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="2640.62,134.44,2649.51,115.2,2654.56,135.78,2640.62,134.44" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#8 [...]
 @startuml
     namespace org.apache.wiki.auth {
 
-        class DefaultAuthenticationManager [[DefaultAuthenticationManager.html]] {
-            {static} #EMPTY_MAP: Map<String, String>
-            #m_loginModuleClass: Class<? extends LoginModule>
-            #m_loginModuleOptions: Map<String, String>
-            +initialize(Engine, Properties): void
-            +isContainerAuthenticated(): boolean
-            +login(HttpServletRequest): boolean
-            +login(Session, HttpServletRequest, String, String): boolean
-            +logout(HttpServletRequest): void
-            +allowsCookieAssertions(): boolean
-            +allowsCookieAuthentication(): boolean
-            +doJAASLogin(Class<? extends LoginModule>, CallbackHandler, Map<String, String>): Set<Principal>
-            +addWikiEventListener(WikiEventListener): void
-            +removeWikiEventListener(WikiEventListener): void
-        }
-
-        class SessionMonitor [[SessionMonitor.html]] {
-            +SessionMonitor()
-            {static} +getInstance(Engine): SessionMonitor
-            +find(HttpSession): Session
-            +find(String): Session
-            +remove(HttpServletRequest): void
-            +remove(HttpSession): void
-            +sessions(): int
-            +userPrincipals(): Principal[]
-            +addWikiEventListener(WikiEventListener): void
-            +removeWikiEventListener(WikiEventListener): void
-            #fireEvent(int, Principal, Session): void
-            +sessionCreated(HttpSessionEvent): void
-            +sessionDestroyed(HttpSessionEvent): void
-        }
-
-        interface UserManager [[UserManager.html]] {
-            {static} +PROP_DATABASE: String
-            {static} +JSON_USERS: String
-            {abstract} +getUserDatabase(): UserDatabase
-            {abstract} +getUserProfile(Session): UserProfile
-            {abstract} +setUserProfile(Context, UserProfile): void
-            {abstract} +startUserProfileCreationWorkflow(Context, UserProfile): void
-            {abstract} +parseProfile(Context): UserProfile
-            {abstract} +validateProfile(Context, UserProfile): void
-            {abstract} +listWikiNames(): Principal[]
-            {abstract} +addWikiEventListener(WikiEventListener): void
-            {abstract} +removeWikiEventListener(WikiEventListener): void
-            +fireEvent(int, Session, Object): void
-        }
-
-        class GroupPrincipal [[GroupPrincipal.html]] {
-            +GroupPrincipal(String)
-            +getName(): String
-        }
-
-        class WikiPrincipal [[WikiPrincipal.html]] {
-            {static} +GUEST: Principal
-            {static} +FULL_NAME: String
-            {static} +LOGIN_NAME: String
-            {static} +WIKI_NAME: String
-            {static} +UNSPECIFIED: String
-            {static} +COMPARATOR: Comparator<Principal>
-            +WikiPrincipal(String)
-            +WikiPrincipal(String, String)
-            +getName(): String
-            +getType(): String
-            +compareTo(Principal): int
-        }
-
-        class WikiSecurityException [[WikiSecurityException.html]] {
-            +WikiSecurityException(String)
-            +WikiSecurityException(String, Throwable)
-        }
-
         interface Authorizer [[Authorizer.html]] {
             {abstract} +getRoles(): Principal[]
             {abstract} +findRole(String): Principal
@@ -129,22 +58,6 @@ reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.Au
             {abstract} +isUserInRole(Session, Principal): boolean
         }
 
-        class DefaultAuthorizationManager [[DefaultAuthorizationManager.html]] {
-            +checkPermission(Session, Permission): boolean
-            +hasRoleOrPrincipal(Session, Principal): boolean
-            +hasAccess(Context, HttpServletResponse, boolean): boolean
-            +initialize(Engine, Properties): void
-            +allowedByLocalPolicy(Principal[], Permission): boolean
-            +checkStaticPermission(Session, Permission): boolean
-            +resolvePrincipal(String): Principal
-            +addWikiEventListener(WikiEventListener): void
-            +removeWikiEventListener(WikiEventListener): void
-        }
-
-        class NoSuchPrincipalException [[NoSuchPrincipalException.html]] {
-            +NoSuchPrincipalException(String)
-        }
-
         class SecurityVerifier [[SecurityVerifier.html]] {
             {static} +ERROR: String
             {static} +WARNING: String
@@ -171,6 +84,45 @@ reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.Au
             +webContainerRoles(): Principal[]
         }
 
+        class DefaultAuthenticationManager [[DefaultAuthenticationManager.html]] {
+            {static} #EMPTY_MAP: Map<String, String>
+            #m_loginModuleClass: Class<? extends LoginModule>
+            #m_loginModuleOptions: Map<String, String>
+            +initialize(Engine, Properties): void
+            +isContainerAuthenticated(): boolean
+            +login(HttpServletRequest): boolean
+            +login(Session, HttpServletRequest, String, String): boolean
+            +logout(HttpServletRequest): void
+            +allowsCookieAssertions(): boolean
+            +allowsCookieAuthentication(): boolean
+            +doJAASLogin(Class<? extends LoginModule>, CallbackHandler, Map<String, String>): Set<Principal>
+            +addWikiEventListener(WikiEventListener): void
+            +removeWikiEventListener(WikiEventListener): void
+        }
+
+        class NoSuchPrincipalException [[NoSuchPrincipalException.html]] {
+            +NoSuchPrincipalException(String)
+        }
+
+        interface AuthorizationManager [[AuthorizationManager.html]] {
+            {static} +DEFAULT_AUTHORIZER: String
+            {static} +POLICY: String
+            {static} +DEFAULT_POLICY: String
+            {static} +PROP_AUTHORIZER: String
+            {abstract} +checkPermission(Session, Permission): boolean
+            +isUserInRole(Session, Principal): boolean
+            {abstract} +getAuthorizer(): Authorizer
+            {abstract} +hasRoleOrPrincipal(Session, Principal): boolean
+            +hasAccess(Context, HttpServletResponse): boolean
+            {abstract} +hasAccess(Context, HttpServletResponse, boolean): boolean
+            {abstract} +allowedByLocalPolicy(Principal[], Permission): boolean
+            {abstract} +checkStaticPermission(Session, Permission): boolean
+            {abstract} +resolvePrincipal(String): Principal
+            {abstract} +addWikiEventListener(WikiEventListener): void
+            {abstract} +removeWikiEventListener(WikiEventListener): void
+            +fireEvent(int, Principal, Object): void
+        }
+
         class DefaultUserManager [[DefaultUserManager.html]] {
             +initialize(Engine, Properties): void
             +getUserProfile(Session): UserProfile
@@ -190,6 +142,37 @@ reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.Au
             +getUserInfo(String): UserProfile
         }
 
+        class GroupPrincipal [[GroupPrincipal.html]] {
+            +GroupPrincipal(String)
+            +getName(): String
+        }
+
+        class DefaultAuthorizationManager [[DefaultAuthorizationManager.html]] {
+            +checkPermission(Session, Permission): boolean
+            +hasRoleOrPrincipal(Session, Principal): boolean
+            +hasAccess(Context, HttpServletResponse, boolean): boolean
+            +initialize(Engine, Properties): void
+            +allowedByLocalPolicy(Principal[], Permission): boolean
+            +checkStaticPermission(Session, Permission): boolean
+            +resolvePrincipal(String): Principal
+            +addWikiEventListener(WikiEventListener): void
+            +removeWikiEventListener(WikiEventListener): void
+        }
+
+        class WikiPrincipal [[WikiPrincipal.html]] {
+            {static} +GUEST: Principal
+            {static} +FULL_NAME: String
+            {static} +LOGIN_NAME: String
+            {static} +WIKI_NAME: String
+            {static} +UNSPECIFIED: String
+            {static} +COMPARATOR: Comparator<Principal>
+            +WikiPrincipal(String)
+            +WikiPrincipal(String, String)
+            +getName(): String
+            +getType(): String
+            +compareTo(Principal): int
+        }
+
         interface AuthenticationManager [[AuthenticationManager.html]] {
             {static} +PROP_STOREIPADDRESS: String
             {static} +PROP_ALLOW_COOKIE_AUTH: String
@@ -212,50 +195,60 @@ reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.Au
             +fireEvent(int, Principal, Object): void
         }
 
-        interface AuthorizationManager [[AuthorizationManager.html]] {
-            {static} +DEFAULT_AUTHORIZER: String
-            {static} +POLICY: String
-            {static} +DEFAULT_POLICY: String
-            {static} +PROP_AUTHORIZER: String
-            {abstract} +checkPermission(Session, Permission): boolean
-            +isUserInRole(Session, Principal): boolean
-            {abstract} +getAuthorizer(): Authorizer
-            {abstract} +hasRoleOrPrincipal(Session, Principal): boolean
-            +hasAccess(Context, HttpServletResponse): boolean
-            {abstract} +hasAccess(Context, HttpServletResponse, boolean): boolean
-            {abstract} +allowedByLocalPolicy(Principal[], Permission): boolean
-            {abstract} +checkStaticPermission(Session, Permission): boolean
-            {abstract} +resolvePrincipal(String): Principal
+        interface UserManager [[UserManager.html]] {
+            {static} +PROP_DATABASE: String
+            {static} +JSON_USERS: String
+            {abstract} +getUserDatabase(): UserDatabase
+            {abstract} +getUserProfile(Session): UserProfile
+            {abstract} +setUserProfile(Context, UserProfile): void
+            {abstract} +startUserProfileCreationWorkflow(Context, UserProfile): void
+            {abstract} +parseProfile(Context): UserProfile
+            {abstract} +validateProfile(Context, UserProfile): void
+            {abstract} +listWikiNames(): Principal[]
             {abstract} +addWikiEventListener(WikiEventListener): void
             {abstract} +removeWikiEventListener(WikiEventListener): void
-            +fireEvent(int, Principal, Object): void
+            +fireEvent(int, Session, Object): void
+        }
+
+        class WikiSecurityException [[WikiSecurityException.html]] {
+            +WikiSecurityException(String)
+            +WikiSecurityException(String, Throwable)
+        }
+
+        class SessionMonitor [[SessionMonitor.html]] {
+            +SessionMonitor()
+            {static} +getInstance(Engine): SessionMonitor
+            +find(HttpSession): Session
+            +find(String): Session
+            +remove(HttpServletRequest): void
+            +remove(HttpSession): void
+            +sessions(): int
+            +userPrincipals(): Principal[]
+            +addWikiEventListener(WikiEventListener): void
+            +removeWikiEventListener(WikiEventListener): void
+            #fireEvent(int, Principal, Session): void
+            +sessionCreated(HttpSessionEvent): void
+            +sessionDestroyed(HttpSessionEvent): void
         }
 
         AuthenticationManager <|.. DefaultAuthenticationManager
-        javax.servlet.http.HttpSessionListener <|.. SessionMonitor
-        org.apache.wiki.api.engine.Initializable <|- - UserManager
-        java.security.Principal <|.. GroupPrincipal
-        java.io.Serializable <|.. GroupPrincipal
-        java.security.Principal <|.. WikiPrincipal
-        java.lang.Comparable <|.. WikiPrincipal
-        java.io.Serializable <|.. WikiPrincipal
-        org.apache.wiki.api.exceptions.WikiException <|- - WikiSecurityException
-        AuthorizationManager <|.. DefaultAuthorizationManager
-        DefaultAuthorizationManager - -> Authorizer: authorizer
         WikiSecurityException <|- - NoSuchPrincipalException
+        org.apache.wiki.api.engine.Initializable <|- - AuthorizationManager
         UserManager <|.. DefaultUserManager
         DefaultUserManager - -> org.apache.wiki.auth.user.UserDatabase: userDatabase
         org.apache.wiki.ajax.WikiAjaxServlet <|.. org.apache.wiki.auth.DefaultUserManager.JSONUserModule
         DefaultUserManager +- - org.apache.wiki.auth.DefaultUserManager.JSONUserModule
+        java.security.Principal <|.. GroupPrincipal
+        java.io.Serializable <|.. GroupPrincipal
+        AuthorizationManager <|.. DefaultAuthorizationManager
+        DefaultAuthorizationManager - -> Authorizer: authorizer
+        java.security.Principal <|.. WikiPrincipal
+        java.lang.Comparable <|.. WikiPrincipal
+        java.io.Serializable <|.. WikiPrincipal
         org.apache.wiki.api.engine.Initializable <|- - AuthenticationManager
-        org.apache.wiki.api.engine.Initializable <|- - AuthorizationManager
-    }
-
-    namespace javax.servlet.http {
-        interface HttpSessionListener {
-            {abstract} +sessionCreated(HttpSessionEvent): void
-            {abstract} +sessionDestroyed(HttpSessionEvent): void
-        }
+        org.apache.wiki.api.engine.Initializable <|- - UserManager
+        org.apache.wiki.api.exceptions.WikiException <|- - WikiSecurityException
+        javax.servlet.http.HttpSessionListener <|.. SessionMonitor
     }
 
     namespace org.apache.wiki.api.engine {
@@ -264,6 +257,13 @@ reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.Au
         }
     }
 
+    namespace org.apache.wiki.ajax {
+        interface WikiAjaxServlet [[../ajax/WikiAjaxServlet.html]] {
+            {abstract} +getServletMapping(): String
+            {abstract} +service(HttpServletRequest, HttpServletResponse, String, List<String>): void
+        }
+    }
+
     namespace java.security {
         interface Principal {
             {abstract} +getName(): String
@@ -286,10 +286,10 @@ reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.auth.Au
         }
     }
 
-    namespace org.apache.wiki.ajax {
-        interface WikiAjaxServlet [[../ajax/WikiAjaxServlet.html]] {
-            {abstract} +getServletMapping(): String
-            {abstract} +service(HttpServletRequest, HttpServletResponse, String, List<String>): void
+    namespace javax.servlet.http {
+        interface HttpSessionListener {
+            {abstract} +sessionCreated(HttpSessionEvent): void
+            {abstract} +sessionDestroyed(HttpSessionEvent): void
         }
     }
 
@@ -302,5 +302,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/AllPermission.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/AllPermission.svg
index d1a7ac764f..d5a0266a19 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/AllPermission.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/AllPermission.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.permissions.AllPermission--><a href="AllPermission.ht
 class java.security.Permission--><rect codeLine="13" fill="#FEFECE" filter="url(#fqz8rx6asqa7z)" height="71.5469" id="java.security.Permission" style="stroke:#A80036;stroke-width:1.5;" width="189" x="7" y="7"/><ellipse cx="60.75" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M60.8594,21.3125 L59.7031,26.3906 L62.0313,26.3906 L60.8594,21.3125 Z M59.375,19.0781 L62.3594,19.0781 L65.7188,31.4688 L63.2656,31.4688 L62.5,28.4063 L59.2188,28.4063 [...]
 class java.io.Serializable--><rect codeLine="17" fill="#FEFECE" filter="url(#fqz8rx6asqa7z)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="231.5" y="24"/><ellipse cx="246.5" cy="42.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M242.4219,38.7344 L242.4219,36.5781 L249.8125,36.5781 L249.8125,38.7344 L247.3438,38.7344 L247.3438,46.8125 L249.8125,46.8125 L249.8125,48.9688 L242.4219,48.9688 L242.421 [...]
 reverse link java.security.Permission to org.apache.wiki.auth.permissions.AllPermission--><path codeLine="19" d="M133.97,96.58 C142.46,110.33 151.62,125.18 160.16,139 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="127.85,100.01,123.3,79.31,139.77,92.65,127.85,100.01" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[18576e9016d19de10edb469d9959344c]
-reverse link java.io.Serializable to org.apache.wiki.auth.permissions.AllPermission--><path codeLine="20" d="M263.68,79.35 C252.69,97.14 239.13,119.1 226.87,138.96 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="257.76,75.61,274.22,62.27,269.67,82.97,257.76,75.61" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-seri [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.permissions.AllPermission--><path codeLine="20" d="M263.68,79.35 C252.69,97.14 239.13,119.1 226.87,138.96 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="257.76,75.61,274.22,62.27,269.67,82.97,257.76,75.61" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-seri [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -35,5 +35,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/AllPermissionCollection.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/AllPermissionCollection.svg
index b409913bc1..0dc386efc6 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/AllPermissionCollection.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/AllPermissionCollection.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="312px" preserveAspectRatio="none" style="width:356px;height:312px;background:#FFFFFF;" version="1.1" viewBox="0 0 356 312" width="356px" zoomAndPan="magnify"><defs><filter height="300%" id="f1g0b49mtgv05g" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.permissions.AllPermissionCollection--><a href="AllPermissionCollection.html" target="_top" title="AllPermissionCollection.html" xlink:actuate="onRequest" xlink:href="AllPermissionCollection.html" xlink:show="new" xlink:title="AllPermissionCollection.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1g0b49mtgv05g)" height="130.7656" id="org.apache.wiki.auth.permissions.AllPermissionCollection" style="stroke:#A80036;stroke-width:1.5;" widt [...]
 class java.security.PermissionCollection--><rect codeLine="14" fill="#FEFECE" filter="url(#f1g0b49mtgv05g)" height="84.3516" id="java.security.PermissionCollection" style="stroke:#A80036;stroke-width:1.5;" width="246" x="52.5" y="7"/><ellipse cx="100.75" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M100.8594,21.3125 L99.7031,26.3906 L102.0313,26.3906 L100.8594,21.3125 Z M99.375,19.0781 L102.3594,19.0781 L105.7188,31.4688 L103.2656,31.4688 [...]
-reverse link java.security.PermissionCollection to org.apache.wiki.auth.permissions.AllPermissionCollection--><path codeLine="20" d="M175.5,111.41 C175.5,124.28 175.5,137.9 175.5,150.89 " fill="none" id="java.security.PermissionCollection-backto-org.apache.wiki.auth.permissions.AllPermissionCollection" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="168.5,111.34,175.5,91.34,182.5,111.34,168.5,111.34" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" fo [...]
+reverse link java.security.PermissionCollection to org.apache.wiki.auth.permissions.AllPermissionCollection--><path codeLine="20" d="M175.5,111.41 C175.5,124.28 175.5,137.9 175.5,150.89 " fill="none" id="java.security.PermissionCollection-backto-org.apache.wiki.auth.permissions.AllPermissionCollection" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="168.5,111.34,175.5,91.34,182.5,111.34,168.5,111.34" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" fo [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/GroupPermission.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/GroupPermission.svg
index da64451f7f..822d751c8f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/GroupPermission.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/GroupPermission.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.permissions.GroupPermission--><a href="GroupPermissio
 class java.security.Permission--><rect codeLine="20" fill="#FEFECE" filter="url(#f1h9x38vtfgdn1)" height="71.5469" id="java.security.Permission" style="stroke:#A80036;stroke-width:1.5;" width="189" x="7" y="7"/><ellipse cx="60.75" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M60.8594,21.3125 L59.7031,26.3906 L62.0313,26.3906 L60.8594,21.3125 Z M59.375,19.0781 L62.3594,19.0781 L65.7188,31.4688 L63.2656,31.4688 L62.5,28.4063 L59.2188,28.406 [...]
 class java.io.Serializable--><rect codeLine="24" fill="#FEFECE" filter="url(#f1h9x38vtfgdn1)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="231.5" y="24"/><ellipse cx="246.5" cy="42.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M242.4219,38.7344 L242.4219,36.5781 L249.8125,36.5781 L249.8125,38.7344 L247.3438,38.7344 L247.3438,46.8125 L249.8125,46.8125 L249.8125,48.9688 L242.4219,48.9688 L242.42 [...]
 reverse link java.security.Permission to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="26" d="M126.47,97.74 C132.44,110.58 139,124.71 145.62,138.96 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="120.03,100.49,117.95,79.4,132.72,94.59,120.03,100.49" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2edc9f879d22b51b179c57c49d24f2ad]
-reverse link java.io.Serializable to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="27" d="M268.46,80.66 C260.73,97.31 251.15,117.93 241.45,138.8 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="262.23,77.46,277.01,62.27,274.93,83.36,262.23,77.46" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans- [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="27" d="M268.46,80.66 C260.73,97.31 251.15,117.93 241.45,138.8 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="262.23,77.46,277.01,62.27,274.93,83.36,262.23,77.46" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans- [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -42,5 +42,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/PagePermission.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/PagePermission.svg
index e354339318..13a88e8039 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/PagePermission.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/PagePermission.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.permissions.PagePermission--><a href="PagePermission.
 class java.security.Permission--><rect codeLine="29" fill="#FEFECE" filter="url(#f1scxsh99ui4e4)" height="71.5469" id="java.security.Permission" style="stroke:#A80036;stroke-width:1.5;" width="189" x="7" y="7"/><ellipse cx="60.75" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M60.8594,21.3125 L59.7031,26.3906 L62.0313,26.3906 L60.8594,21.3125 Z M59.375,19.0781 L62.3594,19.0781 L65.7188,31.4688 L63.2656,31.4688 L62.5,28.4063 L59.2188,28.406 [...]
 class java.io.Serializable--><rect codeLine="33" fill="#FEFECE" filter="url(#f1scxsh99ui4e4)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="231.5" y="24"/><ellipse cx="246.5" cy="42.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M242.4219,38.7344 L242.4219,36.5781 L249.8125,36.5781 L249.8125,38.7344 L247.3438,38.7344 L247.3438,46.8125 L249.8125,46.8125 L249.8125,48.9688 L242.4219,48.9688 L242.42 [...]
 reverse link java.security.Permission to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="35" d="M120.98,98.09 C125.45,110.51 130.43,124.34 135.62,138.77 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="114.39,100.45,114.2,79.26,127.56,95.7,114.39,100.45" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d619c41edea7e5ef02391fcb45630f57]
-reverse link java.io.Serializable to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="36" d="M272.06,81.34 C266.26,97.42 259.06,117.43 251.38,138.76 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="265.52,78.82,278.88,62.37,278.69,83.56,265.52,78.82" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-s [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="36" d="M272.06,81.34 C266.26,97.42 259.06,117.43 251.38,138.76 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="265.52,78.82,278.88,62.37,278.69,83.56,265.52,78.82" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-s [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -51,5 +51,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/PermissionFactory.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/PermissionFactory.svg
index ed7c3b8afc..cc36c750a6 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/PermissionFactory.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/PermissionFactory.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="103px" preserveAspectRatio="none" style="width:341px;height:103px;background:#FFFFFF;" version="1.1" viewBox="0 0 341 103" width="341px" zoomAndPan="magnify"><defs><filter height="300%" id="f70e749y3m9mr" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.auth.permissions.PermissionFactory--><a href="PermissionFactory.html" target="_top" title="PermissionFactory.html" xlink:actuate="onRequest" xlink:href="PermissionFactory.html" xlink:show="new" xlink:title="PermissionFactory.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f70e749y3m9mr)" height="71.5469" id="org.apache.wiki.auth.permissions.PermissionFactory" style="stroke:#A80036;stroke-width:1.5;" width="320" x="7" y="7"/><ellipse cx="83.2 [...]
+class org.apache.wiki.auth.permissions.PermissionFactory--><a href="PermissionFactory.html" target="_top" title="PermissionFactory.html" xlink:actuate="onRequest" xlink:href="PermissionFactory.html" xlink:show="new" xlink:title="PermissionFactory.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f70e749y3m9mr)" height="71.5469" id="org.apache.wiki.auth.permissions.PermissionFactory" style="stroke:#A80036;stroke-width:1.5;" width="320" x="7" y="7"/><ellipse cx="83.2 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -19,5 +19,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/WikiPermission.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/WikiPermission.svg
index b7f3c6d2b3..262bf02f7b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/WikiPermission.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/WikiPermission.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.auth.permissions.WikiPermission--><a href="WikiPermission.
 class java.security.Permission--><rect codeLine="24" fill="#FEFECE" filter="url(#fnjp1fr4xra7k)" height="71.5469" id="java.security.Permission" style="stroke:#A80036;stroke-width:1.5;" width="189" x="7" y="7"/><ellipse cx="60.75" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M60.8594,21.3125 L59.7031,26.3906 L62.0313,26.3906 L60.8594,21.3125 Z M59.375,19.0781 L62.3594,19.0781 L65.7188,31.4688 L63.2656,31.4688 L62.5,28.4063 L59.2188,28.4063 [...]
 class java.io.Serializable--><rect codeLine="28" fill="#FEFECE" filter="url(#fnjp1fr4xra7k)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="231.5" y="24"/><ellipse cx="246.5" cy="42.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M242.4219,38.7344 L242.4219,36.5781 L249.8125,36.5781 L249.8125,38.7344 L247.3438,38.7344 L247.3438,46.8125 L249.8125,46.8125 L249.8125,48.9688 L242.4219,48.9688 L242.421 [...]
 reverse link java.security.Permission to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="30" d="M123.7,97.94 C128.88,110.53 134.62,124.46 140.51,138.78 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="117.22,100.57,116.08,79.41,130.16,95.24,117.22,100.57" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d6e9238b66a22e0c2f11ca76f4865634]
-reverse link java.io.Serializable to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="31" d="M270.28,80.98 C263.54,97.36 255.16,117.69 246.45,138.86 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="263.89,78.12,277.97,62.29,276.83,83.45,263.89,78.12" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-s [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="31" d="M270.28,80.98 C263.54,97.36 255.16,117.69 246.45,138.86 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="263.89,78.12,277.97,62.29,276.83,83.45,263.89,78.12" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-s [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -46,5 +46,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/package.svg
index 53231232db..a158e42fa3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/permissions/package.svg
@@ -1,31 +1,53 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="477px" preserveAspectRatio="none" style="width:2343px;height:477px;background:#FFFFFF;" version="1.1" viewBox="0 0 2343 477" width="2343px" zoomAndPan="magnify"><defs><filter height="300%" id="f7u3or4ua6fh2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
-cluster org.apache.wiki.auth.permissions--><polygon fill="#FFFFFF" filter="url(#f7u3or4ua6fh2)" points="16,176,288,176,295,198.2969,2326,198.2969,2326,454,16,454,16,176" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="295" y1="198.2969" y2="198.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="266" x="20" y="190.9951">org.apache.wiki.auth.permissions</text><!--MD5= [...]
-cluster java.security--><polygon fill="#FFFFFF" filter="url(#f7u3or4ua6fh2)" points="1007,6,1113,6,1120,28.2969,1510,28.2969,1510,143,1007,143,1007,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1007" x2="1120" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="1011" y="20.9951">java.security</text><!--MD5=[0d852700fdad35b7061d461d6907a324]
-cluster java.io--><polygon fill="#FFFFFF" filter="url(#f7u3or4ua6fh2)" points="1595,25,1651,25,1658,47.2969,1731,47.2969,1731,124,1595,124,1595,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1595" x2="1658" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="1599" y="39.9951">java.io</text><!--MD5=[7a2e4b7cb3381e6eec1962ce1fdc6335]
-class org.apache.wiki.auth.permissions.WikiPermission--><a href="WikiPermission.html" target="_top" title="WikiPermission.html" xlink:actuate="onRequest" xlink:href="WikiPermission.html" xlink:show="new" xlink:title="WikiPermission.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="188.8516" id="org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.5;" width="303" x="354.5" y="230"/><ellipse cx="455.75" cy="246 [...]
-class org.apache.wiki.auth.permissions.AllPermissionCollection--><a href="AllPermissionCollection.html" target="_top" title="AllPermissionCollection.html" xlink:actuate="onRequest" xlink:href="AllPermissionCollection.html" xlink:show="new" xlink:title="AllPermissionCollection.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="124.8281" id="org.apache.wiki.auth.permissions.AllPermissionCollection" style="stroke:#A80036;stroke-width:1.5;" widt [...]
-class org.apache.wiki.auth.permissions.GroupPermission--><a href="GroupPermission.html" target="_top" title="GroupPermission.html" xlink:actuate="onRequest" xlink:href="GroupPermission.html" xlink:show="new" xlink:title="GroupPermission.html" xlink:type="simple"><rect codeLine="26" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="163.2422" id="org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.5;" width="209" x="32.5" y="243"/><ellipse cx="79.75" cy [...]
-class org.apache.wiki.auth.permissions.PermissionFactory--><a href="PermissionFactory.html" target="_top" title="PermissionFactory.html" xlink:actuate="onRequest" xlink:href="PermissionFactory.html" xlink:show="new" xlink:title="PermissionFactory.html" xlink:type="simple"><rect codeLine="38" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="73.6094" id="org.apache.wiki.auth.permissions.PermissionFactory" style="stroke:#A80036;stroke-width:1.5;" width="320" x="849" y="287.5"/><ellipse c [...]
-class org.apache.wiki.auth.permissions.PagePermission--><a href="PagePermission.html" target="_top" title="PagePermission.html" xlink:actuate="onRequest" xlink:href="PagePermission.html" xlink:show="new" xlink:title="PagePermission.html" xlink:type="simple"><rect codeLine="43" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="227.2656" id="org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.5;" width="303" x="1572.5" y="211"/><ellipse cx="1669.75" cy=" [...]
-class org.apache.wiki.auth.permissions.AllPermission--><a href="AllPermission.html" target="_top" title="AllPermission.html" xlink:actuate="onRequest" xlink:href="AllPermission.html" xlink:show="new" xlink:title="AllPermission.html" xlink:type="simple"><rect codeLine="60" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="112.0234" id="org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.5;" width="303" x="2006.5" y="268.5"/><ellipse cx="2112.75" cy="284. [...]
-class java.security.Permission--><rect codeLine="83" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="73.6094" id="java.security.Permission" style="stroke:#A80036;stroke-width:1.5;" width="189" x="1023.5" y="47"/><ellipse cx="1081.25" cy="63" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1081.3594,58.3438 L1080.2031,63.4219 L1082.5313,63.4219 L1081.3594,58.3438 Z M1079.875,56.1094 L1082.8594,56.1094 L1086.2188,68.5 L1083.7656,68.5 L1083,65.4375 L10 [...]
-class java.security.PermissionCollection--><rect codeLine="87" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="86.4141" id="java.security.PermissionCollection" style="stroke:#A80036;stroke-width:1.5;" width="246" x="1248" y="41"/><ellipse cx="1303.75" cy="57" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1303.8594,52.3438 L1302.7031,57.4219 L1305.0313,57.4219 L1303.8594,52.3438 Z M1302.375,50.1094 L1305.3594,50.1094 L1308.7188,62.5 L1306.2656,62.5 [...]
-class java.io.Serializable--><rect codeLine="95" fill="#FEFECE" filter="url(#f7u3or4ua6fh2)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="1611.5" y="60"/><ellipse cx="1626.5" cy="76" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1622.4219,71.7656 L1622.4219,69.6094 L1629.8125,69.6094 L1629.8125,71.7656 L1627.3438,71.7656 L1627.3438,79.8438 L1629.8125,79.8438 L1629.8125,82 L1622.4219,82 L1622.4219,79.843 [...]
-reverse link java.security.Permission to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="68" d="M1003.97,113.52 C951.02,127.92 887.61,146.83 832,168 C773.84,190.14 711.77,218.49 657.57,244.9 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1002.22,106.74,1023.35,108.32,1005.85,120.26,1002.22,106.74" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d [...]
-reverse link java.io.Serializable to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="69" d="M1603.55,116.95 C1575.93,130.13 1542.14,143.94 1510,151 C1362.79,183.33 978.57,132.9 832,168 C772.54,182.24 711.09,208.19 657.78,234.86 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1600.56,110.62,1621.59,108.02,1606.77,123.17,1600.56,11 [...]
-link org.apache.wiki.auth.permissions.WikiPermission to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="70" d="M657.84,297.14 C678.63,301.69 692.5,310.81 692.5,324.5 C692.5,337.02 680.91,345.71 663.04,350.59 " fill="none" id="org.apache.wiki.auth.permissions.WikiPermission-to-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="657.84,351.86,667.5319,353.6115,662.6974,350.6742,665.6346,345.8397,657.84 [...]
-reverse link java.security.PermissionCollection to org.apache.wiki.auth.permissions.AllPermissionCollection--><path codeLine="71" d="M1371,147.24 C1371,182.51 1371,226.48 1371,261.67 " fill="none" id="java.security.PermissionCollection-backto-org.apache.wiki.auth.permissions.AllPermissionCollection" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1364,147.09,1371,127.09,1378,147.09,1364,147.09" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[bf6e566d7f114f5d843f [...]
-reverse link java.security.Permission to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="72" d="M1003.31,89.48 C816.39,98.07 455.06,120.38 337,168 C294.37,185.19 253.22,214.26 219.44,242.64 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1003.01,82.49,1023.3,88.59,1003.64,96.48,1003.01,82.49" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2edc9 [...]
-reverse link java.io.Serializable to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="73" d="M1603.88,116.99 C1576.22,130.25 1542.3,144.12 1510,151 C1446.26,164.58 398.47,146.34 337,168 C292.61,183.64 250.39,213.37 216.28,242.68 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1600.92,110.65,1621.95,108.01,1607.16,123.18,1600.92, [...]
-link org.apache.wiki.auth.permissions.GroupPermission to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="74" d="M241.64,295.12 C262.02,298.53 276.5,308.32 276.5,324.5 C276.5,339.29 264.41,348.74 246.76,352.86 " fill="none" id="org.apache.wiki.auth.permissions.GroupPermission-to-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="241.64,353.88,251.246,356.0534,246.5445,352.9077,249.6903,348.2062,241 [...]
-reverse link java.security.Permission to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="75" d="M1185.52,131.34 C1199.96,139.24 1215.54,146.38 1231,151 C1265.54,161.33 1521.77,154.02 1555,168 C1579.44,178.28 1602.59,193.71 1623.46,210.92 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1181.67,137.2,1167.93,121.06,1188.73,125.11,1181.67,137.2" style=" [...]
-reverse link java.io.Serializable to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="76" d="M1674,128.02 C1679.97,151.37 1687.66,181.42 1695.21,210.93 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1667.13,129.41,1668.96,108.3,1680.7,125.94,1667.13,129.41" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[a2c1dedeafa088403f99ca [...]
-link org.apache.wiki.auth.permissions.PagePermission to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="77" d="M1875.84,297.14 C1896.63,301.69 1910.5,310.81 1910.5,324.5 C1910.5,337.02 1898.91,345.71 1881.04,350.59 " fill="none" id="org.apache.wiki.auth.permissions.PagePermission-to-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1875.84,351.86,1885.5319,353.6115,1880.6974,350.6742,1883.6346,345. [...]
-reverse link java.security.Permission to org.apache.wiki.auth.permissions.AllPermission--><path codeLine="78" d="M1184.99,131.47 C1199.56,139.44 1215.32,146.57 1231,151 C1312.07,173.92 1910.86,136.51 1989,168 C2040.22,188.64 2085.48,232.46 2116.24,268.34 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1180.97,137.23,1167.27,121.07,1188.06,125.16,1180.97,137.23" style=" [...]
-reverse link java.io.Serializable to org.apache.wiki.auth.permissions.AllPermission--><path codeLine="79" d="M1734.78,92.95 C1803.42,102.87 1908.15,124.19 1989,168 C2035.8,193.36 2079.75,234.56 2111.09,268.18 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1733.58,99.85,1714.7,90.23,1735.46,85.98,1733.58,99.85" style="stroke:#A80036;stroke-width:1. [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="477px" preserveAspectRatio="none" style="width:2342px;height:477px;background:#FFFFFF;" version="1.1" viewBox="0 0 2342 477" width="2342px" zoomAndPan="magnify"><defs><filter height="300%" id="fdgeyx2l8h9ym" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
+cluster org.apache.wiki.auth.permissions--><polygon fill="#FFFFFF" filter="url(#fdgeyx2l8h9ym)" points="16,176,288,176,295,198.2969,2325,198.2969,2325,454,16,454,16,176" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="295" y1="198.2969" y2="198.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="266" x="20" y="190.9951">org.apache.wiki.auth.permissions</text><!--MD5= [...]
+cluster java.security--><polygon fill="#FFFFFF" filter="url(#fdgeyx2l8h9ym)" points="547,6,653,6,660,28.2969,1050,28.2969,1050,143,547,143,547,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="547" x2="660" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="551" y="20.9951">java.security</text><!--MD5=[0d852700fdad35b7061d461d6907a324]
+cluster java.io--><polygon fill="#FFFFFF" filter="url(#fdgeyx2l8h9ym)" points="1211,25,1267,25,1274,47.2969,1347,47.2969,1347,124,1211,124,1211,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1211" x2="1274" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="1215" y="39.9951">java.io</text><!--MD5=[dd4319673e9e0932655c6ee819ddd95a]
+class org.apache.wiki.auth.permissions.PermissionFactory--><a href="PermissionFactory.html" target="_top" title="PermissionFactory.html" xlink:actuate="onRequest" xlink:href="PermissionFactory.html" xlink:show="new" xlink:title="PermissionFactory.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="73.6094" id="org.apache.wiki.auth.permissions.PermissionFactory" style="stroke:#A80036;stroke-width:1.5;" width="320" x="1989" y="287.5"/><ellipse c [...]
+class org.apache.wiki.auth.permissions.PagePermission--><a href="PagePermission.html" target="_top" title="PagePermission.html" xlink:actuate="onRequest" xlink:href="PagePermission.html" xlink:show="new" xlink:title="PagePermission.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="227.2656" id="org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.5;" width="303" x="400.5" y="211"/><ellipse cx="497.75" cy="227 [...]
+class org.apache.wiki.auth.permissions.WikiPermission--><a href="WikiPermission.html" target="_top" title="WikiPermission.html" xlink:actuate="onRequest" xlink:href="WikiPermission.html" xlink:show="new" xlink:title="WikiPermission.html" xlink:type="simple"><rect codeLine="25" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="188.8516" id="org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.5;" width="303" x="1494.5" y="230"/><ellipse cx="1595.75" cy=" [...]
+class org.apache.wiki.auth.permissions.AllPermission--><a href="AllPermission.html" target="_top" title="AllPermission.html" xlink:actuate="onRequest" xlink:href="AllPermission.html" xlink:show="new" xlink:title="AllPermission.html" xlink:type="simple"><rect codeLine="39" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="112.0234" id="org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.5;" width="303" x="1156.5" y="268.5"/><ellipse cx="1262.75" cy="284. [...]
+class org.apache.wiki.auth.permissions.GroupPermission--><a href="GroupPermission.html" target="_top" title="GroupPermission.html" xlink:actuate="onRequest" xlink:href="GroupPermission.html" xlink:show="new" xlink:title="GroupPermission.html" xlink:type="simple"><rect codeLine="47" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="163.2422" id="org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.5;" width="209" x="834.5" y="243"/><ellipse cx="881.75"  [...]
+class org.apache.wiki.auth.permissions.AllPermissionCollection--><a href="AllPermissionCollection.html" target="_top" title="AllPermissionCollection.html" xlink:actuate="onRequest" xlink:href="AllPermissionCollection.html" xlink:show="new" xlink:title="AllPermissionCollection.html" xlink:type="simple"><rect codeLine="59" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="124.8281" id="org.apache.wiki.auth.permissions.AllPermissionCollection" style="stroke:#A80036;stroke-width:1.5;" widt [...]
+class java.security.Permission--><rect codeLine="83" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="73.6094" id="java.security.Permission" style="stroke:#A80036;stroke-width:1.5;" width="189" x="844.5" y="47"/><ellipse cx="902.25" cy="63" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M902.3594,58.3438 L901.2031,63.4219 L903.5313,63.4219 L902.3594,58.3438 Z M900.875,56.1094 L903.8594,56.1094 L907.2188,68.5 L904.7656,68.5 L904,65.4375 L900.7188,65.4 [...]
+class java.security.PermissionCollection--><rect codeLine="87" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="86.4141" id="java.security.PermissionCollection" style="stroke:#A80036;stroke-width:1.5;" width="246" x="563" y="41"/><ellipse cx="618.75" cy="57" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M618.8594,52.3438 L617.7031,57.4219 L620.0313,57.4219 L618.8594,52.3438 Z M617.375,50.1094 L620.3594,50.1094 L623.7188,62.5 L621.2656,62.5 L620.5,59 [...]
+class java.io.Serializable--><rect codeLine="95" fill="#FEFECE" filter="url(#fdgeyx2l8h9ym)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="1227.5" y="60"/><ellipse cx="1242.5" cy="76" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1238.4219,71.7656 L1238.4219,69.6094 L1245.8125,69.6094 L1245.8125,71.7656 L1243.3438,71.7656 L1243.3438,79.8438 L1245.8125,79.8438 L1245.8125,82 L1238.4219,82 L1238.4219,79.843 [...]
+reverse link java.security.Permission to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="68" d="M862.94,131.87 C817.59,159.82 758.4,196.3 703.85,229.92 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="859.52,125.76,880.22,121.22,866.87,137.68,859.52,125.76" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[d619c41edea7e5ef02391fcb45630f57]
+reverse link java.io.Serializable to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="69" d="M1208.26,109.52 C1163.46,124.01 1103.99,141.36 1050,151 C947.79,169.25 916.14,137.14 817,168 C778.42,180.01 739.47,198.53 703.74,218.65 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1206.25,102.81,1227.43,103.2,1210.63,116.11,1206.25,102 [...]
+link org.apache.wiki.auth.permissions.PagePermission to org.apache.wiki.auth.permissions.PagePermission--><path codeLine="70" d="M703.84,297.14 C724.63,301.69 738.5,310.81 738.5,324.5 C738.5,337.02 726.91,345.71 709.04,350.59 " fill="none" id="org.apache.wiki.auth.permissions.PagePermission-to-org.apache.wiki.auth.permissions.PagePermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="703.84,351.86,713.5319,353.6115,708.6974,350.6742,711.6346,345.8397,703.84 [...]
+reverse link java.security.Permission to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="71" d="M1052.99,117.35 C1101.34,129.84 1158.54,143.02 1211,151 C1269.56,159.91 1422.53,144.73 1477,168 C1510,182.1 1540.68,205.51 1566.6,229.93 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1051.11,124.09,1033.55,112.24,1054.67,110.55,1051.11,124.09" style="str [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="72" d="M1349.57,107.79 C1388.75,122.08 1437.41,142.61 1477,168 C1504.35,185.55 1531.42,207.68 1555.6,229.7 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1347.14,114.36,1330.62,101.09,1351.8,101.16,1347.14,114.36" style="stroke:#A80036;stroke-wi [...]
+link org.apache.wiki.auth.permissions.WikiPermission to org.apache.wiki.auth.permissions.WikiPermission--><path codeLine="73" d="M1797.84,297.14 C1818.63,301.69 1832.5,310.81 1832.5,324.5 C1832.5,337.02 1820.91,345.71 1803.04,350.59 " fill="none" id="org.apache.wiki.auth.permissions.WikiPermission-to-org.apache.wiki.auth.permissions.WikiPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1797.84,351.86,1807.5319,353.6115,1802.6974,350.6742,1805.6346,345. [...]
+reverse link java.security.Permission to org.apache.wiki.auth.permissions.AllPermission--><path codeLine="74" d="M1042.04,128.85 C1066.85,139.22 1093.32,150.13 1118,160 C1127.27,163.71 1130.51,162.75 1139,168 C1183.42,195.47 1226.63,235.55 1258.24,268.13 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1039.18,135.24,1023.45,121.05,1044.6,122.33,1039.18,135.24" style="s [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.permissions.AllPermission--><path codeLine="75" d="M1284.26,128.23 C1289.03,167.53 1296.11,225.72 1301.29,268.35 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.AllPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1277.3,129,1281.83,108.3,1291.2,127.31,1277.3,129" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[bf6e566d7f114f5d843fad5c31725739]
+reverse link java.security.Permission to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="76" d="M939,141.31 C939,171.61 939,209.52 939,242.9 " fill="none" id="java.security.Permission-backto-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="932,141.22,939,121.22,946,141.22,932,141.22" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[2edc9f879d22b51b179c57c49d24f2ad]
+reverse link java.io.Serializable to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="77" d="M1261.55,126.44 C1254.05,139.3 1243.97,152.15 1231,160 C1213.44,170.62 1158.1,160.51 1139,168 C1096.01,184.86 1054.64,214.05 1020.79,242.62 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1255.5,122.9,1270.73,108.17,1268.01,129.19,1255.5 [...]
+link org.apache.wiki.auth.permissions.GroupPermission to org.apache.wiki.auth.permissions.GroupPermission--><path codeLine="78" d="M1043.64,295.12 C1064.02,298.53 1078.5,308.32 1078.5,324.5 C1078.5,339.29 1066.41,348.74 1048.76,352.86 " fill="none" id="org.apache.wiki.auth.permissions.GroupPermission-to-org.apache.wiki.auth.permissions.GroupPermission" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1043.64,353.88,1053.246,356.0534,1048.5445,352.9077,1051.6903,3 [...]
+reverse link java.security.PermissionCollection to org.apache.wiki.auth.permissions.AllPermissionCollection--><path codeLine="79" d="M543.06,110.68 C490.81,123.5 432.43,141.98 383,168 C336.92,192.25 292.14,229.69 258.3,261.76 " fill="none" id="java.security.PermissionCollection-backto-org.apache.wiki.auth.permissions.AllPermissionCollection" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="541.68,103.82,562.75,106.05,544.89,117.44,541.68,103.82" style="stroke:#A8003 [...]
 @startuml
     namespace org.apache.wiki.auth.permissions {
 
+        class PermissionFactory [[PermissionFactory.html]] {
+            {static} +getPagePermission(Page, String): PagePermission
+            {static} +getPagePermission(String, String): PagePermission
+        }
+
+        class PagePermission [[PagePermission.html]] {
+            {static} +COMMENT_ACTION: String
+            {static} +DELETE_ACTION: String
+            {static} +EDIT_ACTION: String
+            {static} +MODIFY_ACTION: String
+            {static} +RENAME_ACTION: String
+            {static} +UPLOAD_ACTION: String
+            {static} +VIEW_ACTION: String
+            +PagePermission(String, String)
+            +PagePermission(Page, String)
+            +getActions(): String
+            +getPage(): String
+            +getWiki(): String
+            +implies(Permission): boolean
+            +newPermissionCollection(): PermissionCollection
+        }
+
         class WikiPermission [[WikiPermission.html]] {
             {static} +CREATE_GROUPS_ACTION: String
             {static} +CREATE_PAGES_ACTION: String
@@ -40,13 +62,12 @@ reverse link java.io.Serializable to org.apache.wiki.auth.permissions.AllPermiss
             +newPermissionCollection(): PermissionCollection
         }
 
-        class AllPermissionCollection [[AllPermissionCollection.html]] {
-            #m_permissions: Hashtable<Permission, Permission>
-            +add(Permission): void
-            +elements(): Enumeration<Permission>
+        class AllPermission [[AllPermission.html]] {
+            +AllPermission(String)
+            +getActions(): String
+            +getWiki(): String
             +implies(Permission): boolean
-            +isReadOnly(): boolean
-            +setReadOnly(): void
+            +newPermissionCollection(): PermissionCollection
         }
 
         class GroupPermission [[GroupPermission.html]] {
@@ -61,48 +82,27 @@ reverse link java.io.Serializable to org.apache.wiki.auth.permissions.AllPermiss
             +implies(Permission): boolean
         }
 
-        class PermissionFactory [[PermissionFactory.html]] {
-            {static} +getPagePermission(Page, String): PagePermission
-            {static} +getPagePermission(String, String): PagePermission
-        }
-
-        class PagePermission [[PagePermission.html]] {
-            {static} +COMMENT_ACTION: String
-            {static} +DELETE_ACTION: String
-            {static} +EDIT_ACTION: String
-            {static} +MODIFY_ACTION: String
-            {static} +RENAME_ACTION: String
-            {static} +UPLOAD_ACTION: String
-            {static} +VIEW_ACTION: String
-            +PagePermission(String, String)
-            +PagePermission(Page, String)
-            +getActions(): String
-            +getPage(): String
-            +getWiki(): String
-            +implies(Permission): boolean
-            +newPermissionCollection(): PermissionCollection
-        }
-
-        class AllPermission [[AllPermission.html]] {
-            +AllPermission(String)
-            +getActions(): String
-            +getWiki(): String
+        class AllPermissionCollection [[AllPermissionCollection.html]] {
+            #m_permissions: Hashtable<Permission, Permission>
+            +add(Permission): void
+            +elements(): Enumeration<Permission>
             +implies(Permission): boolean
-            +newPermissionCollection(): PermissionCollection
+            +isReadOnly(): boolean
+            +setReadOnly(): void
         }
 
+        java.security.Permission <|- - PagePermission
+        java.io.Serializable <|.. PagePermission
+        PagePermission - -> PagePermission: COMMENT\nDELETE\nEDIT\nRENAME\nMODIFY\nUPLOAD\nVIEW
         java.security.Permission <|- - WikiPermission
         java.io.Serializable <|.. WikiPermission
         WikiPermission - -> WikiPermission: CREATE_GROUPS\nCREATE_PAGES\nLOGIN\nEDIT_PREFERENCES\nEDIT_PROFILE
-        java.security.PermissionCollection <|- - AllPermissionCollection
+        java.security.Permission <|- - AllPermission
+        java.io.Serializable <|.. AllPermission
         java.security.Permission <|- - GroupPermission
         java.io.Serializable <|.. GroupPermission
         GroupPermission - -> GroupPermission: DELETE\nEDIT\nVIEW
-        java.security.Permission <|- - PagePermission
-        java.io.Serializable <|.. PagePermission
-        PagePermission - -> PagePermission: COMMENT\nDELETE\nEDIT\nRENAME\nMODIFY\nUPLOAD\nVIEW
-        java.security.Permission <|- - AllPermission
-        java.io.Serializable <|.. AllPermission
+        java.security.PermissionCollection <|- - AllPermissionCollection
     }
 
     namespace java.security {
@@ -130,5 +130,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/AbstractUserDatabase.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/AbstractUserDatabase.svg
index 7ccd61dfec..05ec98dd21 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/AbstractUserDatabase.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/AbstractUserDatabase.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="594px" preserveAspectRatio="none" style="width:286px;height:594px;background:#FFFFFF;" version="1.1" viewBox="0 0 286 594" width="286px" zoomAndPan="magnify"><defs><filter height="300%" id="fwsjvrhw83vas" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.user.AbstractUserDatabase--><a href="AbstractUserDatabase.html" target="_top" title="AbstractUserDatabase.html" xlink:actuate="onRequest" xlink:href="AbstractUserDatabase.html" xlink:show="new" xlink:title="AbstractUserDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fwsjvrhw83vas)" height="271.6172" id="org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="263" x="9" y="292"/><ellipse c [...]
 class org.apache.wiki.auth.user.UserDatabase--><a href="UserDatabase.html" target="_top" title="UserDatabase.html" xlink:actuate="onRequest" xlink:href="UserDatabase.html" xlink:show="new" xlink:title="UserDatabase.html" xlink:type="simple"><rect codeLine="25" fill="#FEFECE" filter="url(#fwsjvrhw83vas)" height="225.2031" id="org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="260" x="10.5" y="7"/><ellipse cx="72.75" cy="25.9688" fill="#B4A7E5" rx="11"  [...]
-reverse link org.apache.wiki.auth.user.UserDatabase to org.apache.wiki.auth.user.AbstractUserDatabase--><path codeLine="42" d="M140.5,252.34 C140.5,265.42 140.5,278.71 140.5,291.82 " fill="none" id="org.apache.wiki.auth.user.UserDatabase-backto-org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="133.5,252.02,140.5,232.02,147.5,252.02,133.5,252.02" style="stroke:#A80036;stroke-width:1.0;"/><text fi [...]
+reverse link org.apache.wiki.auth.user.UserDatabase to org.apache.wiki.auth.user.AbstractUserDatabase--><path codeLine="42" d="M140.5,252.34 C140.5,265.42 140.5,278.71 140.5,291.82 " fill="none" id="org.apache.wiki.auth.user.UserDatabase-backto-org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="133.5,252.02,140.5,232.02,147.5,252.02,133.5,252.02" style="stroke:#A80036;stroke-width:1.0;"/><text fi [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -55,5 +55,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DefaultUserProfile.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DefaultUserProfile.svg
index 384c2622db..6e6bf2438b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DefaultUserProfile.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DefaultUserProfile.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="701px" preserveAspectRatio="none" style="width:284px;height:701px;background:#FFFFFF;" version="1.1" viewBox="0 0 284 701" width="284px" zoomAndPan="magnify"><defs><filter height="300%" id="f1u1myhj2kx5cd" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.user.DefaultUserProfile--><a href="DefaultUserProfile.html" target="_top" title="DefaultUserProfile.html" xlink:actuate="onRequest" xlink:href="DefaultUserProfile.html" xlink:show="new" xlink:title="DefaultUserProfile.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1u1myhj2kx5cd)" height="302.0313" id="org.apache.wiki.auth.user.DefaultUserProfile" style="stroke:#A80036;stroke-width:1.5;" width="263" x="7" y="369"/><ellipse cx="72.75" c [...]
 class org.apache.wiki.auth.user.UserProfile--><a href="UserProfile.html" target="_top" title="UserProfile.html" xlink:actuate="onRequest" xlink:href="UserProfile.html" xlink:show="new" xlink:title="UserProfile.html" xlink:type="simple"><rect codeLine="28" fill="#FEFECE" filter="url(#f1u1myhj2kx5cd)" height="302.0313" id="org.apache.wiki.auth.user.UserProfile" style="stroke:#A80036;stroke-width:1.5;" width="262" x="7.5" y="7"/><ellipse cx="70.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11 [...]
-reverse link org.apache.wiki.auth.user.UserProfile to org.apache.wiki.auth.user.DefaultUserProfile--><path codeLine="51" d="M138.5,329.13 C138.5,342.4 138.5,355.76 138.5,368.89 " fill="none" id="org.apache.wiki.auth.user.UserProfile-backto-org.apache.wiki.auth.user.DefaultUserProfile" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="131.5,329.07,138.5,309.07,145.5,329.07,131.5,329.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#88 [...]
+reverse link org.apache.wiki.auth.user.UserProfile to org.apache.wiki.auth.user.DefaultUserProfile--><path codeLine="51" d="M138.5,329.13 C138.5,342.4 138.5,355.76 138.5,368.89 " fill="none" id="org.apache.wiki.auth.user.UserProfile-backto-org.apache.wiki.auth.user.DefaultUserProfile" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="131.5,329.07,138.5,309.07,145.5,329.07,131.5,329.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#88 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -64,5 +64,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DummyUserDatabase.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DummyUserDatabase.svg
index 772e9505ae..7d97f5007c 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DummyUserDatabase.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DummyUserDatabase.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="394px" preserveAspectRatio="none" style="width:258px;height:394px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 394" width="258px" zoomAndPan="magnify"><defs><filter height="300%" id="f1gbltpiikc7ao" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.user.DummyUserDatabase--><a href="DummyUserDatabase.html" target="_top" title="DummyUserDatabase.html" xlink:actuate="onRequest" xlink:href="DummyUserDatabase.html" xlink:show="new" xlink:title="DummyUserDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1gbltpiikc7ao)" height="173.9844" id="org.apache.wiki.auth.user.DummyUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="7" y="190"/><ellipse cx="46.3" cy="208. [...]
 class org.apache.wiki.auth.user.AbstractUserDatabase--><a href="AbstractUserDatabase.html" target="_top" title="AbstractUserDatabase.html" xlink:actuate="onRequest" xlink:href="AbstractUserDatabase.html" xlink:show="new" xlink:title="AbstractUserDatabase.html" xlink:type="simple"><rect codeLine="18" fill="#FEFECE" filter="url(#f1gbltpiikc7ao)" height="122.7656" id="org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="236" x="7.5" y="7"/><ellipse [...]
-reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.DummyUserDatabase--><path codeLine="27" d="M125.5,150.47 C125.5,163.37 125.5,176.75 125.5,189.76 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.DummyUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118.5,150.06,125.5,130.06,132.5,150.06,118.5,150.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" fo [...]
+reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.DummyUserDatabase--><path codeLine="27" d="M125.5,150.47 C125.5,163.37 125.5,176.75 125.5,189.76 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.DummyUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118.5,150.06,125.5,130.06,132.5,150.06,118.5,150.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" fo [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -40,5 +40,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DuplicateUserException.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DuplicateUserException.svg
index 25412bd35d..bd32de3261 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DuplicateUserException.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/DuplicateUserException.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:278px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 278 207" width="278px" zoomAndPan="magnify"><defs><filter height="300%" id="ftm4scqdopq2h" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.auth.user.DuplicateUserException--><a href="DuplicateUserException.html" target="_top" title="DuplicateUserException.html" xlink:actuate="onRequest" xlink:href="DuplicateUserException.html" xlink:show="new" xlink:title="DuplicateUserException.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ftm4scqdopq2h)" height="71.5469" id="org.apache.wiki.auth.user.DuplicateUserException" style="stroke:#A80036;stroke-width:1.5;" width="257" x="7" y="105"/ [...]
 class org.apache.wiki.api.exceptions.WikiI18nException--><a href="../../api/exceptions/WikiI18nException.html" target="_top" title="../../api/exceptions/WikiI18nException.html" xlink:actuate="onRequest" xlink:href="../../api/exceptions/WikiI18nException.html" xlink:show="new" xlink:title="../../api/exceptions/WikiI18nException.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#ftm4scqdopq2h)" height="37.9375" id="org.apache.wiki.api.exceptions.WikiI18nException" st [...]
-reverse link org.apache.wiki.api.exceptions.WikiI18nException to org.apache.wiki.auth.user.DuplicateUserException--><path codeLine="12" d="M135.5,65.3 C135.5,78 135.5,92.08 135.5,104.56 " fill="none" id="org.apache.wiki.api.exceptions.WikiI18nException-backto-org.apache.wiki.auth.user.DuplicateUserException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="128.5,65.16,135.5,45.16,142.5,65.16,128.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" [...]
+reverse link org.apache.wiki.api.exceptions.WikiI18nException to org.apache.wiki.auth.user.DuplicateUserException--><path codeLine="12" d="M135.5,65.3 C135.5,78 135.5,92.08 135.5,104.56 " fill="none" id="org.apache.wiki.api.exceptions.WikiI18nException-backto-org.apache.wiki.auth.user.DuplicateUserException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="128.5,65.16,135.5,45.16,142.5,65.16,128.5,65.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/JDBCUserDatabase.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/JDBCUserDatabase.svg
index 06a83055f2..23156b6e5b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/JDBCUserDatabase.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/JDBCUserDatabase.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="761px" preserveAspectRatio="none" style="width:258px;height:761px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 761" width="258px" zoomAndPan="magnify"><defs><filter height="300%" id="f1gueg9risog0q" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.user.JDBCUserDatabase--><a href="JDBCUserDatabase.html" target="_top" title="JDBCUserDatabase.html" xlink:actuate="onRequest" xlink:href="JDBCUserDatabase.html" xlink:show="new" xlink:title="JDBCUserDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1gueg9risog0q)" height="540.5156" id="org.apache.wiki.auth.user.JDBCUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="7" y="190"/><ellipse cx="55.25" cy="208.9688" [...]
 class org.apache.wiki.auth.user.AbstractUserDatabase--><a href="AbstractUserDatabase.html" target="_top" title="AbstractUserDatabase.html" xlink:actuate="onRequest" xlink:href="AbstractUserDatabase.html" xlink:show="new" xlink:title="AbstractUserDatabase.html" xlink:type="simple"><rect codeLine="46" fill="#FEFECE" filter="url(#f1gueg9risog0q)" height="122.7656" id="org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="236" x="7.5" y="7"/><ellipse [...]
-reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.JDBCUserDatabase--><path codeLine="55" d="M125.5,150.41 C125.5,162.72 125.5,175.95 125.5,189.78 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.JDBCUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118.5,150.01,125.5,130.01,132.5,150.01,118.5,150.01" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font [...]
+reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.JDBCUserDatabase--><path codeLine="55" d="M125.5,150.41 C125.5,162.72 125.5,175.95 125.5,189.78 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.JDBCUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118.5,150.01,125.5,130.01,132.5,150.01,118.5,150.01" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -68,5 +68,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/UserDatabase.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/UserDatabase.svg
index e8a0d4e87d..98099af708 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/UserDatabase.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/UserDatabase.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:281px;height:256px;background:#FFFFFF;" version="1.1" viewBox="0 0 281 256" width="281px" zoomAndPan="magnify"><defs><filter height="300%" id="f18a8klysmaqb0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.auth.user.UserDatabase--><a href="UserDatabase.html" target="_top" title="UserDatabase.html" xlink:actuate="onRequest" xlink:href="UserDatabase.html" xlink:show="new" xlink:title="UserDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f18a8klysmaqb0)" height="225.2031" id="org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="260" x="7" y="7"/><ellipse cx="69.25" cy="25.9688" fill="#B4A7E5" rx="11" ry= [...]
+class org.apache.wiki.auth.user.UserDatabase--><a href="UserDatabase.html" target="_top" title="UserDatabase.html" xlink:actuate="onRequest" xlink:href="UserDatabase.html" xlink:show="new" xlink:title="UserDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f18a8klysmaqb0)" height="225.2031" id="org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="260" x="7" y="7"/><ellipse cx="69.25" cy="25.9688" fill="#B4A7E5" rx="11" ry= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/UserProfile.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/UserProfile.svg
index 08a6a4f4ac..762fbbc34b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/UserProfile.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/UserProfile.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="437px" preserveAspectRatio="none" style="width:283px;height:437px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 437" width="283px" zoomAndPan="magnify"><defs><filter height="300%" id="f131dnfkhiwxnb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.user.UserProfile--><a href="UserProfile.html" target="_top" title="UserProfile.html" xlink:actuate="onRequest" xlink:href="UserProfile.html" xlink:show="new" xlink:title="UserProfile.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f131dnfkhiwxnb)" height="302.0313" id="org.apache.wiki.auth.user.UserProfile" style="stroke:#A80036;stroke-width:1.5;" width="262" x="7" y="105"/><ellipse cx="70.25" cy="123.9688" fill="#B4A7E5" rx="11" ry="11 [...]
 class java.io.Serializable--><rect codeLine="28" fill="#FEFECE" filter="url(#f131dnfkhiwxnb)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="84" y="7"/><ellipse cx="99" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M94.9219,21.7344 L94.9219,19.5781 L102.3125,19.5781 L102.3125,21.7344 L99.8438,21.7344 L99.8438,29.8125 L102.3125,29.8125 L102.3125,31.9688 L94.9219,31.9688 L94.9219,29.8125 L9 [...]
-reverse link java.io.Serializable to org.apache.wiki.auth.user.UserProfile--><path codeLine="30" d="M138,65.47 C138,77.04 138,90.49 138,104.79 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.user.UserProfile" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="131,65.27,138,45.27,145,65.27,131,65.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="39" y= [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.user.UserProfile--><path codeLine="30" d="M138,65.47 C138,77.04 138,90.49 138,104.79 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.user.UserProfile" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="131,65.27,138,45.27,145,65.27,131,65.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="39" y= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -43,5 +43,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/XMLUserDatabase.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/XMLUserDatabase.svg
index 8d80641d65..7c3c15a99f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/XMLUserDatabase.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/XMLUserDatabase.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="428px" preserveAspectRatio="none" style="width:258px;height:428px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 428" width="258px" zoomAndPan="magnify"><defs><filter height="300%" id="f15di02fu9rf86" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.auth.user.XMLUserDatabase--><a href="XMLUserDatabase.html" target="_top" title="XMLUserDatabase.html" xlink:actuate="onRequest" xlink:href="XMLUserDatabase.html" xlink:show="new" xlink:title="XMLUserDatabase.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f15di02fu9rf86)" height="207.5938" id="org.apache.wiki.auth.user.XMLUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="7" y="190"/><ellipse cx="58.25" cy="208.9688" fill= [...]
 class org.apache.wiki.auth.user.AbstractUserDatabase--><a href="AbstractUserDatabase.html" target="_top" title="AbstractUserDatabase.html" xlink:actuate="onRequest" xlink:href="AbstractUserDatabase.html" xlink:show="new" xlink:title="AbstractUserDatabase.html" xlink:type="simple"><rect codeLine="20" fill="#FEFECE" filter="url(#f15di02fu9rf86)" height="122.7656" id="org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="236" x="7.5" y="7"/><ellipse [...]
-reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.XMLUserDatabase--><path codeLine="29" d="M125.5,150.38 C125.5,163.13 125.5,176.47 125.5,189.64 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.XMLUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118.5,150.28,125.5,130.28,132.5,150.28,118.5,150.28" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-f [...]
+reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.XMLUserDatabase--><path codeLine="29" d="M125.5,150.38 C125.5,163.13 125.5,176.47 125.5,189.64 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.XMLUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="118.5,150.28,125.5,130.28,132.5,150.28,118.5,150.28" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-f [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -42,5 +42,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/package.svg
index ea07a06e82..511944ca40 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/auth/user/package.svg
@@ -1,85 +1,53 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1479px" preserveAspectRatio="none" style="width:929px;height:1479px;background:#FFFFFF;" version="1.1" viewBox="0 0 929 1479" width="929px" zoomAndPan="magnify"><defs><filter height="300%" id="f1kjp4bcn1k3w1" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
-cluster org.apache.wiki.auth.user--><polygon fill="#FFFFFF" filter="url(#f1kjp4bcn1k3w1)" points="16,142,228,142,235,164.2969,898,164.2969,898,1456,16,1456,16,142" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="235" y1="164.2969" y2="164.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="206" x="20" y="156.9951">org.apache.wiki.auth.user</text><!--MD5=[0d852700fdad [...]
-cluster java.io--><polygon fill="#FFFFFF" filter="url(#f1kjp4bcn1k3w1)" points="95,12.5,151,12.5,158,34.7969,231,34.7969,231,111.5,95,111.5,95,12.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="95" x2="158" y1="34.7969" y2="34.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="99" y="27.4951">java.io</text><!--MD5=[033be043fb277336b8890b347fde2a9a]
-cluster org.apache.wiki.api.exceptions--><polygon fill="#FFFFFF" filter="url(#f1kjp4bcn1k3w1)" points="651,6,902,6,909,28.2969,912,28.2969,912,118,651,118,651,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="651" x2="909" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="245" x="655" y="20.9951">org.apache.wiki.api.exceptions</text><!--MD5=[2c37d86f9a [...]
-class org.apache.wiki.auth.user.UserProfile--><a href="UserProfile.html" target="_top" title="UserProfile.html" xlink:actuate="onRequest" xlink:href="UserProfile.html" xlink:show="new" xlink:title="UserProfile.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="304.0938" id="org.apache.wiki.auth.user.UserProfile" style="stroke:#A80036;stroke-width:1.5;" width="262" x="32" y="177"/><ellipse cx="125.75" cy="193" fill="#B4A7E5" rx="11" ry="11" s [...]
-class org.apache.wiki.auth.user.AbstractUserDatabase--><a href="AbstractUserDatabase.html" target="_top" title="AbstractUserDatabase.html" xlink:actuate="onRequest" xlink:href="AbstractUserDatabase.html" xlink:show="new" xlink:title="AbstractUserDatabase.html" xlink:type="simple"><rect codeLine="26" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="265.6797" id="org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="263" x="330.5" y="560"/><ell [...]
-class org.apache.wiki.auth.user.UserDatabase--><a href="UserDatabase.html" target="_top" title="UserDatabase.html" xlink:actuate="onRequest" xlink:href="UserDatabase.html" xlink:show="new" xlink:title="UserDatabase.html" xlink:type="simple"><rect codeLine="46" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="227.2656" id="org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="260" x="329" y="215.5"/><ellipse cx="410.75" cy="231.5" fill="#B4A7E5" rx="1 [...]
-class org.apache.wiki.auth.user.DuplicateUserException--><a href="DuplicateUserException.html" target="_top" title="DuplicateUserException.html" xlink:actuate="onRequest" xlink:href="DuplicateUserException.html" xlink:show="new" xlink:title="DuplicateUserException.html" xlink:type="simple"><rect codeLine="63" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="73.6094" id="org.apache.wiki.auth.user.DuplicateUserException" style="stroke:#A80036;stroke-width:1.5;" width="257" x="624.5" y= [...]
-class org.apache.wiki.auth.user.DefaultUserProfile--><a href="DefaultUserProfile.html" target="_top" title="DefaultUserProfile.html" xlink:actuate="onRequest" xlink:href="DefaultUserProfile.html" xlink:show="new" xlink:title="DefaultUserProfile.html" xlink:type="simple"><rect codeLine="68" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="304.0938" id="org.apache.wiki.auth.user.DefaultUserProfile" style="stroke:#A80036;stroke-width:1.5;" width="263" x="32.5" y="541"/><ellipse cx="103. [...]
-class org.apache.wiki.auth.user.DummyUserDatabase--><a href="DummyUserDatabase.html" target="_top" title="DummyUserDatabase.html" xlink:actuate="onRequest" xlink:href="DummyUserDatabase.html" xlink:show="new" xlink:title="DummyUserDatabase.html" xlink:type="simple"><rect codeLine="91" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="176.0469" id="org.apache.wiki.auth.user.DummyUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="71.5" y="1084.5"/><ellipse cx="118.25" [...]
-class org.apache.wiki.auth.user.JDBCUserDatabase--><a href="JDBCUserDatabase.html" target="_top" title="JDBCUserDatabase.html" xlink:actuate="onRequest" xlink:href="JDBCUserDatabase.html" xlink:show="new" xlink:title="JDBCUserDatabase.html" xlink:type="simple"><rect codeLine="104" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="534.5781" id="org.apache.wiki.auth.user.JDBCUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="343.5" y="905"/><ellipse cx="398.75" cy="92 [...]
-class org.apache.wiki.auth.user.XMLUserDatabase--><a href="XMLUserDatabase.html" target="_top" title="XMLUserDatabase.html" xlink:actuate="onRequest" xlink:href="XMLUserDatabase.html" xlink:show="new" xlink:title="XMLUserDatabase.html" xlink:type="simple"><rect codeLine="145" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="201.6563" id="org.apache.wiki.auth.user.XMLUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="615.5" y="1071.5"/><ellipse cx="673.25" cy="1087. [...]
-class java.io.Serializable--><rect codeLine="170" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="111.5" y="47.5"/><ellipse cx="126.5" cy="63.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M122.4219,59.2656 L122.4219,57.1094 L129.8125,57.1094 L129.8125,59.2656 L127.3438,59.2656 L127.3438,67.3438 L129.8125,67.3438 L129.8125,69.5 L122.4219,69.5 L122.4219,67.3438  [...]
-class org.apache.wiki.api.exceptions.WikiI18nException--><a href="../../api/exceptions/WikiI18nException.html" target="_top" title="../../api/exceptions/WikiI18nException.html" xlink:actuate="onRequest" xlink:href="../../api/exceptions/WikiI18nException.html" xlink:show="new" xlink:title="../../api/exceptions/WikiI18nException.html" xlink:type="simple"><rect codeLine="174" fill="#FEFECE" filter="url(#f1kjp4bcn1k3w1)" height="60.8047" id="org.apache.wiki.api.exceptions.WikiI18nException"  [...]
-reverse link java.io.Serializable to org.apache.wiki.auth.user.UserProfile--><path codeLine="160" d="M163,115.81 C163,133.27 163,154.54 163,176.79 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.user.UserProfile" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="156,115.62,163,95.62,170,115.62,156,115.62" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3ab0ed2617b5e3494a784a85c923403e]
-reverse link org.apache.wiki.auth.user.UserDatabase to org.apache.wiki.auth.user.AbstractUserDatabase--><path codeLine="161" d="M460.1,462.97 C460.36,494.58 460.64,528.28 460.9,559.85 " fill="none" id="org.apache.wiki.auth.user.UserDatabase-backto-org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="453.1,462.61,459.93,442.55,467.1,462.5,453.1,462.61" style="stroke:#A80036;stroke-width:1.0;"/><!--M [...]
-reverse link org.apache.wiki.api.exceptions.WikiI18nException to org.apache.wiki.auth.user.DuplicateUserException--><path codeLine="162" d="M753,122.29 C753,172.06 753,247.38 753,291.74 " fill="none" id="org.apache.wiki.api.exceptions.WikiI18nException-backto-org.apache.wiki.auth.user.DuplicateUserException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="746,122.06,753,102.06,760,122.06,746,122.06" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[45a10a96f0572d8 [...]
-reverse link org.apache.wiki.auth.user.UserProfile to org.apache.wiki.auth.user.DefaultUserProfile--><path codeLine="163" d="M163.47,501.22 C163.51,514.5 163.55,527.84 163.58,540.97 " fill="none" id="org.apache.wiki.auth.user.UserProfile-backto-org.apache.wiki.auth.user.DefaultUserProfile" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="156.47,501.18,163.42,481.16,170.47,501.14,156.47,501.18" style="stroke:#A80036;stroke-width:1.0;"/><!--MD [...]
-reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.DummyUserDatabase--><path codeLine="164" d="M363.18,843.25 C350.35,863.8 337.63,884.79 326,905 C292.25,963.64 257.64,1031.6 231.78,1084.21 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.DummyUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="357.39,839.32,373.96,826.12,369.23,846.78,357.39,839.32" style="stroke:#A800 [...]
-reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.JDBCUserDatabase--><path codeLine="165" d="M462,846.24 C462,865.16 462,884.93 462,904.96 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.JDBCUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="455,846.06,462,826.06,469,846.06,455,846.06" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[0773df24cc01485acca1bbee998935c1]
-reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.XMLUserDatabase--><path codeLine="166" d="M560.82,843.25 C573.65,863.8 586.37,884.79 598,905 C629.03,958.91 660.78,1020.7 685.8,1071.2 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.XMLUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="554.77,846.78,550.04,826.12,566.61,839.32,554.77,846.78" style="stroke:#A80036;str [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1479px" preserveAspectRatio="none" style="width:915px;height:1479px;background:#FFFFFF;" version="1.1" viewBox="0 0 915 1479" width="915px" zoomAndPan="magnify"><defs><filter height="300%" id="fotwp9vwazdxj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
+cluster org.apache.wiki.auth.user--><polygon fill="#FFFFFF" filter="url(#fotwp9vwazdxj)" points="16,142,228,142,235,164.2969,898,164.2969,898,1456,16,1456,16,142" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="235" y1="164.2969" y2="164.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="206" x="20" y="156.9951">org.apache.wiki.auth.user</text><!--MD5=[033be043fb277 [...]
+cluster org.apache.wiki.api.exceptions--><polygon fill="#FFFFFF" filter="url(#fotwp9vwazdxj)" points="326,6,577,6,584,28.2969,587,28.2969,587,118,326,118,326,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="326" x2="584" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="245" x="330" y="20.9951">org.apache.wiki.api.exceptions</text><!--MD5=[0d852700fda [...]
+cluster java.io--><polygon fill="#FFFFFF" filter="url(#fotwp9vwazdxj)" points="683,12.5,739,12.5,746,34.7969,819,34.7969,819,111.5,683,111.5,683,12.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="683" x2="746" y1="34.7969" y2="34.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="687" y="27.4951">java.io</text><!--MD5=[a357dbd140d4e641fefb4c099d4e54be]
+class org.apache.wiki.auth.user.XMLUserDatabase--><a href="XMLUserDatabase.html" target="_top" title="XMLUserDatabase.html" xlink:actuate="onRequest" xlink:href="XMLUserDatabase.html" xlink:show="new" xlink:title="XMLUserDatabase.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="201.6563" id="org.apache.wiki.auth.user.XMLUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="32.5" y="1071.5"/><ellipse cx="90.25" cy="1087.5" fi [...]
+class org.apache.wiki.auth.user.DummyUserDatabase--><a href="DummyUserDatabase.html" target="_top" title="DummyUserDatabase.html" xlink:actuate="onRequest" xlink:href="DummyUserDatabase.html" xlink:show="new" xlink:title="DummyUserDatabase.html" xlink:type="simple"><rect codeLine="18" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="176.0469" id="org.apache.wiki.auth.user.DummyUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="304.5" y="1084.5"/><ellipse cx="351.25" [...]
+class org.apache.wiki.auth.user.DuplicateUserException--><a href="DuplicateUserException.html" target="_top" title="DuplicateUserException.html" xlink:actuate="onRequest" xlink:href="DuplicateUserException.html" xlink:show="new" xlink:title="DuplicateUserException.html" xlink:type="simple"><rect codeLine="31" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="73.6094" id="org.apache.wiki.auth.user.DuplicateUserException" style="stroke:#A80036;stroke-width:1.5;" width="257" x="327.5" y=" [...]
+class org.apache.wiki.auth.user.DefaultUserProfile--><a href="DefaultUserProfile.html" target="_top" title="DefaultUserProfile.html" xlink:actuate="onRequest" xlink:href="DefaultUserProfile.html" xlink:show="new" xlink:title="DefaultUserProfile.html" xlink:type="simple"><rect codeLine="36" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="304.0938" id="org.apache.wiki.auth.user.DefaultUserProfile" style="stroke:#A80036;stroke-width:1.5;" width="263" x="618.5" y="541"/><ellipse cx="689. [...]
+class org.apache.wiki.auth.user.JDBCUserDatabase--><a href="JDBCUserDatabase.html" target="_top" title="JDBCUserDatabase.html" xlink:actuate="onRequest" xlink:href="JDBCUserDatabase.html" xlink:show="new" xlink:title="JDBCUserDatabase.html" xlink:type="simple"><rect codeLine="59" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="534.5781" id="org.apache.wiki.auth.user.JDBCUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="237" x="576.5" y="905"/><ellipse cx="631.75" cy="921" [...]
+class org.apache.wiki.auth.user.UserProfile--><a href="UserProfile.html" target="_top" title="UserProfile.html" xlink:actuate="onRequest" xlink:href="UserProfile.html" xlink:show="new" xlink:title="UserProfile.html" xlink:type="simple"><rect codeLine="100" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="304.0938" id="org.apache.wiki.auth.user.UserProfile" style="stroke:#A80036;stroke-width:1.5;" width="262" x="620" y="177"/><ellipse cx="713.75" cy="193" fill="#B4A7E5" rx="11" ry="11" [...]
+class org.apache.wiki.auth.user.AbstractUserDatabase--><a href="AbstractUserDatabase.html" target="_top" title="AbstractUserDatabase.html" xlink:actuate="onRequest" xlink:href="AbstractUserDatabase.html" xlink:show="new" xlink:title="AbstractUserDatabase.html" xlink:type="simple"><rect codeLine="123" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="265.6797" id="org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="263" x="162.5" y="560"/><ell [...]
+class org.apache.wiki.auth.user.UserDatabase--><a href="UserDatabase.html" target="_top" title="UserDatabase.html" xlink:actuate="onRequest" xlink:href="UserDatabase.html" xlink:show="new" xlink:title="UserDatabase.html" xlink:type="simple"><rect codeLine="143" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="227.2656" id="org.apache.wiki.auth.user.UserDatabase" style="stroke:#A80036;stroke-width:1.5;" width="260" x="32" y="215.5"/><ellipse cx="113.75" cy="231.5" fill="#B4A7E5" rx="11 [...]
+class org.apache.wiki.api.exceptions.WikiI18nException--><a href="../../api/exceptions/WikiI18nException.html" target="_top" title="../../api/exceptions/WikiI18nException.html" xlink:actuate="onRequest" xlink:href="../../api/exceptions/WikiI18nException.html" xlink:show="new" xlink:title="../../api/exceptions/WikiI18nException.html" xlink:type="simple"><rect codeLine="170" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="60.8047" id="org.apache.wiki.api.exceptions.WikiI18nException" s [...]
+class java.io.Serializable--><rect codeLine="176" fill="#FEFECE" filter="url(#fotwp9vwazdxj)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="699.5" y="47.5"/><ellipse cx="714.5" cy="63.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M710.4219,59.2656 L710.4219,57.1094 L717.8125,57.1094 L717.8125,59.2656 L715.3438,59.2656 L715.3438,67.3438 L717.8125,67.3438 L717.8125,69.5 L710.4219,69.5 L710.4219,67.3438 L [...]
+reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.XMLUserDatabase--><path codeLine="160" d="M248.63,845.5 C226.53,919.28 200.58,1005.95 180.99,1071.37 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.XMLUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="242.01,843.21,254.45,826.06,255.42,847.23,242.01,843.21" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b3335557 [...]
+reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.DummyUserDatabase--><path codeLine="161" d="M334.99,845.74 C356.26,924.47 381.48,1017.83 399.46,1084.38 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.DummyUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="328.14,847.19,329.68,826.06,341.65,843.54,328.14,847.19" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[0aa [...]
+reverse link org.apache.wiki.api.exceptions.WikiI18nException to org.apache.wiki.auth.user.DuplicateUserException--><path codeLine="162" d="M456,122.29 C456,172.06 456,247.38 456,291.74 " fill="none" id="org.apache.wiki.api.exceptions.WikiI18nException-backto-org.apache.wiki.auth.user.DuplicateUserException" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="449,122.06,456,102.06,463,122.06,449,122.06" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[45a10a96f0572d8 [...]
+reverse link org.apache.wiki.auth.user.UserProfile to org.apache.wiki.auth.user.DefaultUserProfile--><path codeLine="163" d="M750.53,501.22 C750.49,514.5 750.45,527.84 750.42,540.97 " fill="none" id="org.apache.wiki.auth.user.UserProfile-backto-org.apache.wiki.auth.user.DefaultUserProfile" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="743.53,501.14,750.58,481.16,757.53,501.18,743.53,501.14" style="stroke:#A80036;stroke-width:1.0;"/><!--MD [...]
+reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.auth.user.JDBCUserDatabase--><path codeLine="164" d="M441.79,793.61 C483,825.94 525.58,864.1 559,905 C565,912.34 570.83,919.99 576.5,927.86 " fill="none" id="org.apache.wiki.auth.user.AbstractUserDatabase-backto-org.apache.wiki.auth.user.JDBCUserDatabase" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="437.36,799.04,425.79,781.29,445.91,787.94,437.36,799.04" style="stroke:#A80036;stroke- [...]
+reverse link java.io.Serializable to org.apache.wiki.auth.user.UserProfile--><path codeLine="165" d="M751,115.81 C751,133.27 751,154.54 751,176.79 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.auth.user.UserProfile" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="744,115.62,751,95.62,758,115.62,744,115.62" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3ab0ed2617b5e3494a784a85c923403e]
+reverse link org.apache.wiki.auth.user.UserDatabase to org.apache.wiki.auth.user.AbstractUserDatabase--><path codeLine="166" d="M209.99,461.62 C221.66,493.61 234.14,527.83 245.81,559.85 " fill="none" id="org.apache.wiki.auth.user.UserDatabase-backto-org.apache.wiki.auth.user.AbstractUserDatabase" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="203.32,463.74,203.04,442.55,216.47,458.95,203.32,463.74" style="stroke:#A80036;stroke-width:1.0;"/ [...]
 @startuml
     namespace org.apache.wiki.auth.user {
 
-        interface UserProfile [[UserProfile.html]] {
-            {abstract} +getAttributes(): Map<String, Serializable>
-            {abstract} +getCreated(): Date
-            {abstract} +getEmail(): String
-            {abstract} +getFullname(): String
-            {abstract} +getLastModified(): Date
-            {abstract} +getLockExpiry(): Date
-            {abstract} +getLoginName(): String
-            {abstract} +getPassword(): String
-            {abstract} +getUid(): String
-            {abstract} +getWikiName(): String
-            {abstract} +isLocked(): boolean
-            {abstract} +isNew(): boolean
-            {abstract} +setCreated(Date): void
-            {abstract} +setEmail(String): void
-            {abstract} +setFullname(String): void
-            {abstract} +setLastModified(Date): void
-            {abstract} +setLockExpiry(Date): void
-            {abstract} +setLoginName(String): void
-            {abstract} +setPassword(String): void
-            {abstract} +setUid(String): void
-        }
-
-        abstract class AbstractUserDatabase [[AbstractUserDatabase.html]] {
-            {static} #LOG: Logger
-            {static} #SHA_PREFIX: String
-            {static} #SSHA_PREFIX: String
-            {static} #SHA256_PREFIX: String
-            +find(String): UserProfile
-            {abstract} +findByEmail(String): UserProfile
-            {abstract} +findByFullName(String): UserProfile
-            {abstract} +findByLoginName(String): UserProfile
-            {abstract} +findByWikiName(String): UserProfile
-            +getPrincipals(String): Principal[]
-            {abstract} +initialize(Engine, Properties): void
-            +newProfile(): UserProfile
-            {abstract} +save(UserProfile): void
-            +validatePassword(String, String): boolean
-            {static} #generateUid(UserDatabase): String
-            #getHash(String): String
-            #parseLong(String): long
+        class XMLUserDatabase [[XMLUserDatabase.html]] {
+            {static} +PROP_USERDATABASE: String
+            +deleteByLoginName(String): void
+            +findByEmail(String): UserProfile
+            +findByFullName(String): UserProfile
+            +findByLoginName(String): UserProfile
+            +findByUid(String): UserProfile
+            +findByWikiName(String): UserProfile
+            +findBy(String, String): UserProfile
+            +getWikiNames(): Principal[]
+            +initialize(Engine, Properties): void
+            +rename(String, String): void
+            +save(UserProfile): void
         }
 
-        interface UserDatabase [[UserDatabase.html]] {
-            {abstract} +deleteByLoginName(String): void
-            {abstract} +getPrincipals(String): Principal[]
-            {abstract} +getWikiNames(): Principal[]
-            {abstract} +find(String): UserProfile
-            {abstract} +findByEmail(String): UserProfile
-            {abstract} +findByLoginName(String): UserProfile
-            {abstract} +findByUid(String): UserProfile
-            {abstract} +findByWikiName(String): UserProfile
-            {abstract} +findByFullName(String): UserProfile
-            {abstract} +initialize(Engine, Properties): void
-            {abstract} +newProfile(): UserProfile
-            {abstract} +rename(String, String): void
-            {abstract} +save(UserProfile): void
-            {abstract} +validatePassword(String, String): boolean
+        class DummyUserDatabase [[DummyUserDatabase.html]] {
+            +deleteByLoginName(String): void
+            +findByEmail(String): UserProfile
+            +findByFullName(String): UserProfile
+            +findByLoginName(String): UserProfile
+            +findByUid(String): UserProfile
+            +findByWikiName(String): UserProfile
+            +getWikiNames(): Principal[]
+            +initialize(Engine, Properties): void
+            +rename(String, String): void
+            +save(UserProfile): void
         }
 
         class DuplicateUserException [[DuplicateUserException.html]] {
@@ -110,19 +78,6 @@ reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.a
             +setUid(String): void
         }
 
-        class DummyUserDatabase [[DummyUserDatabase.html]] {
-            +deleteByLoginName(String): void
-            +findByEmail(String): UserProfile
-            +findByFullName(String): UserProfile
-            +findByLoginName(String): UserProfile
-            +findByUid(String): UserProfile
-            +findByWikiName(String): UserProfile
-            +getWikiNames(): Principal[]
-            +initialize(Engine, Properties): void
-            +rename(String, String): void
-            +save(UserProfile): void
-        }
-
         class JDBCUserDatabase [[JDBCUserDatabase.html]] {
             {static} +DEFAULT_DB_ATTRIBUTES: String
             {static} +DEFAULT_DB_CREATED: String
@@ -164,32 +119,73 @@ reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.a
             +save(UserProfile): void
         }
 
-        class XMLUserDatabase [[XMLUserDatabase.html]] {
-            {static} +PROP_USERDATABASE: String
-            +deleteByLoginName(String): void
-            +findByEmail(String): UserProfile
-            +findByFullName(String): UserProfile
-            +findByLoginName(String): UserProfile
-            +findByUid(String): UserProfile
-            +findByWikiName(String): UserProfile
-            +findBy(String, String): UserProfile
-            +getWikiNames(): Principal[]
-            +initialize(Engine, Properties): void
-            +rename(String, String): void
-            +save(UserProfile): void
+        interface UserProfile [[UserProfile.html]] {
+            {abstract} +getAttributes(): Map<String, Serializable>
+            {abstract} +getCreated(): Date
+            {abstract} +getEmail(): String
+            {abstract} +getFullname(): String
+            {abstract} +getLastModified(): Date
+            {abstract} +getLockExpiry(): Date
+            {abstract} +getLoginName(): String
+            {abstract} +getPassword(): String
+            {abstract} +getUid(): String
+            {abstract} +getWikiName(): String
+            {abstract} +isLocked(): boolean
+            {abstract} +isNew(): boolean
+            {abstract} +setCreated(Date): void
+            {abstract} +setEmail(String): void
+            {abstract} +setFullname(String): void
+            {abstract} +setLastModified(Date): void
+            {abstract} +setLockExpiry(Date): void
+            {abstract} +setLoginName(String): void
+            {abstract} +setPassword(String): void
+            {abstract} +setUid(String): void
         }
 
-        java.io.Serializable <|- - UserProfile
-        UserDatabase <|.. AbstractUserDatabase
+        abstract class AbstractUserDatabase [[AbstractUserDatabase.html]] {
+            {static} #LOG: Logger
+            {static} #SHA_PREFIX: String
+            {static} #SSHA_PREFIX: String
+            {static} #SHA256_PREFIX: String
+            +find(String): UserProfile
+            {abstract} +findByEmail(String): UserProfile
+            {abstract} +findByFullName(String): UserProfile
+            {abstract} +findByLoginName(String): UserProfile
+            {abstract} +findByWikiName(String): UserProfile
+            +getPrincipals(String): Principal[]
+            {abstract} +initialize(Engine, Properties): void
+            +newProfile(): UserProfile
+            {abstract} +save(UserProfile): void
+            +validatePassword(String, String): boolean
+            {static} #generateUid(UserDatabase): String
+            #getHash(String): String
+            #parseLong(String): long
+        }
+
+        interface UserDatabase [[UserDatabase.html]] {
+            {abstract} +deleteByLoginName(String): void
+            {abstract} +getPrincipals(String): Principal[]
+            {abstract} +getWikiNames(): Principal[]
+            {abstract} +find(String): UserProfile
+            {abstract} +findByEmail(String): UserProfile
+            {abstract} +findByLoginName(String): UserProfile
+            {abstract} +findByUid(String): UserProfile
+            {abstract} +findByWikiName(String): UserProfile
+            {abstract} +findByFullName(String): UserProfile
+            {abstract} +initialize(Engine, Properties): void
+            {abstract} +newProfile(): UserProfile
+            {abstract} +rename(String, String): void
+            {abstract} +save(UserProfile): void
+            {abstract} +validatePassword(String, String): boolean
+        }
+
+        AbstractUserDatabase <|- - XMLUserDatabase
+        AbstractUserDatabase <|- - DummyUserDatabase
         org.apache.wiki.api.exceptions.WikiI18nException <|- - DuplicateUserException
         UserProfile <|.. DefaultUserProfile
-        AbstractUserDatabase <|- - DummyUserDatabase
         AbstractUserDatabase <|- - JDBCUserDatabase
-        AbstractUserDatabase <|- - XMLUserDatabase
-    }
-
-    namespace java.io {
-        interface Serializable
+        java.io.Serializable <|- - UserProfile
+        UserDatabase <|.. AbstractUserDatabase
     }
 
     namespace org.apache.wiki.api.exceptions {
@@ -198,6 +194,10 @@ reverse link org.apache.wiki.auth.user.AbstractUserDatabase to org.apache.wiki.a
         }
     }
 
+    namespace java.io {
+        interface Serializable
+    }
+
     center footer UMLDoclet 2.0.15, PlantUML 1.2021.13
 @enduml
 
@@ -207,5 +207,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.svg
index 0a50c4ce2f..287c7f18db 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:304px;height:241px;background:#FFFFFF;" version="1.1" viewBox="0 0 304 241" width="304px" zoomAndPan="magnify"><defs><filter height="300%" id="f1mf8v88roygq5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.bootstrap.WikiBootstrapServletContextListener--><a href="WikiBootstrapServletContextListener.html" target="_top" title="WikiBootstrapServletContextListener.html" xlink:actuate="onRequest" xlink:href="WikiBootstrapServletContextListener.html" xlink:show="new" xlink:title="WikiBootstrapServletContextListener.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1mf8v88roygq5)" height="71.5469" id="org.apache.wiki.bootstrap.WikiBootstrapServletConte [...]
 class javax.servlet.ServletContextListener--><rect codeLine="10" fill="#FEFECE" filter="url(#f1mf8v88roygq5)" height="71.5469" id="javax.servlet.ServletContextListener" style="stroke:#A80036;stroke-width:1.5;" width="282" x="7.5" y="7"/><ellipse cx="65.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M61.1719,21.7344 L61.1719,19.5781 L68.5625,19.5781 L68.5625,21.7344 L66.0938,21.7344 L66.0938,29.8125 L68.5625,29.8125 L68.5625,31.9688 L61. [...]
-reverse link javax.servlet.ServletContextListener to org.apache.wiki.bootstrap.WikiBootstrapServletContextListener--><path codeLine="15" d="M148.5,99.38 C148.5,112.74 148.5,126.65 148.5,138.79 " fill="none" id="javax.servlet.ServletContextListener-backto-org.apache.wiki.bootstrap.WikiBootstrapServletContextListener" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="141.5,99.18,148.5,79.18,155.5,99.18,141.5,99.18" style="stroke:#A80036;stroke- [...]
+reverse link javax.servlet.ServletContextListener to org.apache.wiki.bootstrap.WikiBootstrapServletContextListener--><path codeLine="15" d="M148.5,99.38 C148.5,112.74 148.5,126.65 148.5,138.79 " fill="none" id="javax.servlet.ServletContextListener-backto-org.apache.wiki.bootstrap.WikiBootstrapServletContextListener" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="141.5,99.18,148.5,79.18,155.5,99.18,141.5,99.18" style="stroke:#A80036;stroke- [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/bootstrap/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/bootstrap/package.svg
index 86960d5149..00c24e0a3c 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/bootstrap/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/bootstrap/package.svg
@@ -3,7 +3,7 @@ cluster org.apache.wiki.bootstrap--><polygon fill="#FFFFFF" filter="url(#f1ptwok
 cluster javax.servlet--><polygon fill="#FFFFFF" filter="url(#f1ptwokikmnwj8)" points="16,6,122,6,129,28.2969,330,28.2969,330,131,16,131,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="129" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="20" y="20.9951">javax.servlet</text><!--MD5=[bdfe2b541a11f145c3171b27957dfe01]
 class org.apache.wiki.bootstrap.WikiBootstrapServletContextListener--><a href="WikiBootstrapServletContextListener.html" target="_top" title="WikiBootstrapServletContextListener.html" xlink:actuate="onRequest" xlink:href="WikiBootstrapServletContextListener.html" xlink:show="new" xlink:title="WikiBootstrapServletContextListener.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1ptwokikmnwj8)" height="73.6094" id="org.apache.wiki.bootstrap.WikiBootstrapServletConte [...]
 class javax.servlet.ServletContextListener--><rect codeLine="12" fill="#FEFECE" filter="url(#f1ptwokikmnwj8)" height="73.6094" id="javax.servlet.ServletContextListener" style="stroke:#A80036;stroke-width:1.5;" width="282" x="32" y="41"/><ellipse cx="97.75" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M93.6719,52.7656 L93.6719,50.6094 L101.0625,50.6094 L101.0625,52.7656 L98.5938,52.7656 L98.5938,60.8438 L101.0625,60.8438 L101.0625,63 L93.6719,6 [...]
-reverse link javax.servlet.ServletContextListener to org.apache.wiki.bootstrap.WikiBootstrapServletContextListener--><path codeLine="8" d="M173,135.43 C173,153.69 173,173.44 173,189.83 " fill="none" id="javax.servlet.ServletContextListener-backto-org.apache.wiki.bootstrap.WikiBootstrapServletContextListener" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="166,135.34,173,115.34,180,135.34,166,135.34" style="stroke:#A80036;stroke-width:1.0;"/ [...]
+reverse link javax.servlet.ServletContextListener to org.apache.wiki.bootstrap.WikiBootstrapServletContextListener--><path codeLine="8" d="M173,135.43 C173,153.69 173,173.44 173,189.83 " fill="none" id="javax.servlet.ServletContextListener-backto-org.apache.wiki.bootstrap.WikiBootstrapServletContextListener" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="166,135.34,173,115.34,180,135.34,166,135.34" style="stroke:#A80036;stroke-width:1.0;"/ [...]
 @startuml
     namespace org.apache.wiki.bootstrap {
 
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/CacheInfo.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/CacheInfo.svg
index 2549f8686d..d872d25ad5 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/CacheInfo.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/CacheInfo.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="167px" preserveAspectRatio="none" style="width:223px;height:167px;background:#FFFFFF;" version="1.1" viewBox="0 0 223 167" width="223px" zoomAndPan="magnify"><defs><filter height="300%" id="faoj5devabd3k" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.cache.CacheInfo--><a href="CacheInfo.html" target="_top" title="CacheInfo.html" xlink:actuate="onRequest" xlink:href="CacheInfo.html" xlink:show="new" xlink:title="CacheInfo.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#faoj5devabd3k)" height="135.5703" id="org.apache.wiki.cache.CacheInfo" style="stroke:#A80036;stroke-width:1.5;" width="202" x="7" y="7"/><ellipse cx="51.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036; [...]
+class org.apache.wiki.cache.CacheInfo--><a href="CacheInfo.html" target="_top" title="CacheInfo.html" xlink:actuate="onRequest" xlink:href="CacheInfo.html" xlink:show="new" xlink:title="CacheInfo.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#faoj5devabd3k)" height="135.5703" id="org.apache.wiki.cache.CacheInfo" style="stroke:#A80036;stroke-width:1.5;" width="202" x="7" y="7"/><ellipse cx="51.25" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036; [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/CachingManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/CachingManager.svg
index c65d46ca68..6c67386209 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/CachingManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/CachingManager.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="303px" preserveAspectRatio="none" style="width:444px;height:303px;background:#FFFFFF;" version="1.1" viewBox="0 0 444 303" width="444px" zoomAndPan="magnify"><defs><filter height="300%" id="f177yziohyym8i" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.cache.CachingManager--><a href="CachingManager.html" target="_top" title="CachingManager.html" xlink:actuate="onRequest" xlink:href="CachingManager.html" xlink:show="new" xlink:title="CachingManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f177yziohyym8i)" height="271.6172" id="org.apache.wiki.cache.CachingManager" style="stroke:#A80036;stroke-width:1.5;" width="423" x="7" y="7"/><ellipse cx="156.25" cy="25.9688" fill="#B4A7E5" rx="11 [...]
+class org.apache.wiki.cache.CachingManager--><a href="CachingManager.html" target="_top" title="CachingManager.html" xlink:actuate="onRequest" xlink:href="CachingManager.html" xlink:show="new" xlink:title="CachingManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f177yziohyym8i)" height="271.6172" id="org.apache.wiki.cache.CachingManager" style="stroke:#A80036;stroke-width:1.5;" width="423" x="7" y="7"/><ellipse cx="156.25" cy="25.9688" fill="#B4A7E5" rx="11 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -34,5 +34,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/EhcacheCachingManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/EhcacheCachingManager.svg
index dc341ea57e..f54bcf3e75 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/EhcacheCachingManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/EhcacheCachingManager.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.cache.EhcacheCachingManager--><a href="EhcacheCachingManag
 class org.apache.wiki.cache.CachingManager--><a href="CachingManager.html" target="_top" title="CachingManager.html" xlink:actuate="onRequest" xlink:href="CachingManager.html" xlink:show="new" xlink:title="CachingManager.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#fevlcp0ffejej)" height="135.5703" id="org.apache.wiki.cache.CachingManager" style="stroke:#A80036;stroke-width:1.5;" width="423" x="7" y="7"/><ellipse cx="156.25" cy="25.9688" fill="#B4A7E5" rx="11 [...]
 class org.apache.wiki.api.engine.Initializable--><a href="../api/engine/Initializable.html" target="_top" title="../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../api/engine/Initializable.html" xlink:show="new" xlink:title="../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="25" fill="#FEFECE" filter="url(#fevlcp0ffejej)" height="58.7422" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="465.5" [...]
 reverse link org.apache.wiki.cache.CachingManager to org.apache.wiki.cache.EhcacheCachingManager--><path codeLine="29" d="M291.33,158.29 C304.4,173.06 317.93,188.36 330.75,202.84 " fill="none" id="org.apache.wiki.cache.CachingManager-backto-org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="285.94,162.77,277.93,143.15,296.43,153.49,285.94,162.77" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7b [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.cache.EhcacheCachingManager--><path codeLine="30" d="M534.68,119.61 C512.99,143.98 485.4,174.99 460.5,202.96 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="529.47,114.94,548,104.66,539.93,124.25,529.47,114.94" style="stroke:#A80036;stroke-width:1.0;"/><text f [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.cache.EhcacheCachingManager--><path codeLine="30" d="M534.68,119.61 C512.99,143.98 485.4,174.99 460.5,202.96 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="529.47,114.94,548,104.66,539.93,124.25,529.47,114.94" style="stroke:#A80036;stroke-width:1.0;"/><text f [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -45,5 +45,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/package.svg
index addab466b2..45f33dfc5d 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/cache/package.svg
@@ -1,15 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="556px" preserveAspectRatio="none" style="width:998px;height:556px;background:#FFFFFF;" version="1.1" viewBox="0 0 998 556" width="998px" zoomAndPan="magnify"><defs><filter height="300%" id="fgqw85euttsj0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-cluster org.apache.wiki.cache--><polygon fill="#FFFFFF" filter="url(#fgqw85euttsj0)" points="16,6,199,6,206,28.2969,709,28.2969,709,533,16,533,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="206" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="177" x="20" y="20.9951">org.apache.wiki.cache</text><!--MD5=[06e4b2620a8b168056b961578cd367b2]
-cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#fgqw85euttsj0)" points="733,108.5,951,108.5,958,130.7969,981,130.7969,981,220.5,733,220.5,733,108.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="733" x2="958" y1="130.7969" y2="130.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="737" y="123.4951">org.apache.wiki.api.engine</text><!--MD5 [...]
-class org.apache.wiki.cache.CachingManager--><a href="CachingManager.html" target="_top" title="CachingManager.html" xlink:actuate="onRequest" xlink:href="CachingManager.html" xlink:show="new" xlink:title="CachingManager.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fgqw85euttsj0)" height="265.6797" id="org.apache.wiki.cache.CachingManager" style="stroke:#A80036;stroke-width:1.5;" width="423" x="269.5" y="41"/><ellipse cx="424.25" cy="57" fill="#B4A7E5" rx="11" [...]
-class org.apache.wiki.cache.EhcacheCachingManager--><a href="EhcacheCachingManager.html" target="_top" title="EhcacheCachingManager.html" xlink:actuate="onRequest" xlink:href="EhcacheCachingManager.html" xlink:show="new" xlink:title="EhcacheCachingManager.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#fgqw85euttsj0)" height="150.4375" id="org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.5;" width="424" x="269" y="367"/><ellipse  [...]
-class org.apache.wiki.cache.CacheInfo--><a href="CacheInfo.html" target="_top" title="CacheInfo.html" xlink:actuate="onRequest" xlink:href="CacheInfo.html" xlink:show="new" xlink:title="CacheInfo.html" xlink:type="simple"><rect codeLine="34" fill="#FEFECE" filter="url(#fgqw85euttsj0)" height="137.6328" id="org.apache.wiki.cache.CacheInfo" style="stroke:#A80036;stroke-width:1.5;" width="202" x="32" y="105"/><ellipse cx="97.75" cy="121" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036; [...]
-class org.apache.wiki.api.engine.Initializable--><a href="../api/engine/Initializable.html" target="_top" title="../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../api/engine/Initializable.html" xlink:show="new" xlink:title="../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="49" fill="#FEFECE" filter="url(#fgqw85euttsj0)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="749" y [...]
-reverse link org.apache.wiki.cache.CachingManager to org.apache.wiki.cache.EhcacheCachingManager--><path codeLine="44" d="M481,327.31 C481,340.94 481,354.28 481,366.77 " fill="none" id="org.apache.wiki.cache.CachingManager-backto-org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="474,327.22,481,307.22,488,327.22,474,327.22" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7b830e65a579f148cb4264e35 [...]
-reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.cache.EhcacheCachingManager--><path codeLine="45" d="M812.62,218.78 C784.2,245.73 745.86,280.14 709,307 C680.24,327.96 648,348.51 617.02,366.98 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="808.04,213.47,827.32,204.67,817.74,223.57,808.04,213.47" style="stro [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="556px" preserveAspectRatio="none" style="width:998px;height:556px;background:#FFFFFF;" version="1.1" viewBox="0 0 998 556" width="998px" zoomAndPan="magnify"><defs><filter height="300%" id="fxa3w27pmth04" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
+cluster org.apache.wiki.cache--><polygon fill="#FFFFFF" filter="url(#fxa3w27pmth04)" points="16,6,199,6,206,28.2969,709,28.2969,709,533,16,533,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="206" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="177" x="20" y="20.9951">org.apache.wiki.cache</text><!--MD5=[06e4b2620a8b168056b961578cd367b2]
+cluster org.apache.wiki.api.engine--><polygon fill="#FFFFFF" filter="url(#fxa3w27pmth04)" points="733,108.5,951,108.5,958,130.7969,981,130.7969,981,220.5,733,220.5,733,108.5" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="733" x2="958" y1="130.7969" y2="130.7969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="212" x="737" y="123.4951">org.apache.wiki.api.engine</text><!--MD5 [...]
+class org.apache.wiki.cache.CacheInfo--><a href="CacheInfo.html" target="_top" title="CacheInfo.html" xlink:actuate="onRequest" xlink:href="CacheInfo.html" xlink:show="new" xlink:title="CacheInfo.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fxa3w27pmth04)" height="137.6328" id="org.apache.wiki.cache.CacheInfo" style="stroke:#A80036;stroke-width:1.5;" width="202" x="491" y="105"/><ellipse cx="556.75" cy="121" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036 [...]
+class org.apache.wiki.cache.CachingManager--><a href="CachingManager.html" target="_top" title="CachingManager.html" xlink:actuate="onRequest" xlink:href="CachingManager.html" xlink:show="new" xlink:title="CachingManager.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#fxa3w27pmth04)" height="265.6797" id="org.apache.wiki.cache.CachingManager" style="stroke:#A80036;stroke-width:1.5;" width="423" x="32.5" y="41"/><ellipse cx="187.25" cy="57" fill="#B4A7E5" rx="11" [...]
+class org.apache.wiki.cache.EhcacheCachingManager--><a href="EhcacheCachingManager.html" target="_top" title="EhcacheCachingManager.html" xlink:actuate="onRequest" xlink:href="EhcacheCachingManager.html" xlink:show="new" xlink:title="EhcacheCachingManager.html" xlink:type="simple"><rect codeLine="33" fill="#FEFECE" filter="url(#fxa3w27pmth04)" height="150.4375" id="org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.5;" width="424" x="150" y="367"/><ellipse  [...]
+class org.apache.wiki.api.engine.Initializable--><a href="../api/engine/Initializable.html" target="_top" title="../api/engine/Initializable.html" xlink:actuate="onRequest" xlink:href="../api/engine/Initializable.html" xlink:show="new" xlink:title="../api/engine/Initializable.html" xlink:type="simple"><rect codeLine="49" fill="#FEFECE" filter="url(#fxa3w27pmth04)" height="60.8047" id="org.apache.wiki.api.engine.Initializable" style="stroke:#A80036;stroke-width:1.5;" width="216" x="749" y [...]
+reverse link org.apache.wiki.cache.CachingManager to org.apache.wiki.cache.EhcacheCachingManager--><path codeLine="44" d="M310.93,325.88 C317.2,340 323.34,353.85 329.07,366.77 " fill="none" id="org.apache.wiki.cache.CachingManager-backto-org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="304.37,328.34,302.65,307.22,317.16,322.66,304.37,328.34" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7b830 [...]
+reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.cache.EhcacheCachingManager--><path codeLine="45" d="M815.65,219.35 C787.65,247.39 748.66,282.77 709,307 C667.39,332.42 620.15,354.5 574.2,373 " fill="none" id="org.apache.wiki.api.engine.Initializable-backto-org.apache.wiki.cache.EhcacheCachingManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="811.02,214.07,830,204.65,821.04,223.85,811.02,214.07" style="stroke:# [...]
 @startuml
     namespace org.apache.wiki.cache {
 
+        class CacheInfo [[CacheInfo.html]] {
+            +CacheInfo(String, long)
+            +hit(): void
+            +miss(): void
+            +getName(): String
+            +getMisses(): long
+            +getHits(): long
+            +getMaxElementsAllowed(): long
+        }
+
         interface CachingManager [[CachingManager.html]] {
             {static} +- -PROP_USECACHE_DEPRECATED- -: String
             {static} +PROP_CACHE_ENABLE: String
@@ -41,16 +51,6 @@ reverse link org.apache.wiki.api.engine.Initializable to org.apache.wiki.cache.E
             +remove(String, Serializable): void
         }
 
-        class CacheInfo [[CacheInfo.html]] {
-            +CacheInfo(String, long)
-            +hit(): void
-            +miss(): void
-            +getName(): String
-            +getMisses(): long
-            +getHits(): long
-            +getMaxElementsAllowed(): long
-        }
-
         CachingManager <|.. EhcacheCachingManager
         org.apache.wiki.api.engine.Initializable <|.. EhcacheCachingManager
     }
@@ -70,5 +70,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/DefaultPageRenamer.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/DefaultPageRenamer.svg
index 11621f0cfa..433ae5a060 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/DefaultPageRenamer.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/DefaultPageRenamer.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:349px;height:241px;background:#FFFFFF;" version="1.1" viewBox="0 0 349 241" width="349px" zoomAndPan="magnify"><defs><filter height="300%" id="f1m44ukbjj4ajp" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.content.DefaultPageRenamer--><a href="DefaultPageRenamer.html" target="_top" title="DefaultPageRenamer.html" xlink:actuate="onRequest" xlink:href="DefaultPageRenamer.html" xlink:show="new" xlink:title="DefaultPageRenamer.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1m44ukbjj4ajp)" height="71.5469" id="org.apache.wiki.content.DefaultPageRenamer" style="stroke:#A80036;stroke-width:1.5;" width="328" x="7" y="139"/><ellipse cx="93.25" cy="15 [...]
 class org.apache.wiki.content.PageRenamer--><a href="PageRenamer.html" target="_top" title="PageRenamer.html" xlink:actuate="onRequest" xlink:href="PageRenamer.html" xlink:show="new" xlink:title="PageRenamer.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1m44ukbjj4ajp)" height="71.5469" id="org.apache.wiki.content.PageRenamer" style="stroke:#A80036;stroke-width:1.5;" width="326" x="8" y="7"/><ellipse cx="107.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" styl [...]
-reverse link org.apache.wiki.content.PageRenamer to org.apache.wiki.content.DefaultPageRenamer--><path codeLine="15" d="M171,99.38 C171,112.74 171,126.65 171,138.79 " fill="none" id="org.apache.wiki.content.PageRenamer-backto-org.apache.wiki.content.DefaultPageRenamer" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="164,99.18,171,79.18,178,99.18,164,99.18" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-seri [...]
+reverse link org.apache.wiki.content.PageRenamer to org.apache.wiki.content.DefaultPageRenamer--><path codeLine="15" d="M171,99.38 C171,112.74 171,126.65 171,138.79 " fill="none" id="org.apache.wiki.content.PageRenamer-backto-org.apache.wiki.content.DefaultPageRenamer" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="164,99.18,171,79.18,178,99.18,164,99.18" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-seri [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/PageRenamer.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/PageRenamer.svg
index 4824eed4c6..b3663b7995 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/PageRenamer.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/PageRenamer.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="103px" preserveAspectRatio="none" style="width:347px;height:103px;background:#FFFFFF;" version="1.1" viewBox="0 0 347 103" width="347px" zoomAndPan="magnify"><defs><filter height="300%" id="f1p9ca3n7m9q9m" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.content.PageRenamer--><a href="PageRenamer.html" target="_top" title="PageRenamer.html" xlink:actuate="onRequest" xlink:href="PageRenamer.html" xlink:show="new" xlink:title="PageRenamer.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1p9ca3n7m9q9m)" height="71.5469" id="org.apache.wiki.content.PageRenamer" style="stroke:#A80036;stroke-width:1.5;" width="326" x="7" y="7"/><ellipse cx="106.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style [...]
+class org.apache.wiki.content.PageRenamer--><a href="PageRenamer.html" target="_top" title="PageRenamer.html" xlink:actuate="onRequest" xlink:href="PageRenamer.html" xlink:show="new" xlink:title="PageRenamer.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1p9ca3n7m9q9m)" height="71.5469" id="org.apache.wiki.content.PageRenamer" style="stroke:#A80036;stroke-width:1.5;" width="326" x="7" y="7"/><ellipse cx="106.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -19,5 +19,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/package.svg
index e7294d7e40..ecd276bc35 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/content/package.svg
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="288px" preserveAspectRatio="none" style="width:393px;height:288px;background:#FFFFFF;" version="1.1" viewBox="0 0 393 288" width="393px" zoomAndPan="magnify"><defs><filter height="300%" id="fn13evxipouys" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-cluster org.apache.wiki.content--><polygon fill="#FFFFFF" filter="url(#fn13evxipouys)" points="16,6,213,6,220,28.2969,376,28.2969,376,265,16,265,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="220" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="191" x="20" y="20.9951">org.apache.wiki.content</text><!--MD5=[75d20303feb270dfa17a0b162a296feb]
-class org.apache.wiki.content.DefaultPageRenamer--><a href="DefaultPageRenamer.html" target="_top" title="DefaultPageRenamer.html" xlink:actuate="onRequest" xlink:href="DefaultPageRenamer.html" xlink:show="new" xlink:title="DefaultPageRenamer.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fn13evxipouys)" height="73.6094" id="org.apache.wiki.content.DefaultPageRenamer" style="stroke:#A80036;stroke-width:1.5;" width="328" x="32" y="175"/><ellipse cx="125.25" cy="1 [...]
-class org.apache.wiki.content.PageRenamer--><a href="PageRenamer.html" target="_top" title="PageRenamer.html" xlink:actuate="onRequest" xlink:href="PageRenamer.html" xlink:show="new" xlink:title="PageRenamer.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#fn13evxipouys)" height="73.6094" id="org.apache.wiki.content.PageRenamer" style="stroke:#A80036;stroke-width:1.5;" width="326" x="33" y="41"/><ellipse cx="148.25" cy="57" fill="#B4A7E5" rx="11" ry="11" style="st [...]
-reverse link org.apache.wiki.content.PageRenamer to org.apache.wiki.content.DefaultPageRenamer--><path codeLine="13" d="M196,135.38 C196,148.8 196,162.76 196,174.97 " fill="none" id="org.apache.wiki.content.PageRenamer-backto-org.apache.wiki.content.DefaultPageRenamer" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="189,135.07,196,115.07,203,135.07,189,135.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans- [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="288px" preserveAspectRatio="none" style="width:393px;height:288px;background:#FFFFFF;" version="1.1" viewBox="0 0 393 288" width="393px" zoomAndPan="magnify"><defs><filter height="300%" id="f1fd734ki7qvy4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+cluster org.apache.wiki.content--><polygon fill="#FFFFFF" filter="url(#f1fd734ki7qvy4)" points="16,6,213,6,220,28.2969,376,28.2969,376,265,16,265,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="220" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="191" x="20" y="20.9951">org.apache.wiki.content</text><!--MD5=[c6f8d8d6992baa81226d892a3de9aa5f]
+class org.apache.wiki.content.PageRenamer--><a href="PageRenamer.html" target="_top" title="PageRenamer.html" xlink:actuate="onRequest" xlink:href="PageRenamer.html" xlink:show="new" xlink:title="PageRenamer.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1fd734ki7qvy4)" height="73.6094" id="org.apache.wiki.content.PageRenamer" style="stroke:#A80036;stroke-width:1.5;" width="326" x="33" y="41"/><ellipse cx="148.25" cy="57" fill="#B4A7E5" rx="11" ry="11" style="s [...]
+class org.apache.wiki.content.DefaultPageRenamer--><a href="DefaultPageRenamer.html" target="_top" title="DefaultPageRenamer.html" xlink:actuate="onRequest" xlink:href="DefaultPageRenamer.html" xlink:show="new" xlink:title="DefaultPageRenamer.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#f1fd734ki7qvy4)" height="73.6094" id="org.apache.wiki.content.DefaultPageRenamer" style="stroke:#A80036;stroke-width:1.5;" width="328" x="32" y="175"/><ellipse cx="125.25" cy=" [...]
+reverse link org.apache.wiki.content.PageRenamer to org.apache.wiki.content.DefaultPageRenamer--><path codeLine="13" d="M196,135.38 C196,148.8 196,162.76 196,174.97 " fill="none" id="org.apache.wiki.content.PageRenamer-backto-org.apache.wiki.content.DefaultPageRenamer" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="189,135.07,196,115.07,203,135.07,189,135.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans- [...]
 @startuml
     namespace org.apache.wiki.content {
 
-        class DefaultPageRenamer [[DefaultPageRenamer.html]] {
-            +renamePage(Context, String, String, boolean): String
-            +firePageRenameEvent(String, String): void
-        }
-
         interface PageRenamer [[PageRenamer.html]] {
             {abstract} +renamePage(Context, String, String, boolean): String
             {abstract} +firePageRenameEvent(String, String): void
         }
 
+        class DefaultPageRenamer [[DefaultPageRenamer.html]] {
+            +renamePage(Context, String, String, boolean): String
+            +firePageRenameEvent(String, String): void
+        }
+
         PageRenamer <|.. DefaultPageRenamer
     }
 
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/ContextualDiffProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/ContextualDiffProvider.svg
index e807773aba..7c4b0dc071 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/ContextualDiffProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/ContextualDiffProvider.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="428px" preserveAspectRatio="none" style="width:318px;height:428px;background:#FFFFFF;" version="1.1" viewBox="0 0 318 428" width="318px" zoomAndPan="magnify"><defs><filter height="300%" id="ft71g8aiz6q9c" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.diff.ContextualDiffProvider--><a href="ContextualDiffProvider.html" target="_top" title="ContextualDiffProvider.html" xlink:actuate="onRequest" xlink:href="ContextualDiffProvider.html" xlink:show="new" xlink:title="ContextualDiffProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ft71g8aiz6q9c)" height="271.6172" id="org.apache.wiki.diff.ContextualDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="297" x="7" y="126"/><ellipse [...]
 class org.apache.wiki.diff.DiffProvider--><a href="DiffProvider.html" target="_top" title="DiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.html" xlink:show="new" xlink:title="DiffProvider.html" xlink:type="simple"><rect codeLine="25" fill="#FEFECE" filter="url(#ft71g8aiz6q9c)" height="58.7422" id="org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="277" x="17" y="7"/><ellipse cx="102.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" styl [...]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.ContextualDiffProvider--><path codeLine="29" d="M155.5,86.59 C155.5,98.5 155.5,111.81 155.5,125.63 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.ContextualDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="148.5,86.26,155.5,66.26,162.5,86.26,148.5,86.26" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-famil [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.ContextualDiffProvider--><path codeLine="29" d="M155.5,86.59 C155.5,98.5 155.5,111.81 155.5,125.63 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.ContextualDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="148.5,86.26,155.5,66.26,162.5,86.26,148.5,86.26" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-famil [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -42,5 +42,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DefaultDifferenceManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DefaultDifferenceManager.svg
index 3fc7af30fe..47429f3aac 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DefaultDifferenceManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DefaultDifferenceManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="254px" preserveAspectRatio="none" style="width:307px;height:254px;background:#FFFFFF;" version="1.1" viewBox="0 0 307 254" width="307px" zoomAndPan="magnify"><defs><filter height="300%" id="fwefoa7jwyen4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.diff.DefaultDifferenceManager--><a href="DefaultDifferenceManager.html" target="_top" title="DefaultDifferenceManager.html" xlink:actuate="onRequest" xlink:href="DefaultDifferenceManager.html" xlink:show="new" xlink:title="DefaultDifferenceManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fwefoa7jwyen4)" height="84.3516" id="org.apache.wiki.diff.DefaultDifferenceManager" style="stroke:#A80036;stroke-width:1.5;" width="286" x="7" y="139 [...]
 class org.apache.wiki.diff.DifferenceManager--><a href="DifferenceManager.html" target="_top" title="DifferenceManager.html" xlink:actuate="onRequest" xlink:href="DifferenceManager.html" xlink:show="new" xlink:title="DifferenceManager.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#fwefoa7jwyen4)" height="71.5469" id="org.apache.wiki.diff.DifferenceManager" style="stroke:#A80036;stroke-width:1.5;" width="251" x="24.5" y="7"/><ellipse cx="80.25" cy="25.9688" fill [...]
-reverse link org.apache.wiki.diff.DifferenceManager to org.apache.wiki.diff.DefaultDifferenceManager--><path codeLine="16" d="M150,99.03 C150,112.32 150,126.29 150,138.81 " fill="none" id="org.apache.wiki.diff.DifferenceManager-backto-org.apache.wiki.diff.DefaultDifferenceManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="143,99.02,150,79.02,157,99.02,143,99.02" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-famil [...]
+reverse link org.apache.wiki.diff.DifferenceManager to org.apache.wiki.diff.DefaultDifferenceManager--><path codeLine="16" d="M150,99.03 C150,112.32 150,126.29 150,138.81 " fill="none" id="org.apache.wiki.diff.DifferenceManager-backto-org.apache.wiki.diff.DefaultDifferenceManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="143,99.02,150,79.02,157,99.02,143,99.02" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-famil [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -29,5 +29,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DiffProvider.NullDiffProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DiffProvider.NullDiffProvider.svg
index b9b09f505f..9888b531e3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DiffProvider.NullDiffProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DiffProvider.NullDiffProvider.svg
@@ -2,7 +2,7 @@
 class org.apache.wiki.diff.DiffProvider.NullDiffProvider--><a href="DiffProvider.NullDiffProvider.html" target="_top" title="DiffProvider.NullDiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.NullDiffProvider.html" xlink:show="new" xlink:title="DiffProvider.NullDiffProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1119jbpkmzgam)" height="84.3516" id="org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-width [...]
 class org.apache.wiki.diff.DiffProvider--><a href="DiffProvider.html" target="_top" title="DiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.html" xlink:show="new" xlink:title="DiffProvider.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#f1119jbpkmzgam)" height="71.5469" id="org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="277" x="8" y="7"/><ellipse cx="93.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style [...]
 reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="18" d="M133.96,99.03 C133.53,112.32 133.77,126.29 134.68,138.81 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="126.97,98.56,135.19,79.02,140.95,99.42,126.97,98.56" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5 [...]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="19" d="M159.59,94.32 C160.29,108.97 160.1,124.8 159.02,138.81 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider-1" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="159.0592" cy="86.999" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036;stroke-width:1.0;" x1= [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="19" d="M159.59,94.32 C160.29,108.97 160.1,124.8 159.02,138.81 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider-1" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="159.0592" cy="86.999" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036;stroke-width:1.0;" x1= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DiffProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DiffProvider.svg
index 4db2a2b96e..9cd5b3378f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DiffProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DiffProvider.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.diff.DiffProvider--><a href="DiffProvider.html" target="_t
 class org.apache.wiki.api.providers.WikiProvider--><a href="../api/providers/WikiProvider.html" target="_top" title="../api/providers/WikiProvider.html" xlink:actuate="onRequest" xlink:href="../api/providers/WikiProvider.html" xlink:show="new" xlink:title="../api/providers/WikiProvider.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1rlq27qboiyno)" height="71.5469" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="21 [...]
 class org.apache.wiki.diff.DiffProvider.NullDiffProvider--><a href="DiffProvider.NullDiffProvider.html" target="_top" title="DiffProvider.NullDiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.NullDiffProvider.html" xlink:show="new" xlink:title="DiffProvider.NullDiffProvider.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#f1rlq27qboiyno)" height="37.9375" id="org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-widt [...]
 reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.diff.DiffProvider--><path codeLine="15" d="M145.5,99.07 C145.5,112.71 145.5,126.79 145.5,138.6 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="138.5,99.06,145.5,79.06,152.5,99.06,138.5,99.06" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e3438b585460cab8bb6696c3e1599f03]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="16" d="M145.5,213.07 C145.5,228.7 145.5,245.47 145.5,257.77 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="145.5" cy="206.04" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036;stroke-width:1.0;" x1="145.5" [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="16" d="M145.5,213.07 C145.5,228.7 145.5,245.47 145.5,257.77 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="145.5" cy="206.04" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line style="stroke:#A80036;stroke-width:1.0;" x1="145.5" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DifferenceManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DifferenceManager.svg
index 57c3d5f081..b315715036 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DifferenceManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/DifferenceManager.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="124px" preserveAspectRatio="none" style="width:272px;height:124px;background:#FFFFFF;" version="1.1" viewBox="0 0 272 124" width="272px" zoomAndPan="magnify"><defs><filter height="300%" id="f1e2h5fdfa1ttb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.diff.DifferenceManager--><a href="DifferenceManager.html" target="_top" title="DifferenceManager.html" xlink:actuate="onRequest" xlink:href="DifferenceManager.html" xlink:show="new" xlink:title="DifferenceManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1e2h5fdfa1ttb)" height="92.3516" id="org.apache.wiki.diff.DifferenceManager" style="stroke:#A80036;stroke-width:1.5;" width="251" x="7" y="7"/><ellipse cx="62.75" cy="25.9688" fill="# [...]
+class org.apache.wiki.diff.DifferenceManager--><a href="DifferenceManager.html" target="_top" title="DifferenceManager.html" xlink:actuate="onRequest" xlink:href="DifferenceManager.html" xlink:show="new" xlink:title="DifferenceManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1e2h5fdfa1ttb)" height="92.3516" id="org.apache.wiki.diff.DifferenceManager" style="stroke:#A80036;stroke-width:1.5;" width="251" x="7" y="7"/><ellipse cx="62.75" cy="25.9688" fill="# [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -20,5 +20,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/ExternalDiffProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/ExternalDiffProvider.svg
index cefb639ba4..68a1a5270b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/ExternalDiffProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/ExternalDiffProvider.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="261px" preserveAspectRatio="none" style="width:300px;height:261px;background:#FFFFFF;" version="1.1" viewBox="0 0 300 261" width="300px" zoomAndPan="magnify"><defs><filter height="300%" id="f1jte4hlwo4g61" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.diff.ExternalDiffProvider--><a href="ExternalDiffProvider.html" target="_top" title="ExternalDiffProvider.html" xlink:actuate="onRequest" xlink:href="ExternalDiffProvider.html" xlink:show="new" xlink:title="ExternalDiffProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1jte4hlwo4g61)" height="105.1563" id="org.apache.wiki.diff.ExternalDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="279" x="7" y="126"/><ellipse cx="75.75" [...]
 class org.apache.wiki.diff.DiffProvider--><a href="DiffProvider.html" target="_top" title="DiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.html" xlink:show="new" xlink:title="DiffProvider.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f1jte4hlwo4g61)" height="58.7422" id="org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="277" x="8" y="7"/><ellipse cx="93.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style [...]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.ExternalDiffProvider--><path codeLine="16" d="M146.5,86.38 C146.5,99.17 146.5,113.01 146.5,125.94 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.ExternalDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="139.5,86.17,146.5,66.17,153.5,86.17,139.5,86.17" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family=" [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.ExternalDiffProvider--><path codeLine="16" d="M146.5,86.38 C146.5,99.17 146.5,113.01 146.5,125.94 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.ExternalDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="139.5,86.17,146.5,66.17,153.5,86.17,139.5,86.17" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -29,5 +29,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/TraditionalDiffProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/TraditionalDiffProvider.svg
index 1f300fc1ad..49a6c90e22 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/TraditionalDiffProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/TraditionalDiffProvider.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:300px;height:241px;background:#FFFFFF;" version="1.1" viewBox="0 0 300 241" width="300px" zoomAndPan="magnify"><defs><filter height="300%" id="f1e9d5lfrergua" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.diff.TraditionalDiffProvider--><a href="TraditionalDiffProvider.html" target="_top" title="TraditionalDiffProvider.html" xlink:actuate="onRequest" xlink:href="TraditionalDiffProvider.html" xlink:show="new" xlink:title="TraditionalDiffProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1e9d5lfrergua)" height="84.3516" id="org.apache.wiki.diff.TraditionalDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="279" x="7" y="126"/><e [...]
 class org.apache.wiki.diff.DiffProvider--><a href="DiffProvider.html" target="_top" title="DiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.html" xlink:show="new" xlink:title="DiffProvider.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f1e9d5lfrergua)" height="58.7422" id="org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="277" x="8" y="7"/><ellipse cx="93.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style [...]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.TraditionalDiffProvider--><path codeLine="15" d="M146.5,86.63 C146.5,99.47 146.5,113.17 146.5,125.56 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.TraditionalDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="139.5,86.24,146.5,66.24,153.5,86.24,139.5,86.24" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-fa [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.TraditionalDiffProvider--><path codeLine="15" d="M146.5,86.63 C146.5,99.47 146.5,113.17 146.5,125.56 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.TraditionalDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="139.5,86.24,146.5,66.24,153.5,86.24,139.5,86.24" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-fa [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/package.svg
index deadde07ce..74bdf04d04 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/diff/package.svg
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="653px" preserveAspectRatio="none" style="width:1626px;height:653px;background:#FFFFFF;" version="1.1" viewBox="0 0 1626 653" width="1626px" zoomAndPan="magnify"><defs><filter height="300%" id="f1oxahacfffsxl" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
-cluster org.apache.wiki.diff--><polygon fill="#FFFFFF" filter="url(#f1oxahacfffsxl)" points="16,167,178,167,185,189.2969,1609,189.2969,1609,630,16,630,16,167" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="185" y1="189.2969" y2="189.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="156" x="20" y="181.9951">org.apache.wiki.diff</text><!--MD5=[3f2b3f282a606937f9c016 [...]
-cluster org.apache.wiki.api.providers--><polygon fill="#FFFFFF" filter="url(#f1oxahacfffsxl)" points="1014,6,1254,6,1261,28.2969,1264,28.2969,1264,143,1014,143,1014,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1014" x2="1261" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="234" x="1018" y="20.9951">org.apache.wiki.api.providers</text><!--MD5=[13 [...]
-class org.apache.wiki.diff.TraditionalDiffProvider--><a href="TraditionalDiffProvider.html" target="_top" title="TraditionalDiffProvider.html" xlink:actuate="onRequest" xlink:href="TraditionalDiffProvider.html" xlink:show="new" xlink:title="TraditionalDiffProvider.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1oxahacfffsxl)" height="86.4141" id="org.apache.wiki.diff.TraditionalDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="279" x="353.5" y="438" [...]
-class org.apache.wiki.diff.ContextualDiffProvider--><a href="ContextualDiffProvider.html" target="_top" title="ContextualDiffProvider.html" xlink:actuate="onRequest" xlink:href="ContextualDiffProvider.html" xlink:show="new" xlink:title="ContextualDiffProvider.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1oxahacfffsxl)" height="265.6797" id="org.apache.wiki.diff.ContextualDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="297" x="667.5" y="348"/><el [...]
-class org.apache.wiki.diff.ExternalDiffProvider--><a href="ExternalDiffProvider.html" target="_top" title="ExternalDiffProvider.html" xlink:actuate="onRequest" xlink:href="ExternalDiffProvider.html" xlink:show="new" xlink:title="ExternalDiffProvider.html" xlink:type="simple"><rect codeLine="29" fill="#FEFECE" filter="url(#f1oxahacfffsxl)" height="99.2188" id="org.apache.wiki.diff.ExternalDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="279" x="999.5" y="431.5"/><ellipse cx=" [...]
-class org.apache.wiki.diff.DiffProvider--><a href="DiffProvider.html" target="_top" title="DiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.html" xlink:show="new" xlink:title="DiffProvider.html" xlink:type="simple"><rect codeLine="36" fill="#FEFECE" filter="url(#f1oxahacfffsxl)" height="60.8047" id="org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="277" x="1000.5" y="214.5"/><ellipse cx="1099.75" cy="230.5" fill="#B4A7E5" rx="11" ry=" [...]
-class org.apache.wiki.diff.DiffProvider.NullDiffProvider--><a href="DiffProvider.NullDiffProvider.html" target="_top" title="DiffProvider.NullDiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.NullDiffProvider.html" xlink:show="new" xlink:title="DiffProvider.NullDiffProvider.html" xlink:type="simple"><rect codeLine="40" fill="#FEFECE" filter="url(#f1oxahacfffsxl)" height="86.4141" id="org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-widt [...]
-class org.apache.wiki.diff.DefaultDifferenceManager--><a href="DefaultDifferenceManager.html" target="_top" title="DefaultDifferenceManager.html" xlink:actuate="onRequest" xlink:href="DefaultDifferenceManager.html" xlink:show="new" xlink:title="DefaultDifferenceManager.html" xlink:type="simple"><rect codeLine="46" fill="#FEFECE" filter="url(#f1oxahacfffsxl)" height="86.4141" id="org.apache.wiki.diff.DefaultDifferenceManager" style="stroke:#A80036;stroke-width:1.5;" width="286" x="32" y=" [...]
-class org.apache.wiki.diff.DifferenceManager--><a href="DifferenceManager.html" target="_top" title="DifferenceManager.html" xlink:actuate="onRequest" xlink:href="DifferenceManager.html" xlink:show="new" xlink:title="DifferenceManager.html" xlink:type="simple"><rect codeLine="52" fill="#FEFECE" filter="url(#f1oxahacfffsxl)" height="86.4141" id="org.apache.wiki.diff.DifferenceManager" style="stroke:#A80036;stroke-width:1.5;" width="251" x="49.5" y="202"/><ellipse cx="111.25" cy="218" fill [...]
-class org.apache.wiki.api.providers.WikiProvider--><a href="../api/providers/WikiProvider.html" target="_top" title="../api/providers/WikiProvider.html" xlink:actuate="onRequest" xlink:href="../api/providers/WikiProvider.html" xlink:show="new" xlink:title="../api/providers/WikiProvider.html" xlink:type="simple"><rect codeLine="68" fill="#FEFECE" filter="url(#f1oxahacfffsxl)" height="86.4141" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="2 [...]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.TraditionalDiffProvider--><path codeLine="58" d="M980.32,259.14 C881.38,272.08 753.62,297.64 650,348 C604.52,370.1 561.19,408.3 531.62,437.93 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.TraditionalDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="979.63,252.17,1000.35,256.64,981.37,266.07,979.63,252.17" style="stroke:#A8003 [...]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.ContextualDiffProvider--><path codeLine="59" d="M1073.75,286.42 C1045.17,304.63 1011.49,326.77 982,348 C976.32,352.09 970.57,356.3 964.79,360.58 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.ContextualDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1070.16,280.41,1090.8,275.64,1077.64,292.24,1070.16,280.41" style="stroke:#A [...]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.ExternalDiffProvider--><path codeLine="60" d="M1139,295.78 C1139,335.83 1139,391.79 1139,431.5 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.ExternalDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1132,295.64,1139,275.64,1146,295.64,1132,295.64" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[feff548d1c1621887c59c8377d101c6e]
-reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.diff.DiffProvider--><path codeLine="61" d="M1139,147.5 C1139,170.47 1139,195.43 1139,214.21 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1132,147.19,1139,127.19,1146,147.19,1132,147.19" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e3438b585460cab8bb6696c3e1599f03]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="62" d="M1190.02,286.76 C1217.04,304.76 1250.18,326.65 1279,348 C1317.34,376.41 1358.56,411.24 1391.58,437.99 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1185.98,292.47,1173.25,275.53,1193.77,280.84,1185.98,292. [...]
-reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="63" d="M1216.3,283.21 C1247.61,301.84 1283.26,325.23 1314,348 C1352.34,376.41 1393.56,411.24 1421.56,437.99 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider-1" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="1210.0839" cy="279.5718" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
-reverse link org.apache.wiki.diff.DifferenceManager to org.apache.wiki.diff.DefaultDifferenceManager--><path codeLine="64" d="M175,308.32 C175,349.27 175,401.74 175,437.84 " fill="none" id="org.apache.wiki.diff.DifferenceManager-backto-org.apache.wiki.diff.DefaultDifferenceManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="168,308.1,175,288.1,182,308.1,168,308.1" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-fami [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="653px" preserveAspectRatio="none" style="width:1626px;height:653px;background:#FFFFFF;" version="1.1" viewBox="0 0 1626 653" width="1626px" zoomAndPan="magnify"><defs><filter height="300%" id="fg246b1dkqllj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
+cluster org.apache.wiki.diff--><polygon fill="#FFFFFF" filter="url(#fg246b1dkqllj)" points="16,167,178,167,185,189.2969,1609,189.2969,1609,630,16,630,16,167" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="185" y1="189.2969" y2="189.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="156" x="20" y="181.9951">org.apache.wiki.diff</text><!--MD5=[3f2b3f282a606937f9c016a [...]
+cluster org.apache.wiki.api.providers--><polygon fill="#FFFFFF" filter="url(#fg246b1dkqllj)" points="693,6,933,6,940,28.2969,943,28.2969,943,143,693,143,693,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="693" x2="940" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="234" x="697" y="20.9951">org.apache.wiki.api.providers</text><!--MD5=[137a59db26e32 [...]
+class org.apache.wiki.diff.TraditionalDiffProvider--><a href="TraditionalDiffProvider.html" target="_top" title="TraditionalDiffProvider.html" xlink:actuate="onRequest" xlink:href="TraditionalDiffProvider.html" xlink:show="new" xlink:title="TraditionalDiffProvider.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fg246b1dkqllj)" height="86.4141" id="org.apache.wiki.diff.TraditionalDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="279" x="32.5" y="438"/> [...]
+class org.apache.wiki.diff.ContextualDiffProvider--><a href="ContextualDiffProvider.html" target="_top" title="ContextualDiffProvider.html" xlink:actuate="onRequest" xlink:href="ContextualDiffProvider.html" xlink:show="new" xlink:title="ContextualDiffProvider.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#fg246b1dkqllj)" height="265.6797" id="org.apache.wiki.diff.ContextualDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="297" x="346.5" y="348"/><ell [...]
+class org.apache.wiki.diff.DifferenceManager--><a href="DifferenceManager.html" target="_top" title="DifferenceManager.html" xlink:actuate="onRequest" xlink:href="DifferenceManager.html" xlink:show="new" xlink:title="DifferenceManager.html" xlink:type="simple"><rect codeLine="29" fill="#FEFECE" filter="url(#fg246b1dkqllj)" height="86.4141" id="org.apache.wiki.diff.DifferenceManager" style="stroke:#A80036;stroke-width:1.5;" width="251" x="1324.5" y="202"/><ellipse cx="1386.25" cy="218" fi [...]
+class org.apache.wiki.diff.ExternalDiffProvider--><a href="ExternalDiffProvider.html" target="_top" title="ExternalDiffProvider.html" xlink:actuate="onRequest" xlink:href="ExternalDiffProvider.html" xlink:show="new" xlink:title="ExternalDiffProvider.html" xlink:type="simple"><rect codeLine="35" fill="#FEFECE" filter="url(#fg246b1dkqllj)" height="99.2188" id="org.apache.wiki.diff.ExternalDiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="279" x="678.5" y="431.5"/><ellipse cx="7 [...]
+class org.apache.wiki.diff.DefaultDifferenceManager--><a href="DefaultDifferenceManager.html" target="_top" title="DefaultDifferenceManager.html" xlink:actuate="onRequest" xlink:href="DefaultDifferenceManager.html" xlink:show="new" xlink:title="DefaultDifferenceManager.html" xlink:type="simple"><rect codeLine="42" fill="#FEFECE" filter="url(#fg246b1dkqllj)" height="86.4141" id="org.apache.wiki.diff.DefaultDifferenceManager" style="stroke:#A80036;stroke-width:1.5;" width="286" x="1307" y= [...]
+class org.apache.wiki.diff.DiffProvider--><a href="DiffProvider.html" target="_top" title="DiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.html" xlink:show="new" xlink:title="DiffProvider.html" xlink:type="simple"><rect codeLine="48" fill="#FEFECE" filter="url(#fg246b1dkqllj)" height="60.8047" id="org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.5;" width="277" x="679.5" y="214.5"/><ellipse cx="778.75" cy="230.5" fill="#B4A7E5" rx="11" ry="11" [...]
+class org.apache.wiki.diff.DiffProvider.NullDiffProvider--><a href="DiffProvider.NullDiffProvider.html" target="_top" title="DiffProvider.NullDiffProvider.html" xlink:actuate="onRequest" xlink:href="DiffProvider.NullDiffProvider.html" xlink:show="new" xlink:title="DiffProvider.NullDiffProvider.html" xlink:type="simple"><rect codeLine="52" fill="#FEFECE" filter="url(#fg246b1dkqllj)" height="86.4141" id="org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-width [...]
+class org.apache.wiki.api.providers.WikiProvider--><a href="../api/providers/WikiProvider.html" target="_top" title="../api/providers/WikiProvider.html" xlink:actuate="onRequest" xlink:href="../api/providers/WikiProvider.html" xlink:show="new" xlink:title="../api/providers/WikiProvider.html" xlink:type="simple"><rect codeLine="68" fill="#FEFECE" filter="url(#fg246b1dkqllj)" height="86.4141" id="org.apache.wiki.api.providers.WikiProvider" style="stroke:#A80036;stroke-width:1.5;" width="21 [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.TraditionalDiffProvider--><path codeLine="58" d="M659.32,259.14 C560.38,272.08 432.62,297.64 329,348 C283.52,370.1 240.19,408.3 210.62,437.93 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.TraditionalDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="658.63,252.17,679.35,256.64,660.37,266.07,658.63,252.17" style="stroke:#A80036 [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.ContextualDiffProvider--><path codeLine="59" d="M752.75,286.42 C724.17,304.63 690.49,326.77 661,348 C655.32,352.09 649.57,356.3 643.79,360.58 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.ContextualDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="749.16,280.41,769.8,275.64,756.64,292.24,749.16,280.41" style="stroke:#A80036;s [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.ExternalDiffProvider--><path codeLine="60" d="M818,295.78 C818,335.83 818,391.79 818,431.5 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.ExternalDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="811,295.64,818,275.64,825,295.64,811,295.64" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[4e5014feda05a720923f36f5627af5eb]
+reverse link org.apache.wiki.diff.DifferenceManager to org.apache.wiki.diff.DefaultDifferenceManager--><path codeLine="61" d="M1450,308.32 C1450,349.27 1450,401.74 1450,437.84 " fill="none" id="org.apache.wiki.diff.DifferenceManager-backto-org.apache.wiki.diff.DefaultDifferenceManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1443,308.1,1450,288.1,1457,308.1,1443,308.1" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[feff548d1c162 [...]
+reverse link org.apache.wiki.api.providers.WikiProvider to org.apache.wiki.diff.DiffProvider--><path codeLine="62" d="M818,147.5 C818,170.47 818,195.43 818,214.21 " fill="none" id="org.apache.wiki.api.providers.WikiProvider-backto-org.apache.wiki.diff.DiffProvider" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="811,147.19,818,127.19,825,147.19,811,147.19" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e3438b585460cab8bb6696c3e1599f03]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="63" d="M869.02,286.76 C896.04,304.76 929.18,326.65 958,348 C996.34,376.41 1037.56,411.24 1070.58,437.99 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="864.98,292.47,852.25,275.53,872.77,280.84,864.98,292.47" style [...]
+reverse link org.apache.wiki.diff.DiffProvider to org.apache.wiki.diff.DiffProvider.NullDiffProvider--><path codeLine="64" d="M895.3,283.21 C926.61,301.84 962.26,325.23 993,348 C1031.34,376.41 1072.56,411.24 1100.56,437.99 " fill="none" id="org.apache.wiki.diff.DiffProvider-backto-org.apache.wiki.diff.DiffProvider.NullDiffProvider-1" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="889.0839" cy="279.5718" fill="#FFFFFF" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.0;"/><line  [...]
 @startuml
     namespace org.apache.wiki.diff {
 
@@ -45,6 +45,12 @@ reverse link org.apache.wiki.diff.DifferenceManager to org.apache.wiki.diff.Defa
             +makeDiffHtml(Context, String, String): String
         }
 
+        interface DifferenceManager [[DifferenceManager.html]] {
+            {static} +PROP_DIFF_PROVIDER: String
+            {abstract} +makeDiff(Context, String, String): String
+            {abstract} +getDiff(Context, int, int): String
+        }
+
         class ExternalDiffProvider [[ExternalDiffProvider.html]] {
             {static} +PROP_DIFFCOMMAND: String
             +getProviderInfo(): String
@@ -52,6 +58,12 @@ reverse link org.apache.wiki.diff.DifferenceManager to org.apache.wiki.diff.Defa
             +makeDiffHtml(Context, String, String): String
         }
 
+        class DefaultDifferenceManager [[DefaultDifferenceManager.html]] {
+            +DefaultDifferenceManager(Engine, Properties)
+            +makeDiff(Context, String, String): String
+            +getDiff(Context, int, int): String
+        }
+
         interface DiffProvider [[DiffProvider.html]] {
             {abstract} +makeDiffHtml(Context, String, String): String
         }
@@ -62,25 +74,13 @@ reverse link org.apache.wiki.diff.DifferenceManager to org.apache.wiki.diff.Defa
             +getProviderInfo(): String
         }
 
-        class DefaultDifferenceManager [[DefaultDifferenceManager.html]] {
-            +DefaultDifferenceManager(Engine, Properties)
-            +makeDiff(Context, String, String): String
-            +getDiff(Context, int, int): String
-        }
-
-        interface DifferenceManager [[DifferenceManager.html]] {
-            {static} +PROP_DIFF_PROVIDER: String
-            {abstract} +makeDiff(Context, String, String): String
-            {abstract} +getDiff(Context, int, int): String
-        }
-
         DiffProvider <|.. TraditionalDiffProvider
         DiffProvider <|.. ContextualDiffProvider
         DiffProvider <|.. ExternalDiffProvider
+        DifferenceManager <|.. DefaultDifferenceManager
         org.apache.wiki.api.providers.WikiProvider <|- - DiffProvider
         DiffProvider <|.. org.apache.wiki.diff.DiffProvider.NullDiffProvider
         DiffProvider +- - org.apache.wiki.diff.DiffProvider.NullDiffProvider
-        DifferenceManager <|.. DefaultDifferenceManager
     }
 
     namespace org.apache.wiki.api.providers {
@@ -100,5 +100,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEngineEvent.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEngineEvent.svg
index fbc7ecfe9d..f9c185dd47 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEngineEvent.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEngineEvent.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:208px;height:304px;background:#FFFFFF;" version="1.1" viewBox="0 0 208 304" width="208px" zoomAndPan="magnify"><defs><filter height="300%" id="f1uu8ugdcvodgh" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.event.WikiEngineEvent--><a href="WikiEngineEvent.html" target="_top" title="WikiEngineEvent.html" xlink:actuate="onRequest" xlink:href="WikiEngineEvent.html" xlink:show="new" xlink:title="WikiEngineEvent.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1uu8ugdcvodgh)" height="169.1797" id="org.apache.wiki.event.WikiEngineEvent" style="stroke:#A80036;stroke-width:1.5;" width="185" x="9" y="105"/><ellipse cx="41.55" cy="123.9688" fill="#ADD1B2 [...]
 class org.apache.wiki.event.WikiEvent--><a href="WikiEvent.html" target="_top" title="WikiEvent.html" xlink:actuate="onRequest" xlink:href="WikiEvent.html" xlink:show="new" xlink:title="WikiEvent.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#f1uu8ugdcvodgh)" height="37.9375" id="org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.5;" width="141" x="31" y="7"/><ellipse cx="46" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;s [...]
-reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiEngineEvent--><path codeLine="19" d="M101.5,65.65 C101.5,77.59 101.5,91.24 101.5,104.99 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiEngineEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="94.5,65.21,101.5,45.21,108.5,65.21,94.5,65.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust= [...]
+reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiEngineEvent--><path codeLine="19" d="M101.5,65.65 C101.5,77.59 101.5,91.24 101.5,104.99 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiEngineEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="94.5,65.21,101.5,45.21,108.5,65.21,94.5,65.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -32,5 +32,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEvent.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEvent.svg
index 03d4232e7e..5bf70738ce 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEvent.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEvent.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="356px" preserveAspectRatio="none" style="width:223px;height:356px;background:#FFFFFF;" version="1.1" viewBox="0 0 223 356" width="223px" zoomAndPan="magnify"><defs><filter height="300%" id="f8sglk1n6pw9i" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.event.WikiEvent--><a href="WikiEvent.html" target="_top" title="WikiEvent.html" xlink:actuate="onRequest" xlink:href="WikiEvent.html" xlink:show="new" xlink:title="WikiEvent.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f8sglk1n6pw9i)" height="220.3984" id="org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.5;" width="200" x="9" y="105"/><ellipse cx="50.55" cy="123.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A800 [...]
 class java.util.EventObject--><rect codeLine="21" fill="#FEFECE" filter="url(#f8sglk1n6pw9i)" height="37.9375" id="java.util.EventObject" style="stroke:#A80036;stroke-width:1.5;" width="116" x="51" y="7"/><ellipse cx="66" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M68.9688,31.6094 Q68.3906,31.9063 67.75,32.0469 Q67.1094,32.2031 66.4063,32.2031 Q63.9063,32.2031 62.5781,30.5625 Q61.2656,28.9063 61.2656,25.7813 Q61.2656,22.6563 62.5781,21  [...]
-reverse link java.util.EventObject to org.apache.wiki.event.WikiEvent--><path codeLine="23" d="M109,65.34 C109,77.12 109,90.73 109,104.82 " fill="none" id="java.util.EventObject-backto-org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="102,65.27,109,45.27,116,65.27,102,65.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="9" y="347.6807"> [...]
+reverse link java.util.EventObject to org.apache.wiki.event.WikiEvent--><path codeLine="23" d="M109,65.34 C109,77.12 109,90.73 109,104.82 " fill="none" id="java.util.EventObject-backto-org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="102,65.27,109,45.27,116,65.27,102,65.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="9" y="347.6807"> [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -36,5 +36,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventEmitter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventEmitter.svg
index ad1a209faa..06b7c4c697 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventEmitter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventEmitter.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:358px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 358 162" width="358px" zoomAndPan="magnify"><defs><filter height="300%" id="fd9i43lyh75e2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.event.WikiEventEmitter--><a href="WikiEventEmitter.html" target="_top" title="WikiEventEmitter.html" xlink:actuate="onRequest" xlink:href="WikiEventEmitter.html" xlink:show="new" xlink:title="WikiEventEmitter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fd9i43lyh75e2)" height="130.7656" id="org.apache.wiki.event.WikiEventEmitter" style="stroke:#A80036;stroke-width:1.5;" width="337" x="7" y="7"/><ellipse cx="113.75" cy="25.9688" fill="#EB9 [...]
+class org.apache.wiki.event.WikiEventEmitter--><a href="WikiEventEmitter.html" target="_top" title="WikiEventEmitter.html" xlink:actuate="onRequest" xlink:href="WikiEventEmitter.html" xlink:show="new" xlink:title="WikiEventEmitter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fd9i43lyh75e2)" height="130.7656" id="org.apache.wiki.event.WikiEventEmitter" style="stroke:#A80036;stroke-width:1.5;" width="337" x="7" y="7"/><ellipse cx="113.75" cy="25.9688" fill="#EB9 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventListener.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventListener.svg
index b40a94dabd..b9ca04700a 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventListener.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventListener.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:236px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 236 194" width="236px" zoomAndPan="magnify"><defs><filter height="300%" id="f1h3p1ziyz7wb9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.event.WikiEventListener--><a href="WikiEventListener.html" target="_top" title="WikiEventListener.html" xlink:actuate="onRequest" xlink:href="WikiEventListener.html" xlink:show="new" xlink:title="WikiEventListener.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1h3p1ziyz7wb9)" height="58.7422" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x="7" y="105"/><ellipse cx="49" cy="123.9688" fill= [...]
 class java.util.EventListener--><rect codeLine="9" fill="#FEFECE" filter="url(#f1h3p1ziyz7wb9)" height="37.9375" id="java.util.EventListener" style="stroke:#A80036;stroke-width:1.5;" width="127" x="51" y="7"/><ellipse cx="66" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M61.9219,21.7344 L61.9219,19.5781 L69.3125,19.5781 L69.3125,21.7344 L66.8438,21.7344 L66.8438,29.8125 L69.3125,29.8125 L69.3125,31.9688 L61.9219,31.9688 L61.9219,29.8125 L [...]
-reverse link java.util.EventListener to org.apache.wiki.event.WikiEventListener--><path codeLine="11" d="M114.5,65.22 C114.5,78.3 114.5,92.7 114.5,104.89 " fill="none" id="java.util.EventListener-backto-org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="107.5,65.07,114.5,45.07,121.5,65.07,107.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" te [...]
+reverse link java.util.EventListener to org.apache.wiki.event.WikiEventListener--><path codeLine="11" d="M114.5,65.22 C114.5,78.3 114.5,92.7 114.5,104.89 " fill="none" id="java.util.EventListener-backto-org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="107.5,65.07,114.5,45.07,121.5,65.07,107.5,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" te [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventManager.svg
index f7481b591a..ca5dab34ce 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiEventManager.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="180px" preserveAspectRatio="none" style="width:391px;height:180px;background:#FFFFFF;" version="1.1" viewBox="0 0 391 180" width="391px" zoomAndPan="magnify"><defs><filter height="300%" id="fzexnnqohhh3j" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.event.WikiEventManager--><a href="WikiEventManager.html" target="_top" title="WikiEventManager.html" xlink:actuate="onRequest" xlink:href="WikiEventManager.html" xlink:show="new" xlink:title="WikiEventManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fzexnnqohhh3j)" height="148.375" id="org.apache.wiki.event.WikiEventManager" style="stroke:#A80036;stroke-width:1.5;" width="370" x="7" y="7"/><ellipse cx="124.75" cy="25.9688" fill="#ADD1 [...]
+class org.apache.wiki.event.WikiEventManager--><a href="WikiEventManager.html" target="_top" title="WikiEventManager.html" xlink:actuate="onRequest" xlink:href="WikiEventManager.html" xlink:show="new" xlink:title="WikiEventManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fzexnnqohhh3j)" height="148.375" id="org.apache.wiki.event.WikiEventManager" style="stroke:#A80036;stroke-width:1.5;" width="370" x="7" y="7"/><ellipse cx="124.75" cy="25.9688" fill="#ADD1 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiPageEvent.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiPageEvent.svg
index 0cb6a43e99..c32d828b85 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiPageEvent.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiPageEvent.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="497px" preserveAspectRatio="none" style="width:235px;height:497px;background:#FFFFFF;" version="1.1" viewBox="0 0 235 497" width="235px" zoomAndPan="magnify"><defs><filter height="300%" id="f1w8p3trm2ycmi" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.event.WikiPageEvent--><a href="WikiPageEvent.html" target="_top" title="WikiPageEvent.html" xlink:actuate="onRequest" xlink:href="WikiPageEvent.html" xlink:show="new" xlink:title="WikiPageEvent.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1w8p3trm2ycmi)" height="361.25" id="org.apache.wiki.event.WikiPageEvent" style="stroke:#A80036;stroke-width:1.5;" width="214" x="7" y="105"/><ellipse cx="57.25" cy="123.9688" fill="#ADD1B2" rx="11" ry=" [...]
 class org.apache.wiki.event.WikiEvent--><a href="WikiEvent.html" target="_top" title="WikiEvent.html" xlink:actuate="onRequest" xlink:href="WikiEvent.html" xlink:show="new" xlink:title="WikiEvent.html" xlink:type="simple"><rect codeLine="32" fill="#FEFECE" filter="url(#f1w8p3trm2ycmi)" height="37.9375" id="org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.5;" width="141" x="43.5" y="7"/><ellipse cx="58.5" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A800 [...]
-reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiPageEvent--><path codeLine="34" d="M114,65.22 C114,76.78 114,90.31 114,104.89 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiPageEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="107,65.11,114,45.11,121,65.11,107,65.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLeng [...]
+reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiPageEvent--><path codeLine="34" d="M114,65.22 C114,76.78 114,90.31 114,104.89 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiPageEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="107,65.11,114,45.11,121,65.11,107,65.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLeng [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -47,5 +47,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiPageRenameEvent.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiPageRenameEvent.svg
index a85142f7f3..cf0a2ea378 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiPageRenameEvent.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiPageRenameEvent.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="279px" preserveAspectRatio="none" style="width:301px;height:279px;background:#FFFFFF;" version="1.1" viewBox="0 0 301 279" width="301px" zoomAndPan="magnify"><defs><filter height="300%" id="f1pzk2c9d31d6n" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.event.WikiPageRenameEvent--><a href="WikiPageRenameEvent.html" target="_top" title="WikiPageRenameEvent.html" xlink:actuate="onRequest" xlink:href="WikiPageRenameEvent.html" xlink:show="new" xlink:title="WikiPageRenameEvent.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1pzk2c9d31d6n)" height="143.5703" id="org.apache.wiki.event.WikiPageRenameEvent" style="stroke:#A80036;stroke-width:1.5;" width="280" x="7" y="105"/><ellipse cx="63.25" cy= [...]
 class org.apache.wiki.event.WikiPageEvent--><a href="WikiPageEvent.html" target="_top" title="WikiPageEvent.html" xlink:actuate="onRequest" xlink:href="WikiPageEvent.html" xlink:show="new" xlink:title="WikiPageEvent.html" xlink:type="simple"><rect codeLine="15" fill="#FEFECE" filter="url(#f1pzk2c9d31d6n)" height="37.9375" id="org.apache.wiki.event.WikiPageEvent" style="stroke:#A80036;stroke-width:1.5;" width="137" x="78.5" y="7"/><ellipse cx="93.5" cy="25.9688" fill="#ADD1B2" rx="11" ry= [...]
-reverse link org.apache.wiki.event.WikiPageEvent to org.apache.wiki.event.WikiPageRenameEvent--><path codeLine="17" d="M147,65.38 C147,77.45 147,91.2 147,104.8 " fill="none" id="org.apache.wiki.event.WikiPageEvent-backto-org.apache.wiki.event.WikiPageRenameEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="140,65.27,147,45.27,154,65.27,140,65.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust= [...]
+reverse link org.apache.wiki.event.WikiPageEvent to org.apache.wiki.event.WikiPageRenameEvent--><path codeLine="17" d="M147,65.38 C147,77.45 147,91.2 147,104.8 " fill="none" id="org.apache.wiki.event.WikiPageEvent-backto-org.apache.wiki.event.WikiPageRenameEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="140,65.27,147,45.27,154,65.27,140,65.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -30,5 +30,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiSecurityEvent.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiSecurityEvent.svg
index 5228f9ac2d..577e62191e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiSecurityEvent.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WikiSecurityEvent.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="484px" preserveAspectRatio="none" style="width:311px;height:484px;background:#FFFFFF;" version="1.1" viewBox="0 0 311 484" width="311px" zoomAndPan="magnify"><defs><filter height="300%" id="f35w59r0wbrsl" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.event.WikiSecurityEvent--><a href="WikiSecurityEvent.html" target="_top" title="WikiSecurityEvent.html" xlink:actuate="onRequest" xlink:href="WikiSecurityEvent.html" xlink:show="new" xlink:title="WikiSecurityEvent.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f35w59r0wbrsl)" height="348.4453" id="org.apache.wiki.event.WikiSecurityEvent" style="stroke:#A80036;stroke-width:1.5;" width="290" x="7" y="105"/><ellipse cx="87.25" cy="123.9688" fi [...]
 class org.apache.wiki.event.WikiEvent--><a href="WikiEvent.html" target="_top" title="WikiEvent.html" xlink:actuate="onRequest" xlink:href="WikiEvent.html" xlink:show="new" xlink:title="WikiEvent.html" xlink:type="simple"><rect codeLine="31" fill="#FEFECE" filter="url(#f35w59r0wbrsl)" height="37.9375" id="org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.5;" width="141" x="81.5" y="7"/><ellipse cx="96.5" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A8003 [...]
-reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiSecurityEvent--><path codeLine="33" d="M152,65.19 C152,76.77 152,90.32 152,104.87 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiSecurityEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="145,65.05,152,45.05,159,65.05,145,65.05" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing"  [...]
+reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiSecurityEvent--><path codeLine="33" d="M152,65.19 C152,76.77 152,90.32 152,104.87 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiSecurityEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="145,65.05,152,45.05,159,65.05,145,65.05" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -46,5 +46,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WorkflowEvent.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WorkflowEvent.svg
index 2727423fa3..5e6418def9 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WorkflowEvent.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/WorkflowEvent.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="356px" preserveAspectRatio="none" style="width:250px;height:356px;background:#FFFFFF;" version="1.1" viewBox="0 0 250 356" width="250px" zoomAndPan="magnify"><defs><filter height="300%" id="f1pr96tou6kmnj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.event.WorkflowEvent--><a href="WorkflowEvent.html" target="_top" title="WorkflowEvent.html" xlink:actuate="onRequest" xlink:href="WorkflowEvent.html" xlink:show="new" xlink:title="WorkflowEvent.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1pr96tou6kmnj)" height="220.3984" id="org.apache.wiki.event.WorkflowEvent" style="stroke:#A80036;stroke-width:1.5;" width="229" x="7" y="105"/><ellipse cx="64.75" cy="123.9688" fill="#ADD1B2" rx="11" ry [...]
 class org.apache.wiki.event.WikiEvent--><a href="WikiEvent.html" target="_top" title="WikiEvent.html" xlink:actuate="onRequest" xlink:href="WikiEvent.html" xlink:show="new" xlink:title="WikiEvent.html" xlink:type="simple"><rect codeLine="21" fill="#FEFECE" filter="url(#f1pr96tou6kmnj)" height="37.9375" id="org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.5;" width="141" x="51" y="7"/><ellipse cx="66" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;s [...]
-reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WorkflowEvent--><path codeLine="23" d="M121.5,65.34 C121.5,77.12 121.5,90.73 121.5,104.82 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WorkflowEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="114.5,65.27,121.5,45.27,128.5,65.27,114.5,65.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="s [...]
+reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WorkflowEvent--><path codeLine="23" d="M121.5,65.34 C121.5,77.12 121.5,90.73 121.5,104.82 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WorkflowEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="114.5,65.27,121.5,45.27,128.5,65.27,114.5,65.27" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="s [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -36,5 +36,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/package.svg
index 4aa58763bb..0793f9a670 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/event/package.svg
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1043px" preserveAspectRatio="none" style="width:1293px;height:1043px;background:#FFFFFF;" version="1.1" viewBox="0 0 1293 1043" width="1293px" zoomAndPan="magnify"><defs><filter height="300%" id="foyk9nuby9fgj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDe [...]
-cluster org.apache.wiki.event--><polygon fill="#FFFFFF" filter="url(#foyk9nuby9fgj)" points="16,142,197,142,204,164.2969,1276,164.2969,1276,1020,16,1020,16,142" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="204" y1="164.2969" y2="164.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="175" x="20" y="156.9951">org.apache.wiki.event</text><!--MD5=[7db3c59d38ae5b37b48 [...]
-cluster java.util--><polygon fill="#FFFFFF" filter="url(#foyk9nuby9fgj)" points="889,6,955,6,962,28.2969,1183,28.2969,1183,118,889,118,889,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="889" x2="962" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="60" x="893" y="20.9951">java.util</text><!--MD5=[f446c960100be19ea2d545d524e5c6f7]
-class org.apache.wiki.event.WikiPageRenameEvent--><a href="WikiPageRenameEvent.html" target="_top" title="WikiPageRenameEvent.html" xlink:actuate="onRequest" xlink:href="WikiPageRenameEvent.html" xlink:show="new" xlink:title="WikiPageRenameEvent.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="137.6328" id="org.apache.wiki.event.WikiPageRenameEvent" style="stroke:#A80036;stroke-width:1.5;" width="280" x="980" y="866"/><ellipse cx="1044.75"  [...]
-class org.apache.wiki.event.WikiEvent--><a href="WikiEvent.html" target="_top" title="WikiEvent.html" xlink:actuate="onRequest" xlink:href="WikiEvent.html" xlink:show="new" xlink:title="WikiEvent.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="214.4609" id="org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.5;" width="200" x="1060" y="177"/><ellipse cx="1125.75" cy="193" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80 [...]
-class org.apache.wiki.event.WikiEventListener--><a href="WikiEventListener.html" target="_top" title="WikiEventListener.html" xlink:actuate="onRequest" xlink:href="WikiEventListener.html" xlink:show="new" xlink:title="WikiEventListener.html" xlink:type="simple"><rect codeLine="29" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="60.8047" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x="809.5" y="253.5"/><ellipse cx="857.75" cy="269.5 [...]
-class org.apache.wiki.event.WikiSecurityEvent--><a href="WikiSecurityEvent.html" target="_top" title="WikiSecurityEvent.html" xlink:actuate="onRequest" xlink:href="WikiSecurityEvent.html" xlink:show="new" xlink:title="WikiSecurityEvent.html" xlink:type="simple"><rect codeLine="33" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="342.5078" id="org.apache.wiki.event.WikiSecurityEvent" style="stroke:#A80036;stroke-width:1.5;" width="290" x="236" y="457"/><ellipse cx="322.25" cy="473" fil [...]
-class org.apache.wiki.event.WikiEngineEvent--><a href="WikiEngineEvent.html" target="_top" title="WikiEngineEvent.html" xlink:actuate="onRequest" xlink:href="WikiEngineEvent.html" xlink:show="new" xlink:title="WikiEngineEvent.html" xlink:type="simple"><rect codeLine="59" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="163.2422" id="org.apache.wiki.event.WikiEngineEvent" style="stroke:#A80036;stroke-width:1.5;" width="185" x="561.5" y="547"/><ellipse cx="599.45" cy="563" fill="#ADD1B2 [...]
-class org.apache.wiki.event.WorkflowEvent--><a href="WorkflowEvent.html" target="_top" title="WorkflowEvent.html" xlink:actuate="onRequest" xlink:href="WorkflowEvent.html" xlink:show="new" xlink:title="WorkflowEvent.html" xlink:type="simple"><rect codeLine="71" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="214.4609" id="org.apache.wiki.event.WorkflowEvent" style="stroke:#A80036;stroke-width:1.5;" width="229" x="781.5" y="521.5"/><ellipse cx="846.75" cy="537.5" fill="#ADD1B2" rx="11 [...]
-class org.apache.wiki.event.WikiPageEvent--><a href="WikiPageEvent.html" target="_top" title="WikiPageEvent.html" xlink:actuate="onRequest" xlink:href="WikiPageEvent.html" xlink:show="new" xlink:title="WikiPageEvent.html" xlink:type="simple"><rect codeLine="87" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="355.3125" id="org.apache.wiki.event.WikiPageEvent" style="stroke:#A80036;stroke-width:1.5;" width="214" x="1046" y="451"/><ellipse cx="1103.25" cy="467" fill="#ADD1B2" rx="11" ry [...]
-class org.apache.wiki.event.WikiEventEmitter--><a href="WikiEventEmitter.html" target="_top" title="WikiEventEmitter.html" xlink:actuate="onRequest" xlink:href="WikiEventEmitter.html" xlink:show="new" xlink:title="WikiEventEmitter.html" xlink:type="simple"><rect codeLine="114" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="124.8281" id="org.apache.wiki.event.WikiEventEmitter" style="stroke:#A80036;stroke-width:1.5;" width="337" x="437.5" y="221.5"/><ellipse cx="549.75" cy="237.5" fi [...]
-class org.apache.wiki.event.WikiEventManager--><a href="WikiEventManager.html" target="_top" title="WikiEventManager.html" xlink:actuate="onRequest" xlink:href="WikiEventManager.html" xlink:show="new" xlink:title="WikiEventManager.html" xlink:type="simple"><rect codeLine="123" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="150.4375" id="org.apache.wiki.event.WikiEventManager" style="stroke:#A80036;stroke-width:1.5;" width="370" x="32" y="209"/><ellipse cx="155.75" cy="225" fill="#AD [...]
-class java.util.EventObject--><rect codeLine="144" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="60.8047" id="java.util.EventObject" style="stroke:#A80036;stroke-width:1.5;" width="109" x="1057.5" y="41"/><ellipse cx="1073.4" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1076.3688,62.6406 Q1075.7906,62.9375 1075.15,63.0781 Q1074.5094,63.2344 1073.8063,63.2344 Q1071.3063,63.2344 1069.9781,61.5938 Q1068.6656,59.9375 1068.6656,56.8125 Q1068 [...]
-class java.util.EventListener--><rect codeLine="147" fill="#FEFECE" filter="url(#foyk9nuby9fgj)" height="48" id="java.util.EventListener" style="stroke:#A80036;stroke-width:1.5;" width="117" x="905.5" y="47.5"/><ellipse cx="920.5" cy="63.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M916.4219,59.2656 L916.4219,57.1094 L923.8125,57.1094 L923.8125,59.2656 L921.3438,59.2656 L921.3438,67.3438 L923.8125,67.3438 L923.8125,69.5 L916.4219,69.5 L916.4219,67. [...]
-reverse link org.apache.wiki.event.WikiPageEvent to org.apache.wiki.event.WikiPageRenameEvent--><path codeLine="134" d="M1131.68,826.23 C1130.17,840.19 1128.71,853.6 1127.38,865.93 " fill="none" id="org.apache.wiki.event.WikiPageEvent-backto-org.apache.wiki.event.WikiPageRenameEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1124.74,825.32,1133.85,806.19,1138.66,826.83,1124.74,825.32" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[0b8a6039eba66215e8e6a339 [...]
-reverse link java.util.EventObject to org.apache.wiki.event.WikiEvent--><path codeLine="135" d="M1123.28,121.96 C1127.06,138.53 1131.43,157.7 1135.81,176.91 " fill="none" id="java.util.EventObject-backto-org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1116.4,123.27,1118.78,102.21,1130.05,120.16,1116.4,123.27" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[aa1de7a9774087a42409639b2f35eb75]
-reverse link java.util.EventListener to org.apache.wiki.event.WikiEventListener--><path codeLine="136" d="M954.38,115.57 C945.2,156.71 931.6,217.6 923.59,253.5 " fill="none" id="java.util.EventListener-backto-org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="947.6,113.83,958.79,95.83,961.26,116.88,947.6,113.83" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b85d77cd26af0e1b6337192369377426]
-reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiSecurityEvent--><path codeLine="137" d="M1042.28,390.87 C1042.19,390.91 1042.09,390.96 1042,391 C838.98,483.1 742.51,349.54 544,451 C537.96,454.08 532.04,457.49 526.23,461.16 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiSecurityEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1038.79,384.8,1059.75,381.65,1045.33,397.18,1038.79,384.8" style="stroke:# [...]
-reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiEngineEvent--><path codeLine="138" d="M1042.28,390.86 C1042.19,390.9 1042.09,390.95 1042,391 C929.43,448.5 867.38,378.28 764,451 C730.33,474.68 704.84,512.27 686.91,546.69 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiEngineEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1038.96,384.69,1059.78,380.74,1045.96,396.81,1038.96,384.69" style="stroke:#A80 [...]
-reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WorkflowEvent--><path codeLine="139" d="M1062.99,407.29 C1051.49,421.98 1039.95,436.8 1029,451 C1011.54,473.64 992.98,498.04 975.44,521.28 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WorkflowEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1057.58,402.85,1075.43,391.44,1068.59,411.49,1057.58,402.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ed499d [...]
-reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiPageEvent--><path codeLine="140" d="M1157.42,411.08 C1157.16,424.07 1156.88,437.43 1156.61,450.83 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiPageEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1150.43,410.88,1157.83,391.02,1164.42,411.16,1150.43,410.88" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-s [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1043px" preserveAspectRatio="none" style="width:1294px;height:1043px;background:#FFFFFF;" version="1.1" viewBox="0 0 1294 1043" width="1294px" zoomAndPan="magnify"><defs><filter height="300%" id="fzhk533gdz53n" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDe [...]
+cluster org.apache.wiki.event--><polygon fill="#FFFFFF" filter="url(#fzhk533gdz53n)" points="16,142,197,142,204,164.2969,1277,164.2969,1277,1020,16,1020,16,142" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="204" y1="164.2969" y2="164.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="175" x="20" y="156.9951">org.apache.wiki.event</text><!--MD5=[7db3c59d38ae5b37b48 [...]
+cluster java.util--><polygon fill="#FFFFFF" filter="url(#fzhk533gdz53n)" points="497,6,563,6,570,28.2969,791,28.2969,791,118,497,118,497,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="497" x2="570" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="60" x="501" y="20.9951">java.util</text><!--MD5=[f446c960100be19ea2d545d524e5c6f7]
+class org.apache.wiki.event.WikiPageRenameEvent--><a href="WikiPageRenameEvent.html" target="_top" title="WikiPageRenameEvent.html" xlink:actuate="onRequest" xlink:href="WikiPageRenameEvent.html" xlink:show="new" xlink:title="WikiPageRenameEvent.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="137.6328" id="org.apache.wiki.event.WikiPageRenameEvent" style="stroke:#A80036;stroke-width:1.5;" width="280" x="483" y="866"/><ellipse cx="547.75" c [...]
+class org.apache.wiki.event.WikiEventListener--><a href="WikiEventListener.html" target="_top" title="WikiEventListener.html" xlink:actuate="onRequest" xlink:href="WikiEventListener.html" xlink:show="new" xlink:title="WikiEventListener.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="60.8047" id="org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.5;" width="215" x="1045.5" y="253.5"/><ellipse cx="1093.75" cy="269 [...]
+class org.apache.wiki.event.WikiEngineEvent--><a href="WikiEngineEvent.html" target="_top" title="WikiEngineEvent.html" xlink:actuate="onRequest" xlink:href="WikiEngineEvent.html" xlink:show="new" xlink:title="WikiEngineEvent.html" xlink:type="simple"><rect codeLine="17" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="163.2422" id="org.apache.wiki.event.WikiEngineEvent" style="stroke:#A80036;stroke-width:1.5;" width="185" x="31.5" y="547"/><ellipse cx="69.45" cy="563" fill="#ADD1B2"  [...]
+class org.apache.wiki.event.WorkflowEvent--><a href="WorkflowEvent.html" target="_top" title="WorkflowEvent.html" xlink:actuate="onRequest" xlink:href="WorkflowEvent.html" xlink:show="new" xlink:title="WorkflowEvent.html" xlink:type="simple"><rect codeLine="29" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="214.4609" id="org.apache.wiki.event.WorkflowEvent" style="stroke:#A80036;stroke-width:1.5;" width="229" x="251.5" y="521.5"/><ellipse cx="316.75" cy="537.5" fill="#ADD1B2" rx="11 [...]
+class org.apache.wiki.event.WikiPageEvent--><a href="WikiPageEvent.html" target="_top" title="WikiPageEvent.html" xlink:actuate="onRequest" xlink:href="WikiPageEvent.html" xlink:show="new" xlink:title="WikiPageEvent.html" xlink:type="simple"><rect codeLine="45" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="355.3125" id="org.apache.wiki.event.WikiPageEvent" style="stroke:#A80036;stroke-width:1.5;" width="214" x="516" y="451"/><ellipse cx="573.25" cy="467" fill="#ADD1B2" rx="11" ry=" [...]
+class org.apache.wiki.event.WikiEventManager--><a href="WikiEventManager.html" target="_top" title="WikiEventManager.html" xlink:actuate="onRequest" xlink:href="WikiEventManager.html" xlink:show="new" xlink:title="WikiEventManager.html" xlink:type="simple"><rect codeLine="72" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="150.4375" id="org.apache.wiki.event.WikiEventManager" style="stroke:#A80036;stroke-width:1.5;" width="370" x="640" y="209"/><ellipse cx="763.75" cy="225" fill="#AD [...]
+class org.apache.wiki.event.WikiSecurityEvent--><a href="WikiSecurityEvent.html" target="_top" title="WikiSecurityEvent.html" xlink:actuate="onRequest" xlink:href="WikiSecurityEvent.html" xlink:show="new" xlink:title="WikiSecurityEvent.html" xlink:type="simple"><rect codeLine="83" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="342.5078" id="org.apache.wiki.event.WikiSecurityEvent" style="stroke:#A80036;stroke-width:1.5;" width="290" x="765" y="457"/><ellipse cx="851.25" cy="473" fil [...]
+class org.apache.wiki.event.WikiEventEmitter--><a href="WikiEventEmitter.html" target="_top" title="WikiEventEmitter.html" xlink:actuate="onRequest" xlink:href="WikiEventEmitter.html" xlink:show="new" xlink:title="WikiEventEmitter.html" xlink:type="simple"><rect codeLine="109" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="124.8281" id="org.apache.wiki.event.WikiEventEmitter" style="stroke:#A80036;stroke-width:1.5;" width="337" x="267.5" y="221.5"/><ellipse cx="379.75" cy="237.5" fi [...]
+class org.apache.wiki.event.WikiEvent--><a href="WikiEvent.html" target="_top" title="WikiEvent.html" xlink:actuate="onRequest" xlink:href="WikiEvent.html" xlink:show="new" xlink:title="WikiEvent.html" xlink:type="simple"><rect codeLine="118" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="214.4609" id="org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.5;" width="200" x="32" y="177"/><ellipse cx="97.75" cy="193" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036 [...]
+class java.util.EventListener--><rect codeLine="144" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="48" id="java.util.EventListener" style="stroke:#A80036;stroke-width:1.5;" width="117" x="657.5" y="47.5"/><ellipse cx="672.5" cy="63.5" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M668.4219,59.2656 L668.4219,57.1094 L675.8125,57.1094 L675.8125,59.2656 L673.3438,59.2656 L673.3438,67.3438 L675.8125,67.3438 L675.8125,69.5 L668.4219,69.5 L668.4219,67. [...]
+class java.util.EventObject--><rect codeLine="145" fill="#FEFECE" filter="url(#fzhk533gdz53n)" height="60.8047" id="java.util.EventObject" style="stroke:#A80036;stroke-width:1.5;" width="109" x="513.5" y="41"/><ellipse cx="529.4" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M532.3688,62.6406 Q531.7906,62.9375 531.15,63.0781 Q530.5094,63.2344 529.8063,63.2344 Q527.3063,63.2344 525.9781,61.5938 Q524.6656,59.9375 524.6656,56.8125 Q524.6656,53.687 [...]
+reverse link org.apache.wiki.event.WikiPageEvent to org.apache.wiki.event.WikiPageRenameEvent--><path codeLine="134" d="M623,826.23 C623,840.19 623,853.6 623,865.93 " fill="none" id="org.apache.wiki.event.WikiPageEvent-backto-org.apache.wiki.event.WikiPageRenameEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="616,826.19,623,806.19,630,826.19,616,826.19" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[aa1de7a9774087a42409639b2f35eb75]
+reverse link java.util.EventListener to org.apache.wiki.event.WikiEventListener--><path codeLine="135" d="M794.76,73.68 C861.13,77.89 956.43,91.71 1028,134 C1077.27,163.12 1116.1,219 1136.71,253.43 " fill="none" id="java.util.EventListener-backto-org.apache.wiki.event.WikiEventListener" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="794.33,80.67,774.72,72.65,795.06,66.69,794.33,80.67" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[89257c8e0dcb2743c92b78bb05aa6245]
+reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiEngineEvent--><path codeLine="136" d="M129.05,411.17 C127.99,456.58 126.83,506.53 125.88,546.98 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiEngineEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="122.06,410.85,129.52,391.02,136.05,411.18,122.06,410.85" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c3a69c3844cb6fd05186f77cba6f2bd1]
+reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WorkflowEvent--><path codeLine="137" d="M215.75,407.58 C241.17,444.79 268.88,485.35 293.5,521.39 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WorkflowEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="209.94,411.49,204.44,391.02,221.5,403.59,209.94,411.49" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ed499d9a036367b2681cc1d2e015ac9c]
+reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiPageEvent--><path codeLine="138" d="M249.72,390.85 C249.81,390.9 249.91,390.95 250,391 C350.34,443.83 404.15,387.35 498,451 C504.06,455.11 509.92,459.62 515.58,464.44 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiPageEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="245.97,396.77,232.32,380.56,253.1,384.72,245.97,396.77" style="stroke:#A80036;stroke-w [...]
+reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiSecurityEvent--><path codeLine="139" d="M249.72,390.87 C249.81,390.91 249.91,390.96 250,391 C453.02,483.1 549.65,349.23 748,451 C753.74,453.94 759.37,457.18 764.9,460.65 " fill="none" id="org.apache.wiki.event.WikiEvent-backto-org.apache.wiki.event.WikiSecurityEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="246.67,397.18,232.25,381.65,253.21,384.8,246.67,397.18" style="stroke:#A80036;s [...]
+reverse link java.util.EventObject to org.apache.wiki.event.WikiEvent--><path codeLine="140" d="M492.86,72.55 C424.88,75.8 324.31,88.85 250,134 C231.53,145.22 214.79,160.46 200.09,176.92 " fill="none" id="java.util.EventObject-backto-org.apache.wiki.event.WikiEvent" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="493.05,65.54,513.29,71.82,493.55,79.53,493.05,65.54" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10 [...]
 @startuml
     namespace org.apache.wiki.event {
 
@@ -32,52 +32,10 @@ reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiPageEv
             +getTypeDescription(): String
         }
 
-        abstract class WikiEvent [[WikiEvent.html]] {
-            {static} +ERROR: int
-            {static} +UNDEFINED: int
-            +WikiEvent(Object, int)
-            +WikiEvent(Object, int, Object...)
-            +getSrc(): T
-            +getWhen(): long
-            #setType(int): void
-            +getType(): int
-            +getArgs(): Object[]
-            +getArg(int, Class<T>): T
-            +getTypeDescription(): String
-            {static} +isValidType(int): boolean
-            +eventName(): String
-        }
-
         interface WikiEventListener [[WikiEventListener.html]] {
             {abstract} +actionPerformed(WikiEvent): void
         }
 
-        class WikiSecurityEvent [[WikiSecurityEvent.html]] {
-            {static} +LOGIN_INITIATED: int
-            {static} +LOGIN_ANONYMOUS: int
-            {static} +LOGIN_ASSERTED: int
-            {static} +LOGIN_AUTHENTICATED: int
-            {static} +LOGIN_ACCOUNT_EXPIRED: int
-            {static} +LOGIN_CREDENTIAL_EXPIRED: int
-            {static} +LOGIN_FAILED: int
-            {static} +LOGOUT: int
-            {static} +PRINCIPAL_ADD: int
-            {static} +SESSION_EXPIRED: int
-            {static} +GROUP_ADD: int
-            {static} +GROUP_REMOVE: int
-            {static} +GROUP_CLEAR_GROUPS: int
-            {static} +ACCESS_ALLOWED: int
-            {static} +ACCESS_DENIED: int
-            {static} +PROFILE_SAVE: int
-            {static} +PROFILE_NAME_CHANGED: int
-            +WikiSecurityEvent(Object, int, Principal, Object)
-            +WikiSecurityEvent(Object, int, Object)
-            +getPrincipal(): Object
-            +getTarget(): Object
-            +eventName(int): String
-            +getTypeDescription(): String
-        }
-
         class WikiEngineEvent [[WikiEngineEvent.html]] {
             {static} +INITIALIZING: int
             {static} +INITIALIZED: int
@@ -133,15 +91,6 @@ reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiPageEv
             +getTypeDescription(): String
         }
 
-        enum WikiEventEmitter [[WikiEventEmitter.html]] {
-            {static} +INSTANCE
-            {static} +get(): WikiEventEmitter
-            {static} +fireWorkflowEvent(Object, int): WorkflowEvent
-            {static} +fireWorkflowEvent(Object, int, Object...): WorkflowEvent
-            {static} +attach(WikiEventListener): void
-            {static} +register(WikiEventListener): void
-        }
-
         class WikiEventManager [[WikiEventManager.html]] {
             {static} +getInstance(): WikiEventManager
             {static} +addWikiEventListener(Object, WikiEventListener): boolean
@@ -153,20 +102,71 @@ reverse link org.apache.wiki.event.WikiEvent to org.apache.wiki.event.WikiPageEv
             {static} +fireEvent(Object, WikiEvent): void
         }
 
+        class WikiSecurityEvent [[WikiSecurityEvent.html]] {
+            {static} +LOGIN_INITIATED: int
+            {static} +LOGIN_ANONYMOUS: int
+            {static} +LOGIN_ASSERTED: int
+            {static} +LOGIN_AUTHENTICATED: int
+            {static} +LOGIN_ACCOUNT_EXPIRED: int
+            {static} +LOGIN_CREDENTIAL_EXPIRED: int
+            {static} +LOGIN_FAILED: int
+            {static} +LOGOUT: int
+            {static} +PRINCIPAL_ADD: int
+            {static} +SESSION_EXPIRED: int
+            {static} +GROUP_ADD: int
+            {static} +GROUP_REMOVE: int
+            {static} +GROUP_CLEAR_GROUPS: int
+            {static} +ACCESS_ALLOWED: int
+            {static} +ACCESS_DENIED: int
+            {static} +PROFILE_SAVE: int
+            {static} +PROFILE_NAME_CHANGED: int
+            +WikiSecurityEvent(Object, int, Principal, Object)
+            +WikiSecurityEvent(Object, int, Object)
+            +getPrincipal(): Object
+            +getTarget(): Object
+            +eventName(int): String
+            +getTypeDescription(): String
+        }
+
+        enum WikiEventEmitter [[WikiEventEmitter.html]] {
+            {static} +INSTANCE
+            {static} +get(): WikiEventEmitter
+            {static} +fireWorkflowEvent(Object, int): WorkflowEvent
+            {static} +fireWorkflowEvent(Object, int, Object...): WorkflowEvent
+            {static} +attach(WikiEventListener): void
+            {static} +register(WikiEventListener): void
+        }
+
+        abstract class WikiEvent [[WikiEvent.html]] {
+            {static} +ERROR: int
+            {static} +UNDEFINED: int
+            +WikiEvent(Object, int)
+            +WikiEvent(Object, int, Object...)
+            +getSrc(): T
+            +getWhen(): long
+            #setType(int): void
+            +getType(): int
+            +getArgs(): Object[]
+            +getArg(int, Class<T>): T
+            +getTypeDescription(): String
+            {static} +isValidType(int): boolean
+            +eventName(): String
+        }
+
         WikiPageEvent <|- - WikiPageRenameEvent
-        java.util.EventObject <|- - WikiEvent
         java.util.EventListener <|- - WikiEventListener
-        WikiEvent <|- - WikiSecurityEvent
         WikiEvent <|- - WikiEngineEvent
         WikiEvent <|- - WorkflowEvent
         WikiEvent <|- - WikiPageEvent
+        WikiEvent <|- - WikiSecurityEvent
+        java.util.EventObject <|- - WikiEvent
     }
 
     namespace java.util {
+        interface EventListener
         class EventObject {
             #source: Object
         }
-        interface EventListener
     }
 
     center footer UMLDoclet 2.0.15, PlantUML 1.2021.13
@@ -178,5 +178,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/CreoleFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/CreoleFilter.svg
index eec7409e72..2180516de3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/CreoleFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/CreoleFilter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="220px" preserveAspectRatio="none" style="width:255px;height:220px;background:#FFFFFF;" version="1.1" viewBox="0 0 255 220" width="255px" zoomAndPan="magnify"><defs><filter height="300%" id="fmda4ufd3ngd2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.filters.CreoleFilter--><a href="CreoleFilter.html" target="_top" title="CreoleFilter.html" xlink:actuate="onRequest" xlink:href="CreoleFilter.html" xlink:show="new" xlink:title="CreoleFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fmda4ufd3ngd2)" height="84.3516" id="org.apache.wiki.filters.CreoleFilter" style="stroke:#A80036;stroke-width:1.5;" width="234" x="7" y="105"/><ellipse cx="67.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11 [...]
 class org.apache.wiki.api.filters.BasePageFilter--><a href="../api/filters/BasePageFilter.html" target="_top" title="../api/filters/BasePageFilter.html" xlink:actuate="onRequest" xlink:href="../api/filters/BasePageFilter.html" xlink:show="new" xlink:title="../api/filters/BasePageFilter.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#fmda4ufd3ngd2)" height="37.9375" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="15 [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.CreoleFilter--><path codeLine="13" d="M124,65.54 C124,78.08 124,92.05 124,104.78 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.CreoleFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="117,65.07,124,45.07,131,65.07,117,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthA [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.CreoleFilter--><path codeLine="13" d="M124,65.54 C124,78.08 124,92.05 124,104.78 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.CreoleFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="117,65.07,124,45.07,131,65.07,117,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthA [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/DefaultFilterManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/DefaultFilterManager.svg
index 621f4796d0..67836e1b32 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/DefaultFilterManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/DefaultFilterManager.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.filters.DefaultFilterManager--><a href="DefaultFilterManag
 class org.apache.wiki.modules.BaseModuleManager--><a href="../modules/BaseModuleManager.html" target="_top" title="../modules/BaseModuleManager.html" xlink:actuate="onRequest" xlink:href="../modules/BaseModuleManager.html" xlink:show="new" xlink:title="../modules/BaseModuleManager.html" xlink:type="simple"><rect codeLine="20" fill="#FEFECE" filter="url(#f1uc8mf4hnkf9l)" height="37.9375" id="org.apache.wiki.modules.BaseModuleManager" style="stroke:#A80036;stroke-width:1.5;" width="177" x= [...]
 class org.apache.wiki.filters.FilterManager--><a href="FilterManager.html" target="_top" title="FilterManager.html" xlink:actuate="onRequest" xlink:href="FilterManager.html" xlink:show="new" xlink:title="FilterManager.html" xlink:type="simple"><rect codeLine="21" fill="#FEFECE" filter="url(#f1uc8mf4hnkf9l)" height="135.5703" id="org.apache.wiki.filters.FilterManager" style="stroke:#A80036;stroke-width:1.5;" width="296" x="219.5" y="7"/><ellipse cx="308.25" cy="25.9688" fill="#B4A7E5" rx= [...]
 reverse link org.apache.wiki.modules.BaseModuleManager to org.apache.wiki.filters.DefaultFilterManager--><path codeLine="31" d="M116.72,111.27 C131.56,135.93 152.17,170.17 171.83,202.84 " fill="none" id="org.apache.wiki.modules.BaseModuleManager-backto-org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="110.71,114.86,106.4,94.11,122.71,107.64,110.71,114.86" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1b895c25a4485af0 [...]
-reverse link org.apache.wiki.filters.FilterManager to org.apache.wiki.filters.DefaultFilterManager--><path codeLine="32" d="M316.74,160.35 C308.4,174.21 299.69,188.68 291.16,202.85 " fill="none" id="org.apache.wiki.filters.FilterManager-backto-org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="310.75,156.72,327.06,143.2,322.75,163.94,310.75,156.72" style="stroke:#A80036;stroke-width:1.0;"/><text fi [...]
+reverse link org.apache.wiki.filters.FilterManager to org.apache.wiki.filters.DefaultFilterManager--><path codeLine="32" d="M316.74,160.35 C308.4,174.21 299.69,188.68 291.16,202.85 " fill="none" id="org.apache.wiki.filters.FilterManager-backto-org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="310.75,156.72,327.06,143.2,322.75,163.94,310.75,156.72" style="stroke:#A80036;stroke-width:1.0;"/><text fi [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -47,5 +47,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/FilterManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/FilterManager.svg
index a781ac3f69..ea72ac7589 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/FilterManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/FilterManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="376px" preserveAspectRatio="none" style="width:317px;height:376px;background:#FFFFFF;" version="1.1" viewBox="0 0 317 376" width="317px" zoomAndPan="magnify"><defs><filter height="300%" id="fnunlmc1iokar" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.filters.FilterManager--><a href="FilterManager.html" target="_top" title="FilterManager.html" xlink:actuate="onRequest" xlink:href="FilterManager.html" xlink:show="new" xlink:title="FilterManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fnunlmc1iokar)" height="194.7891" id="org.apache.wiki.filters.FilterManager" style="stroke:#A80036;stroke-width:1.5;" width="296" x="7" y="151"/><ellipse cx="95.75" cy="169.9688" fill="#B4A7E5" rx="11" [...]
 class org.apache.wiki.modules.ModuleManager--><a href="../modules/ModuleManager.html" target="_top" title="../modules/ModuleManager.html" xlink:actuate="onRequest" xlink:href="../modules/ModuleManager.html" xlink:show="new" xlink:title="../modules/ModuleManager.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#fnunlmc1iokar)" height="84.3516" id="org.apache.wiki.modules.ModuleManager" style="stroke:#A80036;stroke-width:1.5;" width="277" x="16.5" y="7"/><ellipse cx [...]
-reverse link org.apache.wiki.modules.ModuleManager to org.apache.wiki.filters.FilterManager--><path codeLine="25" d="M155,111.42 C155,123.94 155,137.41 155,150.82 " fill="none" id="org.apache.wiki.modules.ModuleManager-backto-org.apache.wiki.filters.FilterManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="148,111.4,155,91.4,162,111.4,148,111.4" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust= [...]
+reverse link org.apache.wiki.modules.ModuleManager to org.apache.wiki.filters.FilterManager--><path codeLine="25" d="M155,111.42 C155,123.94 155,137.41 155,150.82 " fill="none" id="org.apache.wiki.modules.ModuleManager-backto-org.apache.wiki.filters.FilterManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="148,111.4,155,91.4,162,111.4,148,111.4" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -38,5 +38,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/PageEventFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/PageEventFilter.svg
index f32ad89766..c39ce770ec 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/PageEventFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/PageEventFilter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="284px" preserveAspectRatio="none" style="width:327px;height:284px;background:#FFFFFF;" version="1.1" viewBox="0 0 327 284" width="327px" zoomAndPan="magnify"><defs><filter height="300%" id="f7tjbaa7iggjm" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.filters.PageEventFilter--><a href="PageEventFilter.html" target="_top" title="PageEventFilter.html" xlink:actuate="onRequest" xlink:href="PageEventFilter.html" xlink:show="new" xlink:title="PageEventFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f7tjbaa7iggjm)" height="148.375" id="org.apache.wiki.filters.PageEventFilter" style="stroke:#A80036;stroke-width:1.5;" width="304" x="9" y="105"/><ellipse cx="103.25" cy="123.9688" fill="#ADD [...]
 class org.apache.wiki.api.filters.BasePageFilter--><a href="../api/filters/BasePageFilter.html" target="_top" title="../api/filters/BasePageFilter.html" xlink:actuate="onRequest" xlink:href="../api/filters/BasePageFilter.html" xlink:show="new" xlink:title="../api/filters/BasePageFilter.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#f7tjbaa7iggjm)" height="37.9375" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="15 [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.PageEventFilter--><path codeLine="18" d="M161,65.32 C161,77.41 161,91.2 161,104.88 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.PageEventFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="154,65.21,161,45.21,168,65.21,154,65.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" le [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.PageEventFilter--><path codeLine="18" d="M161,65.32 C161,77.41 161,91.2 161,104.88 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.PageEventFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="154,65.21,161,45.21,168,65.21,154,65.21" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" le [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/PingWeblogsComFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/PingWeblogsComFilter.svg
index 935d754f31..22f6dfeb9b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/PingWeblogsComFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/PingWeblogsComFilter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="228px" preserveAspectRatio="none" style="width:236px;height:228px;background:#FFFFFF;" version="1.1" viewBox="0 0 236 228" width="236px" zoomAndPan="magnify"><defs><filter height="300%" id="fee7k0ys2obw9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.filters.PingWeblogsComFilter--><a href="PingWeblogsComFilter.html" target="_top" title="PingWeblogsComFilter.html" xlink:actuate="onRequest" xlink:href="PingWeblogsComFilter.html" xlink:show="new" xlink:title="PingWeblogsComFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fee7k0ys2obw9)" height="92.3516" id="org.apache.wiki.filters.PingWeblogsComFilter" style="stroke:#A80036;stroke-width:1.5;" width="215" x="7" y="105"/><ellipse cx="34 [...]
 class org.apache.wiki.api.filters.BasePageFilter--><a href="../api/filters/BasePageFilter.html" target="_top" title="../api/filters/BasePageFilter.html" xlink:actuate="onRequest" xlink:href="../api/filters/BasePageFilter.html" xlink:show="new" xlink:title="../api/filters/BasePageFilter.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#fee7k0ys2obw9)" height="37.9375" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="15 [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.PingWeblogsComFilter--><path codeLine="13" d="M114.5,65.51 C114.5,78.01 114.5,91.99 114.5,104.93 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.PingWeblogsComFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="107.5,65.15,114.5,45.15,121.5,65.15,107.5,65.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sa [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.PingWeblogsComFilter--><path codeLine="13" d="M114.5,65.51 C114.5,78.01 114.5,91.99 114.5,104.93 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.PingWeblogsComFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="107.5,65.15,114.5,45.15,121.5,65.15,107.5,65.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sa [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/ProfanityFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/ProfanityFilter.svg
index b4a317a69a..701dc3d7c2 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/ProfanityFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/ProfanityFilter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:255px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 255 194" width="255px" zoomAndPan="magnify"><defs><filter height="300%" id="f1as53rvipobgc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.filters.ProfanityFilter--><a href="ProfanityFilter.html" target="_top" title="ProfanityFilter.html" xlink:actuate="onRequest" xlink:href="ProfanityFilter.html" xlink:show="new" xlink:title="ProfanityFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1as53rvipobgc)" height="58.7422" id="org.apache.wiki.filters.ProfanityFilter" style="stroke:#A80036;stroke-width:1.5;" width="234" x="7" y="105"/><ellipse cx="67.75" cy="123.9688" fill="#ADD [...]
 class org.apache.wiki.api.filters.BasePageFilter--><a href="../api/filters/BasePageFilter.html" target="_top" title="../api/filters/BasePageFilter.html" xlink:actuate="onRequest" xlink:href="../api/filters/BasePageFilter.html" xlink:show="new" xlink:title="../api/filters/BasePageFilter.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1as53rvipobgc)" height="37.9375" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="15 [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.ProfanityFilter--><path codeLine="11" d="M124,65.22 C124,78.3 124,92.7 124,104.89 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.ProfanityFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="117,65.07,124,45.07,131,65.07,117,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" len [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.ProfanityFilter--><path codeLine="11" d="M124,65.22 C124,78.3 124,92.7 124,104.89 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.ProfanityFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="117,65.07,124,45.07,131,65.07,117,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" len [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/SpamFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/SpamFilter.svg
index 88b1b1f5a2..5f0381ee26 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/SpamFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/SpamFilter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="497px" preserveAspectRatio="none" style="width:322px;height:497px;background:#FFFFFF;" version="1.1" viewBox="0 0 322 497" width="322px" zoomAndPan="magnify"><defs><filter height="300%" id="foneh2on8g5ua" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.filters.SpamFilter--><a href="SpamFilter.html" target="_top" title="SpamFilter.html" xlink:actuate="onRequest" xlink:href="SpamFilter.html" xlink:show="new" xlink:title="SpamFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#foneh2on8g5ua)" height="361.25" id="org.apache.wiki.filters.SpamFilter" style="stroke:#A80036;stroke-width:1.5;" width="301" x="7" y="105"/><ellipse cx="101.25" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="str [...]
 class org.apache.wiki.api.filters.BasePageFilter--><a href="../api/filters/BasePageFilter.html" target="_top" title="../api/filters/BasePageFilter.html" xlink:actuate="onRequest" xlink:href="../api/filters/BasePageFilter.html" xlink:show="new" xlink:title="../api/filters/BasePageFilter.html" xlink:type="simple"><rect codeLine="32" fill="#FEFECE" filter="url(#foneh2on8g5ua)" height="37.9375" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="15 [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.SpamFilter--><path codeLine="34" d="M157.5,65.22 C157.5,76.78 157.5,90.31 157.5,104.89 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.SpamFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="150.5,65.11,157.5,45.11,164.5,65.11,150.5,65.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size= [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.SpamFilter--><path codeLine="34" d="M157.5,65.22 C157.5,76.78 157.5,90.31 157.5,104.89 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.SpamFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="150.5,65.11,157.5,45.11,164.5,65.11,150.5,65.11" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -47,5 +47,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/package.svg
index 68763d56f4..bcf9724bc7 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/filters/package.svg
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="871px" preserveAspectRatio="none" style="width:2000px;height:871px;background:#FFFFFF;" version="1.1" viewBox="0 0 2000 871" width="2000px" zoomAndPan="magnify"><defs><filter height="300%" id="fre7m0504e9tk" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
-cluster org.apache.wiki.filters--><polygon fill="#FFFFFF" filter="url(#fre7m0504e9tk)" points="16,180,198,180,205,202.2969,1809,202.2969,1809,848,16,848,16,180" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="205" y1="202.2969" y2="202.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="176" x="20" y="194.9951">org.apache.wiki.filters</text><!--MD5=[8fd0d33d165af66d8 [...]
-cluster org.apache.wiki.api.filters--><polygon fill="#FFFFFF" filter="url(#fre7m0504e9tk)" points="680,25,890,25,897,47.2969,900,47.2969,900,137,680,137,680,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="680" x2="897" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="204" x="684" y="39.9951">org.apache.wiki.api.filters</text><!--MD5=[ba14b7e446e595 [...]
-cluster org.apache.wiki.modules--><polygon fill="#FFFFFF" filter="url(#fre7m0504e9tk)" points="1476,6,1679,6,1686,28.2969,1983,28.2969,1983,156,1476,156,1476,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1476" x2="1686" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="197" x="1480" y="20.9951">org.apache.wiki.modules</text><!--MD5=[efd34979895ce7b [...]
-class org.apache.wiki.filters.PingWeblogsComFilter--><a href="PingWeblogsComFilter.html" target="_top" title="PingWeblogsComFilter.html" xlink:actuate="onRequest" xlink:href="PingWeblogsComFilter.html" xlink:show="new" xlink:title="PingWeblogsComFilter.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="86.4141" id="org.apache.wiki.filters.PingWeblogsComFilter" style="stroke:#A80036;stroke-width:1.5;" width="215" x="1246.5" y="349.5"/><ellipse [...]
-class org.apache.wiki.filters.ProfanityFilter--><a href="ProfanityFilter.html" target="_top" title="ProfanityFilter.html" xlink:actuate="onRequest" xlink:href="ProfanityFilter.html" xlink:show="new" xlink:title="ProfanityFilter.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="60.8047" id="org.apache.wiki.filters.ProfanityFilter" style="stroke:#A80036;stroke-width:1.5;" width="234" x="977" y="362"/><ellipse cx="1046.75" cy="378" fill="#ADD1B [...]
-class org.apache.wiki.filters.PageEventFilter--><a href="PageEventFilter.html" target="_top" title="PageEventFilter.html" xlink:actuate="onRequest" xlink:href="PageEventFilter.html" xlink:show="new" xlink:title="PageEventFilter.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="150.4375" id="org.apache.wiki.filters.PageEventFilter" style="stroke:#A80036;stroke-width:1.5;" width="304" x="638" y="317.5"/><ellipse cx="736.75" cy="333.5" fill="# [...]
-class org.apache.wiki.filters.FilterManager--><a href="FilterManager.html" target="_top" title="FilterManager.html" xlink:actuate="onRequest" xlink:href="FilterManager.html" xlink:show="new" xlink:title="FilterManager.html" xlink:type="simple"><rect codeLine="24" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="188.8516" id="org.apache.wiki.filters.FilterManager" style="stroke:#A80036;stroke-width:1.5;" width="296" x="1497" y="298"/><ellipse cx="1597.75" cy="314" fill="#B4A7E5" rx="11 [...]
-class org.apache.wiki.filters.SpamFilter--><a href="SpamFilter.html" target="_top" title="SpamFilter.html" xlink:actuate="onRequest" xlink:href="SpamFilter.html" xlink:show="new" xlink:title="SpamFilter.html" xlink:type="simple"><rect codeLine="38" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="355.3125" id="org.apache.wiki.filters.SpamFilter" style="stroke:#A80036;stroke-width:1.5;" width="301" x="32.5" y="215"/><ellipse cx="145.75" cy="231" fill="#ADD1B2" rx="11" ry="11" style="st [...]
-class org.apache.wiki.filters.DefaultFilterManager--><a href="DefaultFilterManager.html" target="_top" title="DefaultFilterManager.html" xlink:actuate="onRequest" xlink:href="DefaultFilterManager.html" xlink:show="new" xlink:title="DefaultFilterManager.html" xlink:type="simple"><rect codeLine="65" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="201.6563" id="org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.5;" width="299" x="1493.5" y="630"/><ellipse [...]
-class org.apache.wiki.filters.CreoleFilter--><a href="CreoleFilter.html" target="_top" title="CreoleFilter.html" xlink:actuate="onRequest" xlink:href="CreoleFilter.html" xlink:show="new" xlink:title="CreoleFilter.html" xlink:type="simple"><rect codeLine="80" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="86.4141" id="org.apache.wiki.filters.CreoleFilter" style="stroke:#A80036;stroke-width:1.5;" width="234" x="369" y="349.5"/><ellipse cx="446.25" cy="365.5" fill="#ADD1B2" rx="11" ry= [...]
-class org.apache.wiki.api.filters.BasePageFilter--><a href="../api/filters/BasePageFilter.html" target="_top" title="../api/filters/BasePageFilter.html" xlink:actuate="onRequest" xlink:href="../api/filters/BasePageFilter.html" xlink:show="new" xlink:title="../api/filters/BasePageFilter.html" xlink:type="simple"><rect codeLine="97" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="60.8047" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="12 [...]
-class org.apache.wiki.modules.ModuleManager--><a href="../modules/ModuleManager.html" target="_top" title="../modules/ModuleManager.html" xlink:actuate="onRequest" xlink:href="../modules/ModuleManager.html" xlink:show="new" xlink:title="../modules/ModuleManager.html" xlink:type="simple"><rect codeLine="103" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="99.2188" id="org.apache.wiki.modules.ModuleManager" style="stroke:#A80036;stroke-width:1.5;" width="277" x="1492.5" y="41"/><ellips [...]
-class org.apache.wiki.modules.BaseModuleManager--><a href="../modules/BaseModuleManager.html" target="_top" title="../modules/BaseModuleManager.html" xlink:actuate="onRequest" xlink:href="../modules/BaseModuleManager.html" xlink:show="new" xlink:title="../modules/BaseModuleManager.html" xlink:type="simple"><rect codeLine="109" fill="#FEFECE" filter="url(#fre7m0504e9tk)" height="60.8047" id="org.apache.wiki.modules.BaseModuleManager" style="stroke:#A80036;stroke-width:1.5;" width="162" x= [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.PingWeblogsComFilter--><path codeLine="86" d="M874.01,98.46 C985.05,109.07 1173.14,132.35 1229,172 C1290.15,215.4 1325.38,298.76 1342.03,349.33 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.PingWeblogsComFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="873.16,105.41,853.9,96.6,874.46,91.47,873.16,105.41" style="stroke:#A80036;strok [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.ProfanityFilter--><path codeLine="87" d="M872.41,119.13 C902.31,131.93 934.88,149.41 960,172 C1020.92,226.79 1063.35,315.81 1082.5,361.84 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.ProfanityFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="869.64,125.56,853.73,111.56,874.9,112.58,869.64,125.56" style="stroke:#A80036;stroke-width: [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.PageEventFilter--><path codeLine="88" d="M790,141.2 C790,189.2 790,262.48 790,317.37 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.PageEventFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="783,141.09,790,121.09,797,141.09,783,141.09" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6c91441e3c4b29342cf90dba290d94fc]
-reverse link org.apache.wiki.modules.ModuleManager to org.apache.wiki.filters.FilterManager--><path codeLine="89" d="M1634.21,160.23 C1636.11,201.05 1638.55,253.36 1640.63,297.91 " fill="none" id="org.apache.wiki.modules.ModuleManager-backto-org.apache.wiki.filters.FilterManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1627.2,160.34,1633.26,140.03,1641.19,159.69,1627.2,160.34" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[416612071aff738aa189651c95783846]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.SpamFilter--><path codeLine="90" d="M706.28,99.62 C596.04,111.54 409.34,136.28 351,172 C331.87,183.72 314.12,198.47 297.89,214.77 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.SpamFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="705.63,92.65,726.26,97.51,707.1,106.58,705.63,92.65" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[ [...]
-reverse link org.apache.wiki.modules.BaseModuleManager to org.apache.wiki.filters.DefaultFilterManager--><path codeLine="91" d="M1888.37,141.19 C1890.59,231.87 1885.45,427.91 1811,570 C1799.78,591.41 1784.6,611.57 1767.92,629.89 " fill="none" id="org.apache.wiki.modules.BaseModuleManager-backto-org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1881.37,141.22,1887.71,121,1895.36,140.76,1881.37,141.22" style="stroke:#A80036 [...]
-reverse link org.apache.wiki.filters.FilterManager to org.apache.wiki.filters.DefaultFilterManager--><path codeLine="92" d="M1644.32,507.5 C1644.09,547.13 1643.82,591.26 1643.6,629.71 " fill="none" id="org.apache.wiki.filters.FilterManager-backto-org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1637.32,507.19,1644.44,487.23,1651.32,507.28,1637.32,507.19" style="stroke:#A80036;stroke-width:1.0;"/> [...]
-reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.CreoleFilter--><path codeLine="93" d="M707.34,119.59 C677.83,132.38 645.79,149.73 621,172 C565.09,222.23 524.42,301.07 503.07,349.33 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.CreoleFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="705.11,112.94,726.27,111.84,710.42,125.9,705.11,112.94" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="871px" preserveAspectRatio="none" style="width:1999px;height:871px;background:#FFFFFF;" version="1.1" viewBox="0 0 1999 871" width="1999px" zoomAndPan="magnify"><defs><filter height="300%" id="f1a6wghaeel44a" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
+cluster org.apache.wiki.filters--><polygon fill="#FFFFFF" filter="url(#f1a6wghaeel44a)" points="16,180,198,180,205,202.2969,1808,202.2969,1808,848,16,848,16,180" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="205" y1="202.2969" y2="202.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="176" x="20" y="194.9951">org.apache.wiki.filters</text><!--MD5=[8fd0d33d165af66d [...]
+cluster org.apache.wiki.api.filters--><polygon fill="#FFFFFF" filter="url(#f1a6wghaeel44a)" points="612,25,822,25,829,47.2969,832,47.2969,832,137,612,137,612,25" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="612" x2="829" y1="47.2969" y2="47.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="204" x="616" y="39.9951">org.apache.wiki.api.filters</text><!--MD5=[ba14b7e446e59 [...]
+cluster org.apache.wiki.modules--><polygon fill="#FFFFFF" filter="url(#f1a6wghaeel44a)" points="1475,6,1678,6,1685,28.2969,1982,28.2969,1982,156,1475,156,1475,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1475" x2="1685" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="197" x="1479" y="20.9951">org.apache.wiki.modules</text><!--MD5=[efd34979895ce7 [...]
+class org.apache.wiki.filters.PingWeblogsComFilter--><a href="PingWeblogsComFilter.html" target="_top" title="PingWeblogsComFilter.html" xlink:actuate="onRequest" xlink:href="PingWeblogsComFilter.html" xlink:show="new" xlink:title="PingWeblogsComFilter.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="86.4141" id="org.apache.wiki.filters.PingWeblogsComFilter" style="stroke:#A80036;stroke-width:1.5;" width="215" x="1245.5" y="349.5"/><ellips [...]
+class org.apache.wiki.filters.FilterManager--><a href="FilterManager.html" target="_top" title="FilterManager.html" xlink:actuate="onRequest" xlink:href="FilterManager.html" xlink:show="new" xlink:title="FilterManager.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="188.8516" id="org.apache.wiki.filters.FilterManager" style="stroke:#A80036;stroke-width:1.5;" width="296" x="1496" y="298"/><ellipse cx="1596.75" cy="314" fill="#B4A7E5" rx="11 [...]
+class org.apache.wiki.filters.PageEventFilter--><a href="PageEventFilter.html" target="_top" title="PageEventFilter.html" xlink:actuate="onRequest" xlink:href="PageEventFilter.html" xlink:show="new" xlink:title="PageEventFilter.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="150.4375" id="org.apache.wiki.filters.PageEventFilter" style="stroke:#A80036;stroke-width:1.5;" width="304" x="570" y="317.5"/><ellipse cx="668.75" cy="333.5" fill=" [...]
+class org.apache.wiki.filters.DefaultFilterManager--><a href="DefaultFilterManager.html" target="_top" title="DefaultFilterManager.html" xlink:actuate="onRequest" xlink:href="DefaultFilterManager.html" xlink:show="new" xlink:title="DefaultFilterManager.html" xlink:type="simple"><rect codeLine="34" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="201.6563" id="org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.5;" width="299" x="1492.5" y="630"/><ellips [...]
+class org.apache.wiki.filters.CreoleFilter--><a href="CreoleFilter.html" target="_top" title="CreoleFilter.html" xlink:actuate="onRequest" xlink:href="CreoleFilter.html" xlink:show="new" xlink:title="CreoleFilter.html" xlink:type="simple"><rect codeLine="49" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="86.4141" id="org.apache.wiki.filters.CreoleFilter" style="stroke:#A80036;stroke-width:1.5;" width="234" x="301" y="349.5"/><ellipse cx="378.25" cy="365.5" fill="#ADD1B2" rx="11" ry [...]
+class org.apache.wiki.filters.ProfanityFilter--><a href="ProfanityFilter.html" target="_top" title="ProfanityFilter.html" xlink:actuate="onRequest" xlink:href="ProfanityFilter.html" xlink:show="new" xlink:title="ProfanityFilter.html" xlink:type="simple"><rect codeLine="55" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="60.8047" id="org.apache.wiki.filters.ProfanityFilter" style="stroke:#A80036;stroke-width:1.5;" width="234" x="32" y="362"/><ellipse cx="101.75" cy="378" fill="#ADD1B [...]
+class org.apache.wiki.filters.SpamFilter--><a href="SpamFilter.html" target="_top" title="SpamFilter.html" xlink:actuate="onRequest" xlink:href="SpamFilter.html" xlink:show="new" xlink:title="SpamFilter.html" xlink:type="simple"><rect codeLine="59" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="355.3125" id="org.apache.wiki.filters.SpamFilter" style="stroke:#A80036;stroke-width:1.5;" width="301" x="909.5" y="215"/><ellipse cx="1022.75" cy="231" fill="#ADD1B2" rx="11" ry="11" style= [...]
+class org.apache.wiki.api.filters.BasePageFilter--><a href="../api/filters/BasePageFilter.html" target="_top" title="../api/filters/BasePageFilter.html" xlink:actuate="onRequest" xlink:href="../api/filters/BasePageFilter.html" xlink:show="new" xlink:title="../api/filters/BasePageFilter.html" xlink:type="simple"><rect codeLine="97" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="60.8047" id="org.apache.wiki.api.filters.BasePageFilter" style="stroke:#A80036;stroke-width:1.5;" width="1 [...]
+class org.apache.wiki.modules.ModuleManager--><a href="../modules/ModuleManager.html" target="_top" title="../modules/ModuleManager.html" xlink:actuate="onRequest" xlink:href="../modules/ModuleManager.html" xlink:show="new" xlink:title="../modules/ModuleManager.html" xlink:type="simple"><rect codeLine="103" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="99.2188" id="org.apache.wiki.modules.ModuleManager" style="stroke:#A80036;stroke-width:1.5;" width="277" x="1491.5" y="41"/><ellip [...]
+class org.apache.wiki.modules.BaseModuleManager--><a href="../modules/BaseModuleManager.html" target="_top" title="../modules/BaseModuleManager.html" xlink:actuate="onRequest" xlink:href="../modules/BaseModuleManager.html" xlink:show="new" xlink:title="../modules/BaseModuleManager.html" xlink:type="simple"><rect codeLine="109" fill="#FEFECE" filter="url(#f1a6wghaeel44a)" height="60.8047" id="org.apache.wiki.modules.BaseModuleManager" style="stroke:#A80036;stroke-width:1.5;" width="162" x [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.PingWeblogsComFilter--><path codeLine="86" d="M805.52,96.1 C931.12,104.43 1161.05,125.66 1228,172 C1289.66,214.68 1324.72,298.28 1341.2,349.09 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.PingWeblogsComFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="805.08,103.08,785.56,94.82,805.97,89.11,805.08,103.08" style="stroke:#A80036;stro [...]
+reverse link org.apache.wiki.modules.ModuleManager to org.apache.wiki.filters.FilterManager--><path codeLine="87" d="M1633.21,160.23 C1635.11,201.05 1637.55,253.36 1639.63,297.91 " fill="none" id="org.apache.wiki.modules.ModuleManager-backto-org.apache.wiki.filters.FilterManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1626.2,160.34,1632.26,140.03,1640.19,159.69,1626.2,160.34" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[fed49a402b5624c96a2c06f5b4c89b6a]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.PageEventFilter--><path codeLine="88" d="M722,141.2 C722,189.2 722,262.48 722,317.37 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.PageEventFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="715,141.09,722,121.09,729,141.09,715,141.09" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b1c0826e517ea92de4d7f72b5c2fe125]
+reverse link org.apache.wiki.modules.BaseModuleManager to org.apache.wiki.filters.DefaultFilterManager--><path codeLine="89" d="M1887.37,141.19 C1889.59,231.87 1884.45,427.91 1810,570 C1798.78,591.41 1783.6,611.57 1766.92,629.89 " fill="none" id="org.apache.wiki.modules.BaseModuleManager-backto-org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1880.37,141.22,1886.71,121,1894.36,140.76,1880.37,141.22" style="stroke:#A80036 [...]
+reverse link org.apache.wiki.filters.FilterManager to org.apache.wiki.filters.DefaultFilterManager--><path codeLine="90" d="M1643.32,507.5 C1643.09,547.13 1642.82,591.26 1642.6,629.71 " fill="none" id="org.apache.wiki.filters.FilterManager-backto-org.apache.wiki.filters.DefaultFilterManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1636.32,507.19,1643.44,487.23,1650.32,507.28,1636.32,507.19" style="stroke:#A80036;stroke-width:1.0;"/> [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.CreoleFilter--><path codeLine="91" d="M639.34,119.59 C609.83,132.38 577.79,149.73 553,172 C497.09,222.23 456.42,301.07 435.07,349.33 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.CreoleFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="637.11,112.94,658.27,111.84,642.42,125.9,637.11,112.94" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.ProfanityFilter--><path codeLine="92" d="M638.16,98.71 C527.32,109.6 339.46,133.21 283,172 C214.56,219.03 174.83,313.59 158.23,361.79 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.ProfanityFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="637.66,91.72,658.24,96.79,638.99,105.66,637.66,91.72" style="stroke:#A80036;stroke-width:1.0;"/ [...]
+reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filters.SpamFilter--><path codeLine="93" d="M804.67,121.22 C834.03,134.12 866.17,151.12 892,172 C907.86,184.82 923.08,199.44 937.45,214.9 " fill="none" id="org.apache.wiki.api.filters.BasePageFilter-backto-org.apache.wiki.filters.SpamFilter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="801.6,127.52,785.87,113.33,807.02,114.61,801.6,127.52" style="stroke:#A80036;stroke-width:1.0;"/><text f [...]
 @startuml
     namespace org.apache.wiki.filters {
 
@@ -29,8 +29,18 @@ reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filte
             +postSave(Context, String): void
         }
 
-        class ProfanityFilter [[ProfanityFilter.html]] {
-            +preTranslate(Context, String): String
+        interface FilterManager [[FilterManager.html]] {
+            {static} +PROP_FILTERXML: String
+            {static} +DEFAULT_XMLFILE: String
+            {static} +SYSTEM_FILTER_PRIORITY: int
+            {static} +USER_FILTER_PRIORITY: int
+            {abstract} +addPageFilter(PageFilter, int): void
+            {abstract} +doPreTranslateFiltering(Context, String): String
+            {abstract} +doPostTranslateFiltering(Context, String): String
+            {abstract} +doPreSaveFiltering(Context, String): String
+            {abstract} +doPostSaveFiltering(Context, String): void
+            {abstract} +getFilterList(): List<PageFilter>
+            {abstract} +destroy(): void
         }
 
         class PageEventFilter [[PageEventFilter.html]] {
@@ -44,18 +54,29 @@ reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filte
             #fireEvent(int, Context): void
         }
 
-        interface FilterManager [[FilterManager.html]] {
-            {static} +PROP_FILTERXML: String
-            {static} +DEFAULT_XMLFILE: String
-            {static} +SYSTEM_FILTER_PRIORITY: int
-            {static} +USER_FILTER_PRIORITY: int
-            {abstract} +addPageFilter(PageFilter, int): void
-            {abstract} +doPreTranslateFiltering(Context, String): String
-            {abstract} +doPostTranslateFiltering(Context, String): String
-            {abstract} +doPreSaveFiltering(Context, String): String
-            {abstract} +doPostSaveFiltering(Context, String): void
-            {abstract} +getFilterList(): List<PageFilter>
-            {abstract} +destroy(): void
+        class DefaultFilterManager [[DefaultFilterManager.html]] {
+            +DefaultFilterManager(Engine, Properties)
+            +addPageFilter(PageFilter, int): void
+            #initialize(Properties): void
+            +doPreTranslateFiltering(Context, String): String
+            +doPostTranslateFiltering(Context, String): String
+            +doPreSaveFiltering(Context, String): String
+            +doPostSaveFiltering(Context, String): void
+            +getFilterList(): List<PageFilter>
+            +destroy(): void
+            +fireEvent(int, Context): void
+            +modules(): Collection<WikiModuleInfo>
+            +getModuleInfo(String): PageFilterInfo
+        }
+
+        class CreoleFilter [[CreoleFilter.html]] {
+            +initialize(Engine, Properties): void
+            +preSave(Context, String): String
+            +preTranslate(Context, String): String
+        }
+
+        class ProfanityFilter [[ProfanityFilter.html]] {
+            +preTranslate(Context, String): String
         }
 
         class SpamFilter [[SpamFilter.html]] {
@@ -85,35 +106,14 @@ reverse link org.apache.wiki.api.filters.BasePageFilter to org.apache.wiki.filte
             {static} +insertInputFields(PageContext): String
         }
 
-        class DefaultFilterManager [[DefaultFilterManager.html]] {
-            +DefaultFilterManager(Engine, Properties)
-            +addPageFilter(PageFilter, int): void
-            #initialize(Properties): void
-            +doPreTranslateFiltering(Context, String): String
-            +doPostTranslateFiltering(Context, String): String
-            +doPreSaveFiltering(Context, String): String
-            +doPostSaveFiltering(Context, String): void
-            +getFilterList(): List<PageFilter>
-            +destroy(): void
-            +fireEvent(int, Context): void
-            +modules(): Collection<WikiModuleInfo>
-            +getModuleInfo(String): PageFilterInfo
-        }
-
-        class CreoleFilter [[CreoleFilter.html]] {
-            +initialize(Engine, Properties): void
-            +preSave(Context, String): String
-            +preTranslate(Context, String): String
-        }
-
         org.apache.wiki.api.filters.BasePageFilter <|- - PingWeblogsComFilter
-        org.apache.wiki.api.filters.BasePageFilter <|- - ProfanityFilter
-        org.apache.wiki.api.filters.BasePageFilter <|- - PageEventFilter
         org.apache.wiki.modules.ModuleManager <|- - FilterManager
-        org.apache.wiki.api.filters.BasePageFilter <|- - SpamFilter
+        org.apache.wiki.api.filters.BasePageFilter <|- - PageEventFilter
         org.apache.wiki.modules.BaseModuleManager <|- - DefaultFilterManager
         FilterManager <|.. DefaultFilterManager
         org.apache.wiki.api.filters.BasePageFilter <|- - CreoleFilter
+        org.apache.wiki.api.filters.BasePageFilter <|- - ProfanityFilter
+        org.apache.wiki.api.filters.BasePageFilter <|- - SpamFilter
     }
 
     namespace org.apache.wiki.api.filters {
@@ -143,5 +143,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormClose.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormClose.svg
index f6e1e995bd..d6cd6a44d5 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormClose.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormClose.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:309px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 194" width="309px" zoomAndPan="magnify"><defs><filter height="300%" id="f1iru6zwcte4s9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.forms.FormClose--><a href="FormClose.html" target="_top" title="FormClose.html" xlink:actuate="onRequest" xlink:href="FormClose.html" xlink:show="new" xlink:title="FormClose.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1iru6zwcte4s9)" height="58.7422" id="org.apache.wiki.forms.FormClose" style="stroke:#A80036;stroke-width:1.5;" width="288" x="7" y="105"/><ellipse cx="93.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A800 [...]
 class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1iru6zwcte4s9)" height="37.9375" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="142" x="80" y="7"/><ellipse cx="95" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="strok [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormClose--><path codeLine="11" d="M151,65.22 C151,78.3 151,92.7 151,104.89 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormClose" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.07,151,45.07,158,65.07,144,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="19 [...]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormClose--><path codeLine="11" d="M151,65.22 C151,78.3 151,92.7 151,104.89 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormClose" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.07,151,45.07,158,65.07,144,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="19 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormElement.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormElement.svg
index f3c5e80dca..c3aff1a533 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormElement.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormElement.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="389px" preserveAspectRatio="none" style="width:308px;height:389px;background:#FFFFFF;" version="1.1" viewBox="0 0 308 389" width="308px" zoomAndPan="magnify"><defs><filter height="300%" id="f102s08uu6pmib" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f102s08uu6pmib)" height="233.2031" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="246" x="27.5" y="126"/><ellipse cx="91.25" cy="144.9688" fill="#A9DCDF" rx="11" ry="11" sty [...]
 class org.apache.wiki.api.plugin.Plugin--><a href="../api/plugin/Plugin.html" target="_top" title="../api/plugin/Plugin.html" xlink:actuate="onRequest" xlink:href="../api/plugin/Plugin.html" xlink:show="new" xlink:title="../api/plugin/Plugin.html" xlink:type="simple"><rect codeLine="22" fill="#FEFECE" filter="url(#f102s08uu6pmib)" height="58.7422" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="7" y="7"/><ellipse cx="81.75" cy="25.9688" fill [...]
-reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.forms.FormElement--><path codeLine="26" d="M150.5,86.41 C150.5,98.55 150.5,112.08 150.5,125.94 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="143.5,86.3,150.5,66.3,157.5,86.3,143.5,86.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-siz [...]
+reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.forms.FormElement--><path codeLine="26" d="M150.5,86.41 C150.5,98.55 150.5,112.08 150.5,125.94 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="143.5,86.3,150.5,66.3,157.5,86.3,143.5,86.3" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-siz [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -39,5 +39,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormHandler.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormHandler.svg
index 791241f2a3..22273c8960 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormHandler.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormHandler.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="69px" preserveAspectRatio="none" style="width:199px;height:69px;background:#FFFFFF;" version="1.1" viewBox="0 0 199 69" width="199px" zoomAndPan="magnify"><defs><filter height="300%" id="f5x8y3lxzr4y" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2 [...]
-class org.apache.wiki.forms.FormHandler--><a href="FormHandler.html" target="_top" title="FormHandler.html" xlink:actuate="onRequest" xlink:href="FormHandler.html" xlink:show="new" xlink:title="FormHandler.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f5x8y3lxzr4y)" height="37.9375" id="org.apache.wiki.forms.FormHandler" style="stroke:#A80036;stroke-width:1.5;" width="142" x="25" y="7"/><ellipse cx="40" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke: [...]
+class org.apache.wiki.forms.FormHandler--><a href="FormHandler.html" target="_top" title="FormHandler.html" xlink:actuate="onRequest" xlink:href="FormHandler.html" xlink:show="new" xlink:title="FormHandler.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f5x8y3lxzr4y)" height="37.9375" id="org.apache.wiki.forms.FormHandler" style="stroke:#A80036;stroke-width:1.5;" width="142" x="25" y="7"/><ellipse cx="40" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke: [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -16,5 +16,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormInfo.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormInfo.svg
index ffe3c3c14d..f968d04876 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormInfo.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormInfo.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="445px" preserveAspectRatio="none" style="width:291px;height:445px;background:#FFFFFF;" version="1.1" viewBox="0 0 291 445" width="291px" zoomAndPan="magnify"><defs><filter height="300%" id="foy5uob5ijc3f" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.forms.FormInfo--><a href="FormInfo.html" target="_top" title="FormInfo.html" xlink:actuate="onRequest" xlink:href="FormInfo.html" xlink:show="new" xlink:title="FormInfo.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#foy5uob5ijc3f)" height="310.0313" id="org.apache.wiki.forms.FormInfo" style="stroke:#A80036;stroke-width:1.5;" width="270" x="7" y="105"/><ellipse cx="84.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;str [...]
 class java.io.Serializable--><rect codeLine="28" fill="#FEFECE" filter="url(#foy5uob5ijc3f)" height="37.9375" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="108" x="88" y="7"/><ellipse cx="103" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M98.9219,21.7344 L98.9219,19.5781 L106.3125,19.5781 L106.3125,21.7344 L103.8438,21.7344 L103.8438,29.8125 L106.3125,29.8125 L106.3125,31.9688 L98.9219,31.9688 L98.9219,29.8125  [...]
-reverse link java.io.Serializable to org.apache.wiki.forms.FormInfo--><path codeLine="30" d="M142,65.42 C142,77.01 142,90.5 142,104.88 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.forms.FormInfo" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="135,65.2,142,45.2,149,65.2,135,65.2" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x=" [...]
+reverse link java.io.Serializable to org.apache.wiki.forms.FormInfo--><path codeLine="30" d="M142,65.42 C142,77.01 142,90.5 142,104.88 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.forms.FormInfo" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="135,65.2,142,45.2,149,65.2,135,65.2" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -43,5 +43,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormInput.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormInput.svg
index 90dae029bb..ffa94580d1 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormInput.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormInput.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="240px" preserveAspectRatio="none" style="width:309px;height:240px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 240" width="309px" zoomAndPan="magnify"><defs><filter height="300%" id="f14ot5gnh4sq3u" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.forms.FormInput--><a href="FormInput.html" target="_top" title="FormInput.html" xlink:actuate="onRequest" xlink:href="FormInput.html" xlink:show="new" xlink:title="FormInput.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f14ot5gnh4sq3u)" height="105.1563" id="org.apache.wiki.forms.FormInput" style="stroke:#A80036;stroke-width:1.5;" width="288" x="7" y="105"/><ellipse cx="93.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80 [...]
 class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#f14ot5gnh4sq3u)" height="37.9375" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="142" x="80" y="7"/><ellipse cx="95" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stro [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormInput--><path codeLine="14" d="M151,65.16 C151,77.59 151,91.6 151,104.85 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormInput" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.01,151,45.01,158,65.01,144,65.01" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="1 [...]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormInput--><path codeLine="14" d="M151,65.16 C151,77.59 151,91.6 151,104.85 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormInput" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.01,151,45.01,158,65.01,144,65.01" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="1 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormOpen.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormOpen.svg
index a37f59330e..000b95a364 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormOpen.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormOpen.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="215px" preserveAspectRatio="none" style="width:309px;height:215px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 215" width="309px" zoomAndPan="magnify"><defs><filter height="300%" id="f1hpih0oe695et" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.forms.FormOpen--><a href="FormOpen.html" target="_top" title="FormOpen.html" xlink:actuate="onRequest" xlink:href="FormOpen.html" xlink:show="new" xlink:title="FormOpen.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1hpih0oe695et)" height="79.5469" id="org.apache.wiki.forms.FormOpen" style="stroke:#A80036;stroke-width:1.5;" width="288" x="7" y="105"/><ellipse cx="93.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;str [...]
 class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1hpih0oe695et)" height="37.9375" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="142" x="80" y="7"/><ellipse cx="95" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stro [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOpen--><path codeLine="12" d="M151,65.14 C151,77.87 151,92.07 151,104.87 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormOpen" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.02,151,45.02,158,65.02,144,65.02" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="19 [...]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOpen--><path codeLine="12" d="M151,65.14 C151,77.87 151,92.07 151,104.87 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormOpen" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.02,151,45.02,158,65.02,144,65.02" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="19 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormOutput.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormOutput.svg
index 923d74209d..a18a6b842a 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormOutput.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormOutput.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:309px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 194" width="309px" zoomAndPan="magnify"><defs><filter height="300%" id="f1wlv1vn1whlnr" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.forms.FormOutput--><a href="FormOutput.html" target="_top" title="FormOutput.html" xlink:actuate="onRequest" xlink:href="FormOutput.html" xlink:show="new" xlink:title="FormOutput.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1wlv1vn1whlnr)" height="58.7422" id="org.apache.wiki.forms.FormOutput" style="stroke:#A80036;stroke-width:1.5;" width="288" x="7" y="105"/><ellipse cx="93.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
 class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1wlv1vn1whlnr)" height="37.9375" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="142" x="80" y="7"/><ellipse cx="95" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="strok [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOutput--><path codeLine="11" d="M151,65.22 C151,78.3 151,92.7 151,104.89 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormOutput" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.07,151,45.07,158,65.07,144,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength=" [...]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOutput--><path codeLine="11" d="M151,65.22 C151,78.3 151,92.7 151,104.89 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormOutput" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.07,151,45.07,158,65.07,144,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormSelect.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormSelect.svg
index fa827e8c71..c0ff48c3a4 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormSelect.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormSelect.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:309px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 194" width="309px" zoomAndPan="magnify"><defs><filter height="300%" id="f542bht630slt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.forms.FormSelect--><a href="FormSelect.html" target="_top" title="FormSelect.html" xlink:actuate="onRequest" xlink:href="FormSelect.html" xlink:show="new" xlink:title="FormSelect.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f542bht630slt)" height="58.7422" id="org.apache.wiki.forms.FormSelect" style="stroke:#A80036;stroke-width:1.5;" width="288" x="7" y="105"/><ellipse cx="93.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: [...]
 class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f542bht630slt)" height="37.9375" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="142" x="80" y="7"/><ellipse cx="95" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormSelect--><path codeLine="11" d="M151,65.22 C151,78.3 151,92.7 151,104.89 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormSelect" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.07,151,45.07,158,65.07,144,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength=" [...]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormSelect--><path codeLine="11" d="M151,65.22 C151,78.3 151,92.7 151,104.89 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormSelect" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.07,151,45.07,158,65.07,144,65.07" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormSet.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormSet.svg
index ad9951d31c..b8731576ce 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormSet.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormSet.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="215px" preserveAspectRatio="none" style="width:309px;height:215px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 215" width="309px" zoomAndPan="magnify"><defs><filter height="300%" id="f1tbsex5aoojhh" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.forms.FormSet--><a href="FormSet.html" target="_top" title="FormSet.html" xlink:actuate="onRequest" xlink:href="FormSet.html" xlink:show="new" xlink:title="FormSet.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1tbsex5aoojhh)" height="58.7422" id="org.apache.wiki.forms.FormSet" style="stroke:#A80036;stroke-width:1.5;" width="288" x="7" y="126"/><ellipse cx="93.75" cy="144.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-wi [...]
 class org.apache.wiki.api.plugin.Plugin--><a href="../api/plugin/Plugin.html" target="_top" title="../api/plugin/Plugin.html" xlink:actuate="onRequest" xlink:href="../api/plugin/Plugin.html" xlink:show="new" xlink:title="../api/plugin/Plugin.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1tbsex5aoojhh)" height="58.7422" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="7.5" y="7"/><ellipse cx="82.25" cy="25.9688" fil [...]
-reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.forms.FormSet--><path codeLine="13" d="M151,86.25 C151,99.7 151,113.86 151,125.77 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.forms.FormSet" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="144,86.12,151,66.12,158,86.12,144,86.12" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust=" [...]
+reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.forms.FormSet--><path codeLine="13" d="M151,86.25 C151,99.7 151,113.86 151,125.77 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.forms.FormSet" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="144,86.12,151,66.12,158,86.12,144,86.12" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormTextarea.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormTextarea.svg
index 755bf361d9..d6e34fc2ac 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormTextarea.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/FormTextarea.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="228px" preserveAspectRatio="none" style="width:309px;height:228px;background:#FFFFFF;" version="1.1" viewBox="0 0 309 228" width="309px" zoomAndPan="magnify"><defs><filter height="300%" id="f1b4tzu9l3gy7f" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.forms.FormTextarea--><a href="FormTextarea.html" target="_top" title="FormTextarea.html" xlink:actuate="onRequest" xlink:href="FormTextarea.html" xlink:show="new" xlink:title="FormTextarea.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1b4tzu9l3gy7f)" height="92.3516" id="org.apache.wiki.forms.FormTextarea" style="stroke:#A80036;stroke-width:1.5;" width="288" x="7" y="105"/><ellipse cx="93.75" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" s [...]
 class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f1b4tzu9l3gy7f)" height="37.9375" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="142" x="80" y="7"/><ellipse cx="95" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stro [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormTextarea--><path codeLine="13" d="M151,65.51 C151,78.01 151,91.99 151,104.93 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormTextarea" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.15,151,45.15,158,65.15,144,65.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLe [...]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormTextarea--><path codeLine="13" d="M151,65.51 C151,78.01 151,91.99 151,104.93 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormTextarea" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="144,65.15,151,45.15,158,65.15,144,65.15" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLe [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/package.svg
index ab7806e48b..c0bf6f3866 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/forms/package.svg
@@ -1,52 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="692px" preserveAspectRatio="none" style="width:1968px;height:692px;background:#FFFFFF;" version="1.1" viewBox="0 0 1968 692" width="1968px" zoomAndPan="magnify"><defs><filter height="300%" id="ffc54vi45p1pj" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
-cluster org.apache.wiki.forms--><polygon fill="#FFFFFF" filter="url(#ffc54vi45p1pj)" points="16,155,198,155,205,177.2969,1951,177.2969,1951,669,16,669,16,155" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="205" y1="177.2969" y2="177.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="176" x="20" y="169.9951">org.apache.wiki.forms</text><!--MD5=[995102a770b16a50c2339 [...]
-cluster org.apache.wiki.api.plugin--><polygon fill="#FFFFFF" filter="url(#ffc54vi45p1pj)" points="578,6,790,6,797,28.2969,898,28.2969,898,131,578,131,578,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="578" x2="797" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="206" x="582" y="20.9951">org.apache.wiki.api.plugin</text><!--MD5=[0d852700fdad35b7061 [...]
-cluster java.io--><polygon fill="#FFFFFF" filter="url(#ffc54vi45p1pj)" points="1383,19,1439,19,1446,41.2969,1519,41.2969,1519,118,1383,118,1383,19" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1383" x2="1446" y1="41.2969" y2="41.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="1387" y="33.9951">java.io</text><!--MD5=[16a9f3453b0210d124daab26ebea5522]
-class org.apache.wiki.forms.FormInput--><a href="FormInput.html" target="_top" title="FormInput.html" xlink:actuate="onRequest" xlink:href="FormInput.html" xlink:show="new" xlink:title="FormInput.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="99.2188" id="org.apache.wiki.forms.FormInput" style="stroke:#A80036;stroke-width:1.5;" width="288" x="32" y="554"/><ellipse cx="140.25" cy="570" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;s [...]
-class org.apache.wiki.forms.FormTextarea--><a href="FormTextarea.html" target="_top" title="FormTextarea.html" xlink:actuate="onRequest" xlink:href="FormTextarea.html" xlink:show="new" xlink:title="FormTextarea.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="86.4141" id="org.apache.wiki.forms.FormTextarea" style="stroke:#A80036;stroke-width:1.5;" width="288" x="355" y="560.5"/><ellipse cx="451.75" cy="576.5" fill="#ADD1B2" rx="11" ry="11" [...]
-class org.apache.wiki.forms.FormOpen--><a href="FormOpen.html" target="_top" title="FormOpen.html" xlink:actuate="onRequest" xlink:href="FormOpen.html" xlink:show="new" xlink:title="FormOpen.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="73.6094" id="org.apache.wiki.forms.FormOpen" style="stroke:#A80036;stroke-width:1.5;" width="288" x="678" y="566.5"/><ellipse cx="785.75" cy="582.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;s [...]
-class org.apache.wiki.forms.FormHandler--><a href="FormHandler.html" target="_top" title="FormHandler.html" xlink:actuate="onRequest" xlink:href="FormHandler.html" xlink:show="new" xlink:title="FormHandler.html" xlink:type="simple"><rect codeLine="21" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="48" id="org.apache.wiki.forms.FormHandler" style="stroke:#A80036;stroke-width:1.5;" width="112" x="1755" y="318"/><ellipse cx="1770" cy="334" fill="#B4A7E5" rx="11" ry="11" style="stroke:# [...]
-class org.apache.wiki.forms.FormSet--><a href="FormSet.html" target="_top" title="FormSet.html" xlink:actuate="onRequest" xlink:href="FormSet.html" xlink:show="new" xlink:title="FormSet.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="60.8047" id="org.apache.wiki.forms.FormSet" style="stroke:#A80036;stroke-width:1.5;" width="288" x="443" y="311.5"/><ellipse cx="556.75" cy="327.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke- [...]
-class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="27" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="227.2656" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="246" x="766" y="228.5"/><ellipse cx="843.75" cy="244.5" fill="#A9DCDF" rx="11" ry="11" styl [...]
-class org.apache.wiki.forms.FormInfo--><a href="FormInfo.html" target="_top" title="FormInfo.html" xlink:actuate="onRequest" xlink:href="FormInfo.html" xlink:show="new" xlink:title="FormInfo.html" xlink:type="simple"><rect codeLine="44" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="304.0938" id="org.apache.wiki.forms.FormInfo" style="stroke:#A80036;stroke-width:1.5;" width="270" x="1316" y="190"/><ellipse cx="1419.75" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;st [...]
-class org.apache.wiki.forms.FormSelect--><a href="FormSelect.html" target="_top" title="FormSelect.html" xlink:actuate="onRequest" xlink:href="FormSelect.html" xlink:show="new" xlink:title="FormSelect.html" xlink:type="simple"><rect codeLine="67" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="60.8047" id="org.apache.wiki.forms.FormSelect" style="stroke:#A80036;stroke-width:1.5;" width="288" x="1001" y="573"/><ellipse cx="1105.75" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
-class org.apache.wiki.forms.FormClose--><a href="FormClose.html" target="_top" title="FormClose.html" xlink:actuate="onRequest" xlink:href="FormClose.html" xlink:show="new" xlink:title="FormClose.html" xlink:type="simple"><rect codeLine="71" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="60.8047" id="org.apache.wiki.forms.FormClose" style="stroke:#A80036;stroke-width:1.5;" width="288" x="1324" y="573"/><ellipse cx="1431.25" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A800 [...]
-class org.apache.wiki.forms.FormOutput--><a href="FormOutput.html" target="_top" title="FormOutput.html" xlink:actuate="onRequest" xlink:href="FormOutput.html" xlink:show="new" xlink:title="FormOutput.html" xlink:type="simple"><rect codeLine="75" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="60.8047" id="org.apache.wiki.forms.FormOutput" style="stroke:#A80036;stroke-width:1.5;" width="288" x="1647" y="573"/><ellipse cx="1749.75" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
-class org.apache.wiki.api.plugin.Plugin--><a href="../api/plugin/Plugin.html" target="_top" title="../api/plugin/Plugin.html" xlink:actuate="onRequest" xlink:href="../api/plugin/Plugin.html" xlink:show="new" xlink:title="../api/plugin/Plugin.html" xlink:type="simple"><rect codeLine="91" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="73.6094" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="594.5" y="41"/><ellipse cx="715.25" cy="57" fill [...]
-class java.io.Serializable--><rect codeLine="98" fill="#FEFECE" filter="url(#ffc54vi45p1pj)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="1399.5" y="54"/><ellipse cx="1414.5" cy="70" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1410.4219,65.7656 L1410.4219,63.6094 L1417.8125,63.6094 L1417.8125,65.7656 L1415.3438,65.7656 L1415.3438,73.8438 L1417.8125,73.8438 L1417.8125,76 L1410.4219,76 L1410.4219,73.843 [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormInput--><path codeLine="79" d="M786,469.26 C774.33,478.71 761.94,487.2 749,494 C585.2,580.09 517.64,513.87 337,554 C331.44,555.23 325.8,556.56 320.11,557.96 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormInput" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="781.76,463.66,801.45,455.83,790.95,474.23,781.76,463.66" style="stroke:#A80036;stroke-width:1.0; [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormTextarea--><path codeLine="80" d="M779.68,469.5 C769.74,478.29 759.46,486.59 749,494 C710.97,520.94 665.19,543.21 623.26,560.42 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormTextarea" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="775.04,464.26,794.48,455.84,784.54,474.54,775.04,464.26" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e34d4748b96154 [...]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOpen--><path codeLine="81" d="M854.82,475.39 C846.16,508.91 837.57,542.2 831.35,566.3 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormOpen" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="848.13,473.3,859.91,455.69,861.68,476.8,848.13,473.3" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[0b8ad7aa6705b5560c62034254fc5150]
-reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.forms.FormSet--><path codeLine="82" d="M707.07,132.66 C675.96,186.65 629.11,267.94 604.12,311.29 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.forms.FormSet" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="701.11,128.99,717.16,115.15,713.24,135.98,701.11,128.99" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c43de8d4deda415d264dabd4bd393c57]
-reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.forms.FormElement--><path codeLine="83" d="M768.92,132.64 C784.87,160.33 804.97,195.2 824.13,228.45 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="762.76,135.98,758.84,115.15,774.89,128.99,762.76,135.98" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[8f181c2b70317dadc4e8988b3ded06db]
-reverse link java.io.Serializable to org.apache.wiki.forms.FormInfo--><path codeLine="84" d="M1451,122.33 C1451,141.42 1451,165.09 1451,189.75 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.forms.FormInfo" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1444,122.25,1451,102.25,1458,122.25,1444,122.25" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[87d6ba8c62a41055405d5dc90d7f504e]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormSelect--><path codeLine="85" d="M1014.39,470.1 C1052.33,508.56 1090.57,547.33 1115.78,572.88 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormSelect" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1009.23,474.84,1000.17,455.69,1019.2,465.01,1009.23,474.84" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[010d497ecd0facfd552a9d9d21317cb0]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormClose--><path codeLine="86" d="M1030.73,406.52 C1149.03,459.54 1312.31,532.72 1402.14,572.98 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormClose" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1027.53,412.76,1012.15,398.19,1033.26,399.98,1027.53,412.76" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c573ed9ffa6160fe87b84992fad183e0]
-reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOutput--><path codeLine="87" d="M1031.18,402.29 C1109.18,433.05 1208.23,469.26 1299,494 C1443.25,533.32 1484.63,519.05 1630,554 C1652.71,559.46 1676.94,566.24 1699.54,572.99 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormOutput" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1028.33,408.69,1012.33,394.8,1033.5,395.68,1028.33,408.69" style="stroke:#A800 [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="692px" preserveAspectRatio="none" style="width:1968px;height:692px;background:#FFFFFF;" version="1.1" viewBox="0 0 1968 692" width="1968px" zoomAndPan="magnify"><defs><filter height="300%" id="ffvidadcvvrfv" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevia [...]
+cluster org.apache.wiki.forms--><polygon fill="#FFFFFF" filter="url(#ffvidadcvvrfv)" points="16,155,198,155,205,177.2969,1951,177.2969,1951,669,16,669,16,155" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="205" y1="177.2969" y2="177.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="176" x="20" y="169.9951">org.apache.wiki.forms</text><!--MD5=[995102a770b16a50c2339 [...]
+cluster org.apache.wiki.api.plugin--><polygon fill="#FFFFFF" filter="url(#ffvidadcvvrfv)" points="672,6,884,6,891,28.2969,992,28.2969,992,131,672,131,672,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="672" x2="891" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="206" x="676" y="20.9951">org.apache.wiki.api.plugin</text><!--MD5=[0d852700fdad35b7061 [...]
+cluster java.io--><polygon fill="#FFFFFF" filter="url(#ffvidadcvvrfv)" points="1550,19,1606,19,1613,41.2969,1686,41.2969,1686,118,1550,118,1550,19" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1550" x2="1613" y1="41.2969" y2="41.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="1554" y="33.9951">java.io</text><!--MD5=[b5760e09b85fcd19e8f5058b0a6f5985]
+class org.apache.wiki.forms.FormTextarea--><a href="FormTextarea.html" target="_top" title="FormTextarea.html" xlink:actuate="onRequest" xlink:href="FormTextarea.html" xlink:show="new" xlink:title="FormTextarea.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="86.4141" id="org.apache.wiki.forms.FormTextarea" style="stroke:#A80036;stroke-width:1.5;" width="288" x="32" y="560.5"/><ellipse cx="128.75" cy="576.5" fill="#ADD1B2" rx="11" ry="11" s [...]
+class org.apache.wiki.forms.FormSet--><a href="FormSet.html" target="_top" title="FormSet.html" xlink:actuate="onRequest" xlink:href="FormSet.html" xlink:show="new" xlink:title="FormSet.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="60.8047" id="org.apache.wiki.forms.FormSet" style="stroke:#A80036;stroke-width:1.5;" width="288" x="537" y="311.5"/><ellipse cx="650.75" cy="327.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-w [...]
+class org.apache.wiki.forms.FormInput--><a href="FormInput.html" target="_top" title="FormInput.html" xlink:actuate="onRequest" xlink:href="FormInput.html" xlink:show="new" xlink:title="FormInput.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="99.2188" id="org.apache.wiki.forms.FormInput" style="stroke:#A80036;stroke-width:1.5;" width="288" x="355" y="554"/><ellipse cx="463.25" cy="570" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036 [...]
+class org.apache.wiki.forms.FormOpen--><a href="FormOpen.html" target="_top" title="FormOpen.html" xlink:actuate="onRequest" xlink:href="FormOpen.html" xlink:show="new" xlink:title="FormOpen.html" xlink:type="simple"><rect codeLine="20" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="73.6094" id="org.apache.wiki.forms.FormOpen" style="stroke:#A80036;stroke-width:1.5;" width="288" x="678" y="566.5"/><ellipse cx="785.75" cy="582.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;s [...]
+class org.apache.wiki.forms.FormElement--><a href="FormElement.html" target="_top" title="FormElement.html" xlink:actuate="onRequest" xlink:href="FormElement.html" xlink:show="new" xlink:title="FormElement.html" xlink:type="simple"><rect codeLine="25" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="227.2656" id="org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.5;" width="246" x="860" y="228.5"/><ellipse cx="937.75" cy="244.5" fill="#A9DCDF" rx="11" ry="11" styl [...]
+class org.apache.wiki.forms.FormClose--><a href="FormClose.html" target="_top" title="FormClose.html" xlink:actuate="onRequest" xlink:href="FormClose.html" xlink:show="new" xlink:title="FormClose.html" xlink:type="simple"><rect codeLine="42" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="60.8047" id="org.apache.wiki.forms.FormClose" style="stroke:#A80036;stroke-width:1.5;" width="288" x="1001" y="573"/><ellipse cx="1108.25" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A800 [...]
+class org.apache.wiki.forms.FormInfo--><a href="FormInfo.html" target="_top" title="FormInfo.html" xlink:actuate="onRequest" xlink:href="FormInfo.html" xlink:show="new" xlink:title="FormInfo.html" xlink:type="simple"><rect codeLine="46" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="304.0938" id="org.apache.wiki.forms.FormInfo" style="stroke:#A80036;stroke-width:1.5;" width="270" x="1483" y="190"/><ellipse cx="1586.75" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;st [...]
+class org.apache.wiki.forms.FormSelect--><a href="FormSelect.html" target="_top" title="FormSelect.html" xlink:actuate="onRequest" xlink:href="FormSelect.html" xlink:show="new" xlink:title="FormSelect.html" xlink:type="simple"><rect codeLine="69" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="60.8047" id="org.apache.wiki.forms.FormSelect" style="stroke:#A80036;stroke-width:1.5;" width="288" x="1324" y="573"/><ellipse cx="1428.75" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
+class org.apache.wiki.forms.FormHandler--><a href="FormHandler.html" target="_top" title="FormHandler.html" xlink:actuate="onRequest" xlink:href="FormHandler.html" xlink:show="new" xlink:title="FormHandler.html" xlink:type="simple"><rect codeLine="73" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="48" id="org.apache.wiki.forms.FormHandler" style="stroke:#A80036;stroke-width:1.5;" width="112" x="292" y="318"/><ellipse cx="307" cy="334" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A8 [...]
+class org.apache.wiki.forms.FormOutput--><a href="FormOutput.html" target="_top" title="FormOutput.html" xlink:actuate="onRequest" xlink:href="FormOutput.html" xlink:show="new" xlink:title="FormOutput.html" xlink:type="simple"><rect codeLine="75" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="60.8047" id="org.apache.wiki.forms.FormOutput" style="stroke:#A80036;stroke-width:1.5;" width="288" x="1647" y="573"/><ellipse cx="1749.75" cy="589" fill="#ADD1B2" rx="11" ry="11" style="stroke [...]
+class org.apache.wiki.api.plugin.Plugin--><a href="../api/plugin/Plugin.html" target="_top" title="../api/plugin/Plugin.html" xlink:actuate="onRequest" xlink:href="../api/plugin/Plugin.html" xlink:show="new" xlink:title="../api/plugin/Plugin.html" xlink:type="simple"><rect codeLine="91" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="73.6094" id="org.apache.wiki.api.plugin.Plugin" style="stroke:#A80036;stroke-width:1.5;" width="287" x="688.5" y="41"/><ellipse cx="809.25" cy="57" fill [...]
+class java.io.Serializable--><rect codeLine="98" fill="#FEFECE" filter="url(#ffvidadcvvrfv)" height="48" id="java.io.Serializable" style="stroke:#A80036;stroke-width:1.5;" width="103" x="1566.5" y="54"/><ellipse cx="1581.5" cy="70" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1577.4219,65.7656 L1577.4219,63.6094 L1584.8125,63.6094 L1584.8125,65.7656 L1582.3438,65.7656 L1582.3438,73.8438 L1584.8125,73.8438 L1584.8125,76 L1577.4219,76 L1577.4219,73.843 [...]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormTextarea--><path codeLine="79" d="M881.18,468.82 C869.18,478.53 856.4,487.18 843,494 C641.15,596.68 558.71,507.83 337,554 C327.85,555.9 318.48,558.09 309.08,560.46 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormTextarea" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="876.8,463.36,896.49,455.53,885.98,473.93,876.8,463.36" style="stroke:#A80036;stroke-wi [...]
+reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.forms.FormSet--><path codeLine="80" d="M801.07,132.66 C769.96,186.65 723.11,267.94 698.12,311.29 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.forms.FormSet" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="795.11,128.99,811.16,115.15,807.24,135.98,795.11,128.99" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[5bdb5be654f9ad52e3dfcc93c539711d]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormInput--><path codeLine="81" d="M875.99,469.47 C865.41,478.46 854.36,486.81 843,494 C833.81,499.82 733.18,531.31 643.12,558.87 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormInput" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="871.58,464.02,891.14,455.88,880.93,474.44,871.58,464.02" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e34d4748b96154dee38 [...]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOpen--><path codeLine="82" d="M902.32,473.04 C881.03,507.35 859.76,541.64 844.46,566.3 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormOpen" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="896.59,468.99,913.09,455.69,908.49,476.37,896.59,468.99" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c43de8d4deda415d264dabd4bd393c57]
+reverse link org.apache.wiki.api.plugin.Plugin to org.apache.wiki.forms.FormElement--><path codeLine="83" d="M862.92,132.64 C878.87,160.33 898.97,195.2 918.13,228.45 " fill="none" id="org.apache.wiki.api.plugin.Plugin-backto-org.apache.wiki.forms.FormElement" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="856.76,135.98,852.84,115.15,868.89,128.99,856.76,135.98" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[010d497ecd0facfd552a9d9d21317cb0]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormClose--><path codeLine="84" d="M1064.09,472.89 C1087.52,510.42 1110.94,547.94 1126.51,572.88 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormClose" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1058,476.36,1053.35,455.69,1069.88,468.95,1058,476.36" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[8f181c2b70317dadc4e8988b3ded06db]
+reverse link java.io.Serializable to org.apache.wiki.forms.FormInfo--><path codeLine="85" d="M1618,122.33 C1618,141.42 1618,165.09 1618,189.75 " fill="none" id="java.io.Serializable-backto-org.apache.wiki.forms.FormInfo" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="1611,122.25,1618,102.25,1625,122.25,1611,122.25" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[87d6ba8c62a41055405d5dc90d7f504e]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormSelect--><path codeLine="86" d="M1123.7,418.28 C1220.13,469.88 1342.82,535.52 1412.67,572.89 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormSelect" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1120.35,424.43,1106.01,408.82,1126.95,412.08,1120.35,424.43" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[c573ed9ffa6160fe87b84992fad183e0]
+reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOutput--><path codeLine="87" d="M1125.31,388.7 C1290.72,441.83 1558.87,527.95 1699.02,572.96 " fill="none" id="org.apache.wiki.forms.FormElement-backto-org.apache.wiki.forms.FormOutput" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="1123.06,395.33,1106.16,382.55,1127.34,382,1123.06,395.33" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10 [...]
 @startuml
     namespace org.apache.wiki.forms {
 
-        class FormInput [[FormInput.html]] {
-            {static} +PARAM_TYPE: String
-            {static} +PARAM_SIZE: String
-            {static} +PARAM_CHECKED: String
-            +execute(Context, Map<String, String>): String
-        }
-
         class FormTextarea [[FormTextarea.html]] {
             {static} +PARAM_ROWS: String
             {static} +PARAM_COLS: String
             +execute(Context, Map<String, String>): String
         }
 
-        class FormOpen [[FormOpen.html]] {
-            {static} +PARAM_METHOD: String
+        class FormSet [[FormSet.html]] {
             +execute(Context, Map<String, String>): String
         }
 
-        interface FormHandler [[FormHandler.html]]
+        class FormInput [[FormInput.html]] {
+            {static} +PARAM_TYPE: String
+            {static} +PARAM_SIZE: String
+            {static} +PARAM_CHECKED: String
+            +execute(Context, Map<String, String>): String
+        }
 
-        class FormSet [[FormSet.html]] {
+        class FormOpen [[FormOpen.html]] {
+            {static} +PARAM_METHOD: String
             +execute(Context, Map<String, String>): String
         }
 
@@ -67,6 +65,10 @@ reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOutp
             #getFormInfo(Context): FormInfo
         }
 
+        class FormClose [[FormClose.html]] {
+            +execute(Context, Map<String, String>): String
+        }
+
         class FormInfo [[FormInfo.html]] {
             {static} +EXECUTED: int
             {static} +OK: int
@@ -94,22 +96,20 @@ reverse link org.apache.wiki.forms.FormElement to org.apache.wiki.forms.FormOutp
             +execute(Context, Map<String, String>): String
         }
 
-        class FormClose [[FormClose.html]] {
-            +execute(Context, Map<String, String>): String
-        }
+        interface FormHandler [[FormHandler.html]]
 
         class FormOutput [[FormOutput.html]] {
             +execute(Context, Map<String, String>): String
         }
 
-        FormElement <|- - FormInput
         FormElement <|- - FormTextarea
-        FormElement <|- - FormOpen
         org.apache.wiki.api.plugin.Plugin <|.. FormSet
+        FormElement <|- - FormInput
+        FormElement <|- - FormOpen
         org.apache.wiki.api.plugin.Plugin <|.. FormElement
+        FormElement <|- - FormClose
         java.io.Serializable <|.. FormInfo
         FormElement <|- - FormSelect
-        FormElement <|- - FormClose
         FormElement <|- - FormOutput
     }
 
@@ -133,5 +133,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.svg
index 84de2deb74..01c6a86383 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="141px" preserveAspectRatio="none" style="width:294px;height:141px;background:#FFFFFF;" version="1.1" viewBox="0 0 294 141" width="294px" zoomAndPan="magnify"><defs><filter height="300%" id="ftvx67m5vbg2m" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><a href="HtmlStringToWikiTranslator.html" target="_top" title="HtmlStringToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="HtmlStringToWikiTranslator.html" xlink:show="new" xlink:title="HtmlStringToWikiTranslator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ftvx67m5vbg2m)" height="109.9609" id="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" style="stroke:#A80036;stroke-width:1.5;" [...]
+class org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><a href="HtmlStringToWikiTranslator.html" target="_top" title="HtmlStringToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="HtmlStringToWikiTranslator.html" xlink:show="new" xlink:title="HtmlStringToWikiTranslator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ftvx67m5vbg2m)" height="109.9609" id="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" style="stroke:#A80036;stroke-width:1.5;" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.svg
index 38a15a2a2d..eefa18944d 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/SyntaxDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="589px" preserveAspectRatio="none" style="width:787px;height:589px;background:#FFFFFF;" version="1.1" viewBox="0 0 787 589" width="787px" zoomAndPan="magnify"><defs><filter height="300%" id="f1k7c37ous1ov0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="SyntaxDecorator.html" target="_top" title="SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="SyntaxDecorator.html" xlink:show="new" xlink:title="SyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1k7c37ous1ov0)" height="558.125" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="7" y="7"/><ellipse cx="318.75" cy="25.9688" fill=" [...]
+class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="SyntaxDecorator.html" target="_top" title="SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="SyntaxDecorator.html" xlink:show="new" xlink:title="SyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1k7c37ous1ov0)" height="558.125" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="7" y="7"/><ellipse cx="318.75" cy="25.9688" fill=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -57,5 +57,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.svg
index 336732f63d..514bdb2f21 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="325px" preserveAspectRatio="none" style="width:269px;height:325px;background:#FFFFFF;" version="1.1" viewBox="0 0 269 325" width="269px" zoomAndPan="magnify"><defs><filter height="300%" id="f1df4pqz9fba1f" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><a href="WhitespaceTrimWriter.html" target="_top" title="WhitespaceTrimWriter.html" xlink:actuate="onRequest" xlink:href="WhitespaceTrimWriter.html" xlink:show="new" xlink:title="WhitespaceTrimWriter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1df4pqz9fba1f)" height="143.5703" id="org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.5;" width="248" x="7" y="151"/><ellips [...]
 class java.io.Writer--><rect codeLine="15" fill="#FEFECE" filter="url(#f1df4pqz9fba1f)" height="84.3516" id="java.io.Writer" style="stroke:#A80036;stroke-width:1.5;" width="171" x="45.5" y="7"/><ellipse cx="106.25" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M106.3594,21.3125 L105.2031,26.3906 L107.5313,26.3906 L106.3594,21.3125 Z M104.875,19.0781 L107.8594,19.0781 L111.2188,31.4688 L108.7656,31.4688 L108,28.4063 L104.7188,28.4063 L103.9 [...]
-reverse link java.io.Writer to org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><path codeLine="21" d="M131,111.66 C131,124.38 131,137.87 131,150.9 " fill="none" id="java.io.Writer-backto-org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="124,111.2,131,91.2,138,111.2,124,111.2" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192"  [...]
+reverse link java.io.Writer to org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><path codeLine="21" d="M131,111.66 C131,124.38 131,137.87 131,150.9 " fill="none" id="java.io.Writer-backto-org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="124,111.2,131,91.2,138,111.2,124,111.2" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -34,5 +34,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.ElementDecoratorData.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.ElementDecoratorData.svg
index 09c19dfec0..59a9488563 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.ElementDecoratorData.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.ElementDecoratorData.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="284px" preserveAspectRatio="none" style="width:426px;height:284px;background:#FFFFFF;" version="1.1" viewBox="0 0 426 284" width="426px" zoomAndPan="magnify"><defs><filter height="300%" id="fuhu749ly2ycc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><a href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" target="_top" title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fuhu749ly2ycc)" he [...]
 class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator--><a href="XHtmlElementToWikiTranslator.html" target="_top" title="XHtmlElementToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#fuhu749ly2ycc)" height="37.9375" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator" style="stroke:#A80036;stroke [...]
-reverse link org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator to org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><path codeLine="18" d="M209.5,60.38 C209.5,73.57 209.5,89.29 209.5,104.88 " fill="none" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator-backto-org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="209.5" cy="53.21" fill="#FFFFFF" rx="8" ry="8" style= [...]
+reverse link org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator to org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><path codeLine="18" d="M209.5,60.38 C209.5,73.57 209.5,89.29 209.5,104.88 " fill="none" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator-backto-org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="209.5" cy="53.21" fill="#FFFFFF" rx="8" ry="8" style= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.svg
index 55a4dbf0a6..f35b2250e1 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:432px;height:283px;background:#FFFFFF;" version="1.1" viewBox="0 0 432 283" width="432px" zoomAndPan="magnify"><defs><filter height="300%" id="ffrssqaju4ppw" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator--><a href="XHtmlElementToWikiTranslator.html" target="_top" title="XHtmlElementToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ffrssqaju4ppw)" height="148.375" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator" style="stroke:#A80036;stroke- [...]
 class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><a href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" target="_top" title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:type="simple"><rect codeLine="15" fill="#FEFECE" filter="url(#ffrssqaju4ppw)" h [...]
-reverse link org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator to org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><path codeLine="17" d="M212.5,170.51 C212.5,187.29 212.5,203.19 212.5,214.75 " fill="none" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator-backto-org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="212.5" cy="163.29" fill="#FFFFFF" rx="8" ry="8" st [...]
+reverse link org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator to org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><path codeLine="17" d="M212.5,170.51 C212.5,187.29 212.5,203.19 212.5,214.75 " fill="none" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator-backto-org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="212.5" cy="163.29" fill="#FFFFFF" rx="8" ry="8" st [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -30,5 +30,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.svg
index e16dd356f0..8edc4f6264 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/XHtmlToWikiConfig.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="282px" preserveAspectRatio="none" style="width:320px;height:282px;background:#FFFFFF;" version="1.1" viewBox="0 0 320 282" width="320px" zoomAndPan="magnify"><defs><filter height="300%" id="foiuiwkk06qw3" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.XHtmlToWikiConfig--><a href="XHtmlToWikiConfig.html" target="_top" title="XHtmlToWikiConfig.html" xlink:actuate="onRequest" xlink:href="XHtmlToWikiConfig.html" xlink:show="new" xlink:title="XHtmlToWikiConfig.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#foiuiwkk06qw3)" height="250.8125" id="org.apache.wiki.htmltowiki.XHtmlToWikiConfig" style="stroke:#A80036;stroke-width:1.5;" width="299" x="7" y="7"/><ellipse cx="87.75" cy="25.9 [...]
+class org.apache.wiki.htmltowiki.XHtmlToWikiConfig--><a href="XHtmlToWikiConfig.html" target="_top" title="XHtmlToWikiConfig.html" xlink:actuate="onRequest" xlink:href="XHtmlToWikiConfig.html" xlink:show="new" xlink:title="XHtmlToWikiConfig.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#foiuiwkk06qw3)" height="250.8125" id="org.apache.wiki.htmltowiki.XHtmlToWikiConfig" style="stroke:#A80036;stroke-width:1.5;" width="299" x="7" y="7"/><ellipse cx="87.75" cy="25.9 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -33,5 +33,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/package.svg
index db5ffc5a48..805c40b17b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/package.svg
@@ -1,57 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1127px" preserveAspectRatio="none" style="width:1403px;height:1127px;background:#FFFFFF;" version="1.1" viewBox="0 0 1403 1127" width="1403px" zoomAndPan="magnify"><defs><filter height="300%" id="ft68ui4esi9w" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDev [...]
-cluster org.apache.wiki.htmltowiki--><polygon fill="#FFFFFF" filter="url(#ft68ui4esi9w)" points="16,180,233,180,240,202.2969,1386,202.2969,1386,1104,16,1104,16,180" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="240" y1="202.2969" y2="202.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="211" x="20" y="194.9951">org.apache.wiki.htmltowiki</text><!--MD5=[0d852700fd [...]
-cluster java.io--><polygon fill="#FFFFFF" filter="url(#ft68ui4esi9w)" points="501,6,557,6,564,28.2969,705,28.2969,705,156,501,156,501,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="501" x2="564" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="505" y="20.9951">java.io</text><!--MD5=[4813a44c5a4854b149b5f436d79b1d25]
-class org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><a href="WhitespaceTrimWriter.html" target="_top" title="WhitespaceTrimWriter.html" xlink:actuate="onRequest" xlink:href="WhitespaceTrimWriter.html" xlink:show="new" xlink:title="WhitespaceTrimWriter.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#ft68ui4esi9w)" height="137.6328" id="org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.5;" width="248" x="479" y="272.5"/><elli [...]
-class org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><a href="HtmlStringToWikiTranslator.html" target="_top" title="HtmlStringToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="HtmlStringToWikiTranslator.html" xlink:show="new" xlink:title="HtmlStringToWikiTranslator.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#ft68ui4esi9w)" height="112.0234" id="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" style="stroke:#A80036;stroke-width:1.5;" [...]
-class org.apache.wiki.htmltowiki.XHtmlToWikiConfig--><a href="XHtmlToWikiConfig.html" target="_top" title="XHtmlToWikiConfig.html" xlink:actuate="onRequest" xlink:href="XHtmlToWikiConfig.html" xlink:show="new" xlink:title="XHtmlToWikiConfig.html" xlink:type="simple"><rect codeLine="21" fill="#FEFECE" filter="url(#ft68ui4esi9w)" height="252.875" id="org.apache.wiki.htmltowiki.XHtmlToWikiConfig" style="stroke:#A80036;stroke-width:1.5;" width="299" x="1070.5" y="215"/><ellipse cx="1159.25"  [...]
-class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="SyntaxDecorator.html" target="_top" title="SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="SyntaxDecorator.html" xlink:show="new" xlink:title="SyntaxDecorator.html" xlink:type="simple"><rect codeLine="40" fill="#FEFECE" filter="url(#ft68ui4esi9w)" height="560.1875" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="516" y="528"/><ellipse cx="841.75" cy="544" fill=" [...]
-class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator--><a href="XHtmlElementToWikiTranslator.html" target="_top" title="XHtmlElementToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.html" xlink:type="simple"><rect codeLine="83" fill="#FEFECE" filter="url(#ft68ui4esi9w)" height="150.4375" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator" style="stroke:#A80036;stroke [...]
-class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><a href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" target="_top" title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:type="simple"><rect codeLine="94" fill="#FEFECE" filter="url(#ft68ui4esi9w)" he [...]
-class java.io.Writer--><rect codeLine="110" fill="#FEFECE" filter="url(#ft68ui4esi9w)" height="99.2188" id="java.io.Writer" style="stroke:#A80036;stroke-width:1.5;" width="171" x="517.5" y="41"/><ellipse cx="579.75" cy="57" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M579.8594,52.3438 L578.7031,57.4219 L581.0313,57.4219 L579.8594,52.3438 Z M578.375,50.1094 L581.3594,50.1094 L584.7188,62.5 L582.2656,62.5 L581.5,59.4375 L578.2188,59.4375 L577.4688,62.5 [...]
-reverse link java.io.Writer to org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><path codeLine="105" d="M603,160.22 C603,195.12 603,237.4 603,272.24 " fill="none" id="java.io.Writer-backto-org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="596,160.1,603,140.1,610,160.1,596,160.1" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[52d57de5793f49c3c1bcfaa300453f3a]
-reverse link org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator to org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><path codeLine="106" d="M238,431.87 C238,519.3 238,650.93 238,732.76 " fill="none" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator-backto-org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="238.0076" cy="424.62" fill="#FFFFFF" rx="8" ry="8" style=" [...]
-link org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator to org.apache.wiki.htmltowiki.XHtmlToWikiConfig--><!--MD5=[e49389192d7146d021cf0b4215d8fcd3]
-link org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator to org.apache.wiki.htmltowiki.SyntaxDecorator--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="599" y="1119.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[ce24ef78928277c6d6c77727bdd2e311]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1024px" preserveAspectRatio="none" style="width:1896px;height:1024px;background:#FFFFFF;" version="1.1" viewBox="0 0 1896 1024" width="1896px" zoomAndPan="magnify"><defs><filter height="300%" id="f18xxhn1hko4ge" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdD [...]
+cluster org.apache.wiki.htmltowiki--><polygon fill="#FFFFFF" filter="url(#f18xxhn1hko4ge)" points="16,180,233,180,240,202.2969,1879,202.2969,1879,1001,16,1001,16,180" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="240" y1="202.2969" y2="202.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="211" x="20" y="194.9951">org.apache.wiki.htmltowiki</text><!--MD5=[0d852700 [...]
+cluster java.io--><polygon fill="#FFFFFF" filter="url(#f18xxhn1hko4ge)" points="501,6,557,6,564,28.2969,705,28.2969,705,156,501,156,501,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="501" x2="564" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="50" x="505" y="20.9951">java.io</text><!--MD5=[83a7751a55bb9ec62a4d9eabb77fd392]
+class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="SyntaxDecorator.html" target="_top" title="SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="SyntaxDecorator.html" xlink:show="new" xlink:title="SyntaxDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f18xxhn1hko4ge)" height="560.1875" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="762" y="215"/><ellipse cx="1087.75" cy="231" fill [...]
+class org.apache.wiki.htmltowiki.XHtmlToWikiConfig--><a href="XHtmlToWikiConfig.html" target="_top" title="XHtmlToWikiConfig.html" xlink:actuate="onRequest" xlink:href="XHtmlToWikiConfig.html" xlink:show="new" xlink:title="XHtmlToWikiConfig.html" xlink:type="simple"><rect codeLine="46" fill="#FEFECE" filter="url(#f18xxhn1hko4ge)" height="252.875" id="org.apache.wiki.htmltowiki.XHtmlToWikiConfig" style="stroke:#A80036;stroke-width:1.5;" width="299" x="1563.5" y="368.5"/><ellipse cx="1652. [...]
+class org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><a href="WhitespaceTrimWriter.html" target="_top" title="WhitespaceTrimWriter.html" xlink:actuate="onRequest" xlink:href="WhitespaceTrimWriter.html" xlink:show="new" xlink:title="WhitespaceTrimWriter.html" xlink:type="simple"><rect codeLine="65" fill="#FEFECE" filter="url(#f18xxhn1hko4ge)" height="137.6328" id="org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.5;" width="248" x="479" y="426"/><ell [...]
+class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator--><a href="XHtmlElementToWikiTranslator.html" target="_top" title="XHtmlElementToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.html" xlink:type="simple"><rect codeLine="75" fill="#FEFECE" filter="url(#f18xxhn1hko4ge)" height="150.4375" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator" style="stroke:#A80036;stro [...]
+class org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><a href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" target="_top" title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:actuate="onRequest" xlink:href="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:show="new" xlink:title="XHtmlElementToWikiTranslator.ElementDecoratorData.html" xlink:type="simple"><rect codeLine="86" fill="#FEFECE" filter="url(#f18xxhn1hko4ge)"  [...]
+class org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><a href="HtmlStringToWikiTranslator.html" target="_top" title="HtmlStringToWikiTranslator.html" xlink:actuate="onRequest" xlink:href="HtmlStringToWikiTranslator.html" xlink:show="new" xlink:title="HtmlStringToWikiTranslator.html" xlink:type="simple"><rect codeLine="97" fill="#FEFECE" filter="url(#f18xxhn1hko4ge)" height="112.0234" id="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" style="stroke:#A80036;stroke-width:1.5 [...]
+class java.io.Writer--><rect codeLine="110" fill="#FEFECE" filter="url(#f18xxhn1hko4ge)" height="99.2188" id="java.io.Writer" style="stroke:#A80036;stroke-width:1.5;" width="171" x="517.5" y="41"/><ellipse cx="579.75" cy="57" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M579.8594,52.3438 L578.7031,57.4219 L581.0313,57.4219 L579.8594,52.3438 Z M578.375,50.1094 L581.3594,50.1094 L584.7188,62.5 L582.2656,62.5 L581.5,59.4375 L578.2188,59.4375 L577.4688,62 [...]
+reverse link java.io.Writer to org.apache.wiki.htmltowiki.WhitespaceTrimWriter--><path codeLine="105" d="M603,160.21 C603,234.38 603,351.81 603,425.79 " fill="none" id="java.io.Writer-backto-org.apache.wiki.htmltowiki.WhitespaceTrimWriter" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="596,160.05,603,140.05,610,160.05,596,160.05" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[52d57de5793f49c3c1bcfaa300453f3a]
+reverse link org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator to org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData--><path codeLine="106" d="M238,585.74 C238,660.3 238,765.1 238,834.94 " fill="none" id="org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator-backto-org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData" style="stroke:#A80036;stroke-width:1.0;"/><ellipse cx="238" cy="578.31" fill="#FFFFFF" rx="8" ry="8" style="stroke [...]
+link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.XHtmlToWikiConfig--><!--MD5=[084e7fafcd9c98474ed4a68a8ba8eb74]
+link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator--><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="192" x="845.5" y="1016.2822">UMLDoclet 2.0.15, PlantUML 1.2021.13</text><!--MD5=[afee1ef65b79ffed45e90e6f977e217e]
 @startuml
     namespace org.apache.wiki.htmltowiki {
 
-        class WhitespaceTrimWriter [[WhitespaceTrimWriter.html]] {
-            {static} +NO_TRIMMED_SPACE: String
-            +flush(): void
-            +isWhitespaceTrimMode(): boolean
-            +setWhitespaceTrimMode(boolean): void
-            +write(char[], int, int): void
-            +close(): void
-            +isCurrentlyOnLineBegin(): boolean
-        }
-
-        class HtmlStringToWikiTranslator [[HtmlStringToWikiTranslator.html]] {
-            +HtmlStringToWikiTranslator(Engine)
-            +translate(String): String
-            +translate(String, Context): String
-            +translate(String, XHtmlToWikiConfig): String
-            {static} +element2String(Element): String
-        }
-
-        class XHtmlToWikiConfig [[XHtmlToWikiConfig.html]] {
-            +XHtmlToWikiConfig()
-            +XHtmlToWikiConfig(Context)
-            +getAttachPage(): String
-            +setAttachPage(String): void
-            +getOutlink(): String
-            +setOutlink(String): void
-            +getPageInfoJsp(): String
-            +setPageInfoJsp(String): void
-            +getPageName(): String
-            +setPageName(String): void
-            +getWikiJspPage(): String
-            +setWikiJspPage(String): void
-            +getEditJspPage(): String
-            +setEditJspPage(String): void
-            +isNotIgnorableWikiMarkupLink(Element): boolean
-            +trimLink(String): String
-        }
-
         interface SyntaxDecorator [[SyntaxDecorator.html]] {
             {abstract} +init(PrintWriter, Deque<String>, Deque<String>, WhitespaceTrimWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator): void
             {abstract} +a(Element, String): void
@@ -95,6 +58,35 @@ link org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator to org.apache.wiki.ht
             {abstract} +underline(Element): void
         }
 
+        class XHtmlToWikiConfig [[XHtmlToWikiConfig.html]] {
+            +XHtmlToWikiConfig()
+            +XHtmlToWikiConfig(Context)
+            +getAttachPage(): String
+            +setAttachPage(String): void
+            +getOutlink(): String
+            +setOutlink(String): void
+            +getPageInfoJsp(): String
+            +setPageInfoJsp(String): void
+            +getPageName(): String
+            +setPageName(String): void
+            +getWikiJspPage(): String
+            +setWikiJspPage(String): void
+            +getEditJspPage(): String
+            +setEditJspPage(String): void
+            +isNotIgnorableWikiMarkupLink(Element): boolean
+            +trimLink(String): String
+        }
+
+        class WhitespaceTrimWriter [[WhitespaceTrimWriter.html]] {
+            {static} +NO_TRIMMED_SPACE: String
+            +flush(): void
+            +isWhitespaceTrimMode(): boolean
+            +setWhitespaceTrimMode(boolean): void
+            +write(char[], int, int): void
+            +close(): void
+            +isCurrentlyOnLineBegin(): boolean
+        }
+
         class XHtmlElementToWikiTranslator [[XHtmlElementToWikiTranslator.html]] {
             +XHtmlElementToWikiTranslator(Engine, Element)
             +XHtmlElementToWikiTranslator(Engine, Element, XHtmlToWikiConfig)
@@ -117,6 +109,14 @@ link org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator to org.apache.wiki.ht
             +ignoredCssClass: boolean
         }
 
+        class HtmlStringToWikiTranslator [[HtmlStringToWikiTranslator.html]] {
+            +HtmlStringToWikiTranslator(Engine)
+            +translate(String): String
+            +translate(String, Context): String
+            +translate(String, XHtmlToWikiConfig): String
+            {static} +element2String(Element): String
+        }
+
         java.io.Writer <|- - WhitespaceTrimWriter
         XHtmlElementToWikiTranslator +- - org.apache.wiki.htmltowiki.XHtmlElementToWikiTranslator.ElementDecoratorData
     }
@@ -139,5 +139,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ADecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ADecorator.svg
index 93761c1ac9..3c0604e835 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ADecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ADecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:470px;height:226px;background:#FFFFFF;" version="1.1" viewBox="0 0 470 226" width="470px" zoomAndPan="magnify"><defs><filter height="300%" id="ff35dkbj2efg" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation [...]
-class org.apache.wiki.htmltowiki.syntax.ADecorator--><a href="ADecorator.html" target="_top" title="ADecorator.html" xlink:actuate="onRequest" xlink:href="ADecorator.html" xlink:show="new" xlink:title="ADecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ff35dkbj2efg)" height="194.7891" id="org.apache.wiki.htmltowiki.syntax.ADecorator" style="stroke:#A80036;stroke-width:1.5;" width="449" x="7" y="7"/><ellipse cx="142.25" cy="25.9688" fill="#A9DCDF" rx="11"  [...]
+class org.apache.wiki.htmltowiki.syntax.ADecorator--><a href="ADecorator.html" target="_top" title="ADecorator.html" xlink:actuate="onRequest" xlink:href="ADecorator.html" xlink:show="new" xlink:title="ADecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ff35dkbj2efg)" height="194.7891" id="org.apache.wiki.htmltowiki.syntax.ADecorator" style="stroke:#A80036;stroke-width:1.5;" width="449" x="7" y="7"/><ellipse cx="142.25" cy="25.9688" fill="#A9DCDF" rx="11"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.svg
index 42799fa383..3c45749e18 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/BrDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:460px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 460 162" width="460px" zoomAndPan="magnify"><defs><filter height="300%" id="f1cqzs47ty3ukl" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html" target="_top" title="BrDecorator.html" xlink:actuate="onRequest" xlink:href="BrDecorator.html" xlink:show="new" xlink:title="BrDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1cqzs47ty3ukl)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="439" x="7" y="7"/><ellipse cx="137.25" cy="25.9688" fill="#A9DCDF"  [...]
+class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html" target="_top" title="BrDecorator.html" xlink:actuate="onRequest" xlink:href="BrDecorator.html" xlink:show="new" xlink:title="BrDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1cqzs47ty3ukl)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="439" x="7" y="7"/><ellipse cx="137.25" cy="25.9688" fill="#A9DCDF"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.svg
index e5bcc25efa..3e54dc6772 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/CodeDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:476px;height:175px;background:#FFFFFF;" version="1.1" viewBox="0 0 476 175" width="476px" zoomAndPan="magnify"><defs><filter height="300%" id="fzbx04du1g5r9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.html" target="_top" title="CodeDecorator.html" xlink:actuate="onRequest" xlink:href="CodeDecorator.html" xlink:show="new" xlink:title="CodeDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fzbx04du1g5r9)" height="143.5703" id="org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="455" x="7" y="7"/><ellipse cx="145.25" cy="25.9688" fill [...]
+class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.html" target="_top" title="CodeDecorator.html" xlink:actuate="onRequest" xlink:href="CodeDecorator.html" xlink:show="new" xlink:title="CodeDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fzbx04du1g5r9)" height="143.5703" id="org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="455" x="7" y="7"/><ellipse cx="145.25" cy="25.9688" fill [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DdDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DdDecorator.svg
index a2247df5c6..8cc36c017b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DdDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DdDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:366px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 366 149" width="366px" zoomAndPan="magnify"><defs><filter height="300%" id="f2zgptz8e9juu" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.DdDecorator--><a href="DdDecorator.html" target="_top" title="DdDecorator.html" xlink:actuate="onRequest" xlink:href="DdDecorator.html" xlink:show="new" xlink:title="DdDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f2zgptz8e9juu)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" rx [...]
+class org.apache.wiki.htmltowiki.syntax.DdDecorator--><a href="DdDecorator.html" target="_top" title="DdDecorator.html" xlink:actuate="onRequest" xlink:href="DdDecorator.html" xlink:show="new" xlink:title="DdDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f2zgptz8e9juu)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" rx [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DlDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DlDecorator.svg
index 6ee9a1627d..f642f36b5e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DlDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DlDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:362px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 362 162" width="362px" zoomAndPan="magnify"><defs><filter height="300%" id="f12xt3zmipg2qm" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.DlDecorator--><a href="DlDecorator.html" target="_top" title="DlDecorator.html" xlink:actuate="onRequest" xlink:href="DlDecorator.html" xlink:show="new" xlink:title="DlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f12xt3zmipg2qm)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="341" x="7" y="7"/><ellipse cx="88.25" cy="25.9688" fill="#A9DCDF" r [...]
+class org.apache.wiki.htmltowiki.syntax.DlDecorator--><a href="DlDecorator.html" target="_top" title="DlDecorator.html" xlink:actuate="onRequest" xlink:href="DlDecorator.html" xlink:show="new" xlink:title="DlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f12xt3zmipg2qm)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="341" x="7" y="7"/><ellipse cx="88.25" cy="25.9688" fill="#A9DCDF" r [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DtDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DtDecorator.svg
index 60972905a7..2c0f2024c9 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DtDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/DtDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:363px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 363 149" width="363px" zoomAndPan="magnify"><defs><filter height="300%" id="f1uscewnr10lqu" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.DtDecorator--><a href="DtDecorator.html" target="_top" title="DtDecorator.html" xlink:actuate="onRequest" xlink:href="DtDecorator.html" xlink:show="new" xlink:title="DtDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1uscewnr10lqu)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="7" y="7"/><ellipse cx="88.75" cy="25.9688" fill="#A9DCDF" r [...]
+class org.apache.wiki.htmltowiki.syntax.DtDecorator--><a href="DtDecorator.html" target="_top" title="DtDecorator.html" xlink:actuate="onRequest" xlink:href="DtDecorator.html" xlink:show="new" xlink:title="DtDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1uscewnr10lqu)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="7" y="7"/><ellipse cx="88.75" cy="25.9688" fill="#A9DCDF" r [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/FormDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/FormDecorator.svg
index 4b968a6de6..957087948f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/FormDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/FormDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:380px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 380 162" width="380px" zoomAndPan="magnify"><defs><filter height="300%" id="fi7pt20to8q55" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.FormDecorator--><a href="FormDecorator.html" target="_top" title="FormDecorator.html" xlink:actuate="onRequest" xlink:href="FormDecorator.html" xlink:show="new" xlink:title="FormDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fi7pt20to8q55)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.5;" width="359" x="7" y="7"/><ellipse cx="97.25" cy="25.9688" fill= [...]
+class org.apache.wiki.htmltowiki.syntax.FormDecorator--><a href="FormDecorator.html" target="_top" title="FormDecorator.html" xlink:actuate="onRequest" xlink:href="FormDecorator.html" xlink:show="new" xlink:title="FormDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fi7pt20to8q55)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.5;" width="359" x="7" y="7"/><ellipse cx="97.25" cy="25.9688" fill= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H1Decorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H1Decorator.svg
index aeeca3f1ad..05b72d55eb 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H1Decorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H1Decorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:366px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 366 149" width="366px" zoomAndPan="magnify"><defs><filter height="300%" id="fu0hcw8oa0clp" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.H1Decorator--><a href="H1Decorator.html" target="_top" title="H1Decorator.html" xlink:actuate="onRequest" xlink:href="H1Decorator.html" xlink:show="new" xlink:title="H1Decorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fu0hcw8oa0clp)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" rx [...]
+class org.apache.wiki.htmltowiki.syntax.H1Decorator--><a href="H1Decorator.html" target="_top" title="H1Decorator.html" xlink:actuate="onRequest" xlink:href="H1Decorator.html" xlink:show="new" xlink:title="H1Decorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fu0hcw8oa0clp)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" rx [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H2Decorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H2Decorator.svg
index 3aab40513b..544edd6483 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H2Decorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H2Decorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:366px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 366 149" width="366px" zoomAndPan="magnify"><defs><filter height="300%" id="f93044ijb6ew" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation [...]
-class org.apache.wiki.htmltowiki.syntax.H2Decorator--><a href="H2Decorator.html" target="_top" title="H2Decorator.html" xlink:actuate="onRequest" xlink:href="H2Decorator.html" xlink:show="new" xlink:title="H2Decorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f93044ijb6ew)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.H2Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" rx= [...]
+class org.apache.wiki.htmltowiki.syntax.H2Decorator--><a href="H2Decorator.html" target="_top" title="H2Decorator.html" xlink:actuate="onRequest" xlink:href="H2Decorator.html" xlink:show="new" xlink:title="H2Decorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f93044ijb6ew)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.H2Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" rx= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H3Decorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H3Decorator.svg
index 601d602a38..75883e23fc 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H3Decorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H3Decorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:366px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 366 149" width="366px" zoomAndPan="magnify"><defs><filter height="300%" id="fuind4hpcmpfh" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.H3Decorator--><a href="H3Decorator.html" target="_top" title="H3Decorator.html" xlink:actuate="onRequest" xlink:href="H3Decorator.html" xlink:show="new" xlink:title="H3Decorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fuind4hpcmpfh)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" rx [...]
+class org.apache.wiki.htmltowiki.syntax.H3Decorator--><a href="H3Decorator.html" target="_top" title="H3Decorator.html" xlink:actuate="onRequest" xlink:href="H3Decorator.html" xlink:show="new" xlink:title="H3Decorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fuind4hpcmpfh)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" rx [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H4Decorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H4Decorator.svg
index 41993a8b6b..fe5abf9cbd 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H4Decorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/H4Decorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:366px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 366 149" width="366px" zoomAndPan="magnify"><defs><filter height="300%" id="f1os7q4uw5y8g2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.H4Decorator--><a href="H4Decorator.html" target="_top" title="H4Decorator.html" xlink:actuate="onRequest" xlink:href="H4Decorator.html" xlink:show="new" xlink:title="H4Decorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1os7q4uw5y8g2)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.H4Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" r [...]
+class org.apache.wiki.htmltowiki.syntax.H4Decorator--><a href="H4Decorator.html" target="_top" title="H4Decorator.html" xlink:actuate="onRequest" xlink:href="H4Decorator.html" xlink:show="new" xlink:title="H4Decorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1os7q4uw5y8g2)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.H4Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7" y="7"/><ellipse cx="90.25" cy="25.9688" fill="#A9DCDF" r [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/HrDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/HrDecorator.svg
index fd1b573561..6d3baf8252 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/HrDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/HrDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:364px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 364 149" width="364px" zoomAndPan="magnify"><defs><filter height="300%" id="fou69n9r79jm0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.HrDecorator--><a href="HrDecorator.html" target="_top" title="HrDecorator.html" xlink:actuate="onRequest" xlink:href="HrDecorator.html" xlink:show="new" xlink:title="HrDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fou69n9r79jm0)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="343" x="7" y="7"/><ellipse cx="89.25" cy="25.9688" fill="#A9DCDF" rx [...]
+class org.apache.wiki.htmltowiki.syntax.HrDecorator--><a href="HrDecorator.html" target="_top" title="HrDecorator.html" xlink:actuate="onRequest" xlink:href="HrDecorator.html" xlink:show="new" xlink:title="HrDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fou69n9r79jm0)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="343" x="7" y="7"/><ellipse cx="89.25" cy="25.9688" fill="#A9DCDF" rx [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ImageDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ImageDecorator.svg
index 5392df1745..acb6f196f6 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ImageDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ImageDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:404px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 404 188" width="404px" zoomAndPan="magnify"><defs><filter height="300%" id="fi9qhs2v3tm8s" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.ImageDecorator--><a href="ImageDecorator.html" target="_top" title="ImageDecorator.html" xlink:actuate="onRequest" xlink:href="ImageDecorator.html" xlink:show="new" xlink:title="ImageDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fi9qhs2v3tm8s)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.5;" width="383" x="7" y="7"/><ellipse cx="109.25" cy="25.9688" [...]
+class org.apache.wiki.htmltowiki.syntax.ImageDecorator--><a href="ImageDecorator.html" target="_top" title="ImageDecorator.html" xlink:actuate="onRequest" xlink:href="ImageDecorator.html" xlink:show="new" xlink:title="ImageDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fi9qhs2v3tm8s)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.5;" width="383" x="7" y="7"/><ellipse cx="109.25" cy="25.9688" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/InputDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/InputDecorator.svg
index f59b6f1a6b..635df69f67 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/InputDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/InputDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:379px;height:175px;background:#FFFFFF;" version="1.1" viewBox="0 0 379 175" width="379px" zoomAndPan="magnify"><defs><filter height="300%" id="f1xa4lhzxcbgab" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.InputDecorator--><a href="InputDecorator.html" target="_top" title="InputDecorator.html" xlink:actuate="onRequest" xlink:href="InputDecorator.html" xlink:show="new" xlink:title="InputDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1xa4lhzxcbgab)" height="143.5703" id="org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.5;" width="358" x="7" y="7"/><ellipse cx="96.75" cy="25.9688 [...]
+class org.apache.wiki.htmltowiki.syntax.InputDecorator--><a href="InputDecorator.html" target="_top" title="InputDecorator.html" xlink:actuate="onRequest" xlink:href="InputDecorator.html" xlink:show="new" xlink:title="InputDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1xa4lhzxcbgab)" height="143.5703" id="org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.5;" width="358" x="7" y="7"/><ellipse cx="96.75" cy="25.9688 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.svg
index dbba1cd010..521358a067 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/LiDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:456px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 456 162" width="456px" zoomAndPan="magnify"><defs><filter height="300%" id="fbw9k3l1y20gb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html" target="_top" title="LiDecorator.html" xlink:actuate="onRequest" xlink:href="LiDecorator.html" xlink:show="new" xlink:title="LiDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fbw9k3l1y20gb)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="7" y="7"/><ellipse cx="135.25" cy="25.9688" fill="#A9DCDF" r [...]
+class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html" target="_top" title="LiDecorator.html" xlink:actuate="onRequest" xlink:href="LiDecorator.html" xlink:show="new" xlink:title="LiDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fbw9k3l1y20gb)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="7" y="7"/><ellipse cx="135.25" cy="25.9688" fill="#A9DCDF" r [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/MarkupHelper.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/MarkupHelper.svg
index 864ad279be..b1797f338b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/MarkupHelper.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/MarkupHelper.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="180px" preserveAspectRatio="none" style="width:406px;height:180px;background:#FFFFFF;" version="1.1" viewBox="0 0 406 180" width="406px" zoomAndPan="magnify"><defs><filter height="300%" id="fd2urc0fm7z52" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.MarkupHelper--><a href="MarkupHelper.html" target="_top" title="MarkupHelper.html" xlink:actuate="onRequest" xlink:href="MarkupHelper.html" xlink:show="new" xlink:title="MarkupHelper.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fd2urc0fm7z52)" height="148.375" id="org.apache.wiki.htmltowiki.syntax.MarkupHelper" style="stroke:#A80036;stroke-width:1.5;" width="385" x="7" y="7"/><ellipse cx="114.25" cy="25.9688" fill="#ADD1 [...]
+class org.apache.wiki.htmltowiki.syntax.MarkupHelper--><a href="MarkupHelper.html" target="_top" title="MarkupHelper.html" xlink:actuate="onRequest" xlink:href="MarkupHelper.html" xlink:show="new" xlink:title="MarkupHelper.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fd2urc0fm7z52)" height="148.375" id="org.apache.wiki.htmltowiki.syntax.MarkupHelper" style="stroke:#A80036;stroke-width:1.5;" width="385" x="7" y="7"/><ellipse cx="114.25" cy="25.9688" fill="#ADD1 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.svg
index c6c1df75ba..cffcd42be2 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OlDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:459px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 459 162" width="459px" zoomAndPan="magnify"><defs><filter height="300%" id="fyhozh5m019du" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html" target="_top" title="OlDecorator.html" xlink:actuate="onRequest" xlink:href="OlDecorator.html" xlink:show="new" xlink:title="OlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fyhozh5m019du)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="438" x="7" y="7"/><ellipse cx="136.75" cy="25.9688" fill="#A9DCDF" r [...]
+class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html" target="_top" title="OlDecorator.html" xlink:actuate="onRequest" xlink:href="OlDecorator.html" xlink:show="new" xlink:title="OlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fyhozh5m019du)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="438" x="7" y="7"/><ellipse cx="136.75" cy="25.9688" fill="#A9DCDF" r [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OptionDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OptionDecorator.svg
index f4c7c71853..8bac0b9ab3 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OptionDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/OptionDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="136px" preserveAspectRatio="none" style="width:388px;height:136px;background:#FFFFFF;" version="1.1" viewBox="0 0 388 136" width="388px" zoomAndPan="magnify"><defs><filter height="300%" id="fvtxjb5sep9bm" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.OptionDecorator--><a href="OptionDecorator.html" target="_top" title="OptionDecorator.html" xlink:actuate="onRequest" xlink:href="OptionDecorator.html" xlink:show="new" xlink:title="OptionDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fvtxjb5sep9bm)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.5;" width="367" x="7" y="7"/><ellipse cx="105.25" cy="2 [...]
+class org.apache.wiki.htmltowiki.syntax.OptionDecorator--><a href="OptionDecorator.html" target="_top" title="OptionDecorator.html" xlink:actuate="onRequest" xlink:href="OptionDecorator.html" xlink:show="new" xlink:title="OptionDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fvtxjb5sep9bm)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.5;" width="367" x="7" y="7"/><ellipse cx="105.25" cy="2 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PDecorator.svg
index ceec970119..d673adedcb 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:358px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 358 162" width="358px" zoomAndPan="magnify"><defs><filter height="300%" id="f1wntnh9xl8bk8" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.PDecorator--><a href="PDecorator.html" target="_top" title="PDecorator.html" xlink:actuate="onRequest" xlink:href="PDecorator.html" xlink:show="new" xlink:title="PDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1wntnh9xl8bk8)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.5;" width="337" x="7" y="7"/><ellipse cx="86.25" cy="25.9688" fill="#A9DCDF" rx="11" [...]
+class org.apache.wiki.htmltowiki.syntax.PDecorator--><a href="PDecorator.html" target="_top" title="PDecorator.html" xlink:actuate="onRequest" xlink:href="PDecorator.html" xlink:show="new" xlink:title="PDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1wntnh9xl8bk8)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.5;" width="337" x="7" y="7"/><ellipse cx="86.25" cy="25.9688" fill="#A9DCDF" rx="11" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.svg
index 77e846fe1d..09a1c93f2b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextBoldDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:568px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 568 188" width="568px" zoomAndPan="magnify"><defs><filter height="300%" id="f1aohs6ck3my7c" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainTextBoldDecorator.html" target="_top" title="PlainTextBoldDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextBoldDecorator.html" xlink:show="new" xlink:title="PlainTextBoldDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1aohs6ck3my7c)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.5;" width="54 [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainTextBoldDecorator.html" target="_top" title="PlainTextBoldDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextBoldDecorator.html" xlink:show="new" xlink:title="PlainTextBoldDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1aohs6ck3my7c)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.5;" width="54 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.svg
index b793f7cde2..b228cec793 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:564px;height:200px;background:#FFFFFF;" version="1.1" viewBox="0 0 564 200" width="564px" zoomAndPan="magnify"><defs><filter height="300%" id="fy3gly1aoq5ov" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTextCssDecorator.html" target="_top" title="PlainTextCssDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssDecorator.html" xlink:show="new" xlink:title="PlainTextCssDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fy3gly1aoq5ov)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.5;" width="543" x=" [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTextCssDecorator.html" target="_top" title="PlainTextCssDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssDecorator.html" xlink:show="new" xlink:title="PlainTextCssDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fy3gly1aoq5ov)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.5;" width="543" x=" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.svg
index 79ccfa7b84..22b3074415 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextCssSpecialDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:465px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 465 188" width="465px" zoomAndPan="magnify"><defs><filter height="300%" id="fne4dtctxwsp5" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="PlainTextCssSpecialDecorator.html" target="_top" title="PlainTextCssSpecialDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssSpecialDecorator.html" xlink:show="new" xlink:title="PlainTextCssSpecialDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fne4dtctxwsp5)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:# [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="PlainTextCssSpecialDecorator.html" target="_top" title="PlainTextCssSpecialDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssSpecialDecorator.html" xlink:show="new" xlink:title="PlainTextCssSpecialDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fne4dtctxwsp5)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:# [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.svg
index dde47a80ac..a4e40d688e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:539px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 539 149" width="539px" zoomAndPan="magnify"><defs><filter height="300%" id="ft9dq51p8rq0i" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextDecorator.html" target="_top" title="PlainTextDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextDecorator.html" xlink:show="new" xlink:title="PlainTextDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ft9dq51p8rq0i)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.5;" width="518" x="7" y="7"/><ellipse [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextDecorator.html" target="_top" title="PlainTextDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextDecorator.html" xlink:show="new" xlink:title="PlainTextDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#ft9dq51p8rq0i)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.5;" width="518" x="7" y="7"/><ellipse [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.svg
index 6927b3b641..57b4800e2d 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextItalicDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:607px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 607 188" width="607px" zoomAndPan="magnify"><defs><filter height="300%" id="faeuoftx73qjk" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="PlainTextItalicDecorator.html" target="_top" title="PlainTextItalicDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextItalicDecorator.html" xlink:show="new" xlink:title="PlainTextItalicDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#faeuoftx73qjk)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.5; [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="PlainTextItalicDecorator.html" target="_top" title="PlainTextItalicDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextItalicDecorator.html" xlink:show="new" xlink:title="PlainTextItalicDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#faeuoftx73qjk)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.5; [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.svg
index 3aefd00d43..30166fb66e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/PlainTextMonospaceDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:740px;height:200px;background:#FFFFFF;" version="1.1" viewBox="0 0 740 200" width="740px" zoomAndPan="magnify"><defs><filter height="300%" id="f1b33m7sri9esy" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="PlainTextMonospaceDecorator.html" target="_top" title="PlainTextMonospaceDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextMonospaceDecorator.html" xlink:show="new" xlink:title="PlainTextMonospaceDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1b33m7sri9esy)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A800 [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="PlainTextMonospaceDecorator.html" target="_top" title="PlainTextMonospaceDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextMonospaceDecorator.html" xlink:show="new" xlink:title="PlainTextMonospaceDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1b33m7sri9esy)" height="169.1797" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A800 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -26,5 +26,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SelectDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SelectDecorator.svg
index e95a9472a6..68532e7592 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SelectDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SelectDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:386px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 386 188" width="386px" zoomAndPan="magnify"><defs><filter height="300%" id="f1t6ywcncf7fkz" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.SelectDecorator--><a href="SelectDecorator.html" target="_top" title="SelectDecorator.html" xlink:actuate="onRequest" xlink:href="SelectDecorator.html" xlink:show="new" xlink:title="SelectDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1t6ywcncf7fkz)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="7" y="7"/><ellipse cx="100.25" cy="2 [...]
+class org.apache.wiki.htmltowiki.syntax.SelectDecorator--><a href="SelectDecorator.html" target="_top" title="SelectDecorator.html" xlink:actuate="onRequest" xlink:href="SelectDecorator.html" xlink:show="new" xlink:title="SelectDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1t6ywcncf7fkz)" height="156.375" id="org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="7" y="7"/><ellipse cx="100.25" cy="2 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.svg
index 2948e11fb0..b52bbe7678 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/StrikeDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:384px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 384 162" width="384px" zoomAndPan="magnify"><defs><filter height="300%" id="f6ln3lr4h31jy" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><a href="StrikeDecorator.html" target="_top" title="StrikeDecorator.html" xlink:actuate="onRequest" xlink:href="StrikeDecorator.html" xlink:show="new" xlink:title="StrikeDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f6ln3lr4h31jy)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.StrikeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="363" x="7" y="7"/><ellipse cx="99.25" cy="25 [...]
+class org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><a href="StrikeDecorator.html" target="_top" title="StrikeDecorator.html" xlink:actuate="onRequest" xlink:href="StrikeDecorator.html" xlink:show="new" xlink:title="StrikeDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f6ln3lr4h31jy)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.StrikeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="363" x="7" y="7"/><ellipse cx="99.25" cy="25 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SubDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SubDecorator.svg
index d9ffe7f111..81e79ded67 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SubDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SubDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:373px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 373 162" width="373px" zoomAndPan="magnify"><defs><filter height="300%" id="f4971ei1dy2q0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.SubDecorator--><a href="SubDecorator.html" target="_top" title="SubDecorator.html" xlink:actuate="onRequest" xlink:href="SubDecorator.html" xlink:show="new" xlink:title="SubDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f4971ei1dy2q0)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="7" y="7"/><ellipse cx="93.75" cy="25.9688" fill="#A9DC [...]
+class org.apache.wiki.htmltowiki.syntax.SubDecorator--><a href="SubDecorator.html" target="_top" title="SubDecorator.html" xlink:actuate="onRequest" xlink:href="SubDecorator.html" xlink:show="new" xlink:title="SubDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f4971ei1dy2q0)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="7" y="7"/><ellipse cx="93.75" cy="25.9688" fill="#A9DC [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SupDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SupDecorator.svg
index 326893f878..c6ba06166b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SupDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/SupDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:373px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 373 162" width="373px" zoomAndPan="magnify"><defs><filter height="300%" id="fyvrvnndnlpmw" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.SupDecorator--><a href="SupDecorator.html" target="_top" title="SupDecorator.html" xlink:actuate="onRequest" xlink:href="SupDecorator.html" xlink:show="new" xlink:title="SupDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fyvrvnndnlpmw)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="7" y="7"/><ellipse cx="93.75" cy="25.9688" fill="#A9DC [...]
+class org.apache.wiki.htmltowiki.syntax.SupDecorator--><a href="SupDecorator.html" target="_top" title="SupDecorator.html" xlink:actuate="onRequest" xlink:href="SupDecorator.html" xlink:show="new" xlink:title="SupDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fyvrvnndnlpmw)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="7" y="7"/><ellipse cx="93.75" cy="25.9688" fill="#A9DC [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TableDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TableDecorator.svg
index 85de689a47..84da37825a 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TableDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TableDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="149px" preserveAspectRatio="none" style="width:513px;height:149px;background:#FFFFFF;" version="1.1" viewBox="0 0 513 149" width="513px" zoomAndPan="magnify"><defs><filter height="300%" id="fnmu73wpc4jk" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation [...]
-class org.apache.wiki.htmltowiki.syntax.TableDecorator--><a href="TableDecorator.html" target="_top" title="TableDecorator.html" xlink:actuate="onRequest" xlink:href="TableDecorator.html" xlink:show="new" xlink:title="TableDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fnmu73wpc4jk)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.5;" width="492" x="7" y="7"/><ellipse cx="167.75" cy="25.9688" [...]
+class org.apache.wiki.htmltowiki.syntax.TableDecorator--><a href="TableDecorator.html" target="_top" title="TableDecorator.html" xlink:actuate="onRequest" xlink:href="TableDecorator.html" xlink:show="new" xlink:title="TableDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fnmu73wpc4jk)" height="117.9609" id="org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.5;" width="492" x="7" y="7"/><ellipse cx="167.75" cy="25.9688" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -22,5 +22,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.svg
index 5f48abb03e..afcf106f92 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TbodyDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="136px" preserveAspectRatio="none" style="width:385px;height:136px;background:#FFFFFF;" version="1.1" viewBox="0 0 385 136" width="385px" zoomAndPan="magnify"><defs><filter height="300%" id="fxmpe5jsnp4u0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><a href="TbodyDecorator.html" target="_top" title="TbodyDecorator.html" xlink:actuate="onRequest" xlink:href="TbodyDecorator.html" xlink:show="new" xlink:title="TbodyDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fxmpe5jsnp4u0)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.5;" width="364" x="7" y="7"/><ellipse cx="103.75" cy="25.9688 [...]
+class org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><a href="TbodyDecorator.html" target="_top" title="TbodyDecorator.html" xlink:actuate="onRequest" xlink:href="TbodyDecorator.html" xlink:show="new" xlink:title="TbodyDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fxmpe5jsnp4u0)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.5;" width="364" x="7" y="7"/><ellipse cx="103.75" cy="25.9688 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.svg
index 7668b0e21a..314f5feec0 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TdDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:461px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 461 162" width="461px" zoomAndPan="magnify"><defs><filter height="300%" id="f1upk7isn50gmf" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html" target="_top" title="TdDecorator.html" xlink:actuate="onRequest" xlink:href="TdDecorator.html" xlink:show="new" xlink:title="TdDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1upk7isn50gmf)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="7" y="7"/><ellipse cx="137.75" cy="25.9688" fill="#A9DCDF"  [...]
+class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html" target="_top" title="TdDecorator.html" xlink:actuate="onRequest" xlink:href="TdDecorator.html" xlink:show="new" xlink:title="TdDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1upk7isn50gmf)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="7" y="7"/><ellipse cx="137.75" cy="25.9688" fill="#A9DCDF"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.svg
index b947ea5961..ecad6b365a 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextAreaDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:401px;height:175px;background:#FFFFFF;" version="1.1" viewBox="0 0 401 175" width="401px" zoomAndPan="magnify"><defs><filter height="300%" id="f5wj0ipgp7ju9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><a href="TextAreaDecorator.html" target="_top" title="TextAreaDecorator.html" xlink:actuate="onRequest" xlink:href="TextAreaDecorator.html" xlink:show="new" xlink:title="TextAreaDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f5wj0ipgp7ju9)" height="143.5703" id="org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.5;" width="380" x="7" y="7"/><ellipse cx="1 [...]
+class org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><a href="TextAreaDecorator.html" target="_top" title="TextAreaDecorator.html" xlink:actuate="onRequest" xlink:href="TextAreaDecorator.html" xlink:show="new" xlink:title="TextAreaDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f5wj0ipgp7ju9)" height="143.5703" id="org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.5;" width="380" x="7" y="7"/><ellipse cx="1 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.svg
index d503a32712..9872ce05e1 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TextElementDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="136px" preserveAspectRatio="none" style="width:336px;height:136px;background:#FFFFFF;" version="1.1" viewBox="0 0 336 136" width="336px" zoomAndPan="magnify"><defs><filter height="300%" id="f1s1agkw8mq4ez" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElementDecorator.html" target="_top" title="TextElementDecorator.html" xlink:actuate="onRequest" xlink:href="TextElementDecorator.html" xlink:show="new" xlink:title="TextElementDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1s1agkw8mq4ez)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.5;" width="315" x="7" y= [...]
+class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElementDecorator.html" target="_top" title="TextElementDecorator.html" xlink:actuate="onRequest" xlink:href="TextElementDecorator.html" xlink:show="new" xlink:title="TextElementDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1s1agkw8mq4ez)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.5;" width="315" x="7" y= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.svg
index d10e7a8cf6..28d0127314 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/ThDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:461px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 461 162" width="461px" zoomAndPan="magnify"><defs><filter height="300%" id="f14aemhwtwzykt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html" target="_top" title="ThDecorator.html" xlink:actuate="onRequest" xlink:href="ThDecorator.html" xlink:show="new" xlink:title="ThDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f14aemhwtwzykt)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="7" y="7"/><ellipse cx="137.75" cy="25.9688" fill="#A9DCDF"  [...]
+class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html" target="_top" title="ThDecorator.html" xlink:actuate="onRequest" xlink:href="ThDecorator.html" xlink:show="new" xlink:title="ThDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f14aemhwtwzykt)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="7" y="7"/><ellipse cx="137.75" cy="25.9688" fill="#A9DCDF"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TheadDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TheadDecorator.svg
index f14d3a4359..50a2b318a6 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TheadDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TheadDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="136px" preserveAspectRatio="none" style="width:386px;height:136px;background:#FFFFFF;" version="1.1" viewBox="0 0 386 136" width="386px" zoomAndPan="magnify"><defs><filter height="300%" id="fh36o6cksbzy0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.htmltowiki.syntax.TheadDecorator--><a href="TheadDecorator.html" target="_top" title="TheadDecorator.html" xlink:actuate="onRequest" xlink:href="TheadDecorator.html" xlink:show="new" xlink:title="TheadDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fh36o6cksbzy0)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="7" y="7"/><ellipse cx="104.25" cy="25.9688 [...]
+class org.apache.wiki.htmltowiki.syntax.TheadDecorator--><a href="TheadDecorator.html" target="_top" title="TheadDecorator.html" xlink:actuate="onRequest" xlink:href="TheadDecorator.html" xlink:show="new" xlink:title="TheadDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fh36o6cksbzy0)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="7" y="7"/><ellipse cx="104.25" cy="25.9688 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TrDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TrDecorator.svg
index ff35eca874..d8789ae2d9 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TrDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/TrDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="136px" preserveAspectRatio="none" style="width:363px;height:136px;background:#FFFFFF;" version="1.1" viewBox="0 0 363 136" width="363px" zoomAndPan="magnify"><defs><filter height="300%" id="f1xfl0235rt8km" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.TrDecorator--><a href="TrDecorator.html" target="_top" title="TrDecorator.html" xlink:actuate="onRequest" xlink:href="TrDecorator.html" xlink:show="new" xlink:title="TrDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1xfl0235rt8km)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="7" y="7"/><ellipse cx="92.75" cy="25.9688" fill="#ADD1B2" r [...]
+class org.apache.wiki.htmltowiki.syntax.TrDecorator--><a href="TrDecorator.html" target="_top" title="TrDecorator.html" xlink:actuate="onRequest" xlink:href="TrDecorator.html" xlink:show="new" xlink:title="TrDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1xfl0235rt8km)" height="105.1563" id="org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="7" y="7"/><ellipse cx="92.75" cy="25.9688" fill="#ADD1B2" r [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -21,5 +21,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.svg
index 6769095059..21cc122383 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UlDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:458px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 458 162" width="458px" zoomAndPan="magnify"><defs><filter height="300%" id="f17zq9wig64tsk" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html" target="_top" title="UlDecorator.html" xlink:actuate="onRequest" xlink:href="UlDecorator.html" xlink:show="new" xlink:title="UlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f17zq9wig64tsk)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="437" x="7" y="7"/><ellipse cx="136.25" cy="25.9688" fill="#A9DCDF"  [...]
+class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html" target="_top" title="UlDecorator.html" xlink:actuate="onRequest" xlink:href="UlDecorator.html" xlink:show="new" xlink:title="UlDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f17zq9wig64tsk)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="437" x="7" y="7"/><ellipse cx="136.25" cy="25.9688" fill="#A9DCDF"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.svg
index 8e93fa7ab8..3ba702cc39 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/UnderlineDecorator.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:405px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 405 162" width="405px" zoomAndPan="magnify"><defs><filter height="300%" id="f1bnpn6ghunbaw" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><a href="UnderlineDecorator.html" target="_top" title="UnderlineDecorator.html" xlink:actuate="onRequest" xlink:href="UnderlineDecorator.html" xlink:show="new" xlink:title="UnderlineDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1bnpn6ghunbaw)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.5;" width="384" x="7" y="7"/><ellips [...]
+class org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><a href="UnderlineDecorator.html" target="_top" title="UnderlineDecorator.html" xlink:actuate="onRequest" xlink:href="UnderlineDecorator.html" xlink:show="new" xlink:title="UnderlineDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1bnpn6ghunbaw)" height="130.7656" id="org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.5;" width="384" x="7" y="7"/><ellips [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg
index cf19330bf4..03bc7599c7 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/WikiSyntaxDecorator.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1734px" preserveAspectRatio="none" style="width:787px;height:1734px;background:#FFFFFF;" version="1.1" viewBox="0 0 787 1734" width="787px" zoomAndPan="magnify"><defs><filter height="300%" id="f1ttovietqhh92" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDevi [...]
 class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="WikiSyntaxDecorator.html" target="_top" title="WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="WikiSyntaxDecorator.html" xlink:show="new" xlink:title="WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1ttovietqhh92)" height="1078.3125" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="261" x="259.5" y=" [...]
 class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="../SyntaxDecorator.html" target="_top" title="../SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../SyntaxDecorator.html" xlink:show="new" xlink:title="../SyntaxDecorator.html" xlink:type="simple"><rect codeLine="88" fill="#FEFECE" filter="url(#f1ttovietqhh92)" height="558.125" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="7" y="7"/><ellipse cx="318.75" cy="25 [...]
-reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><path codeLine="131" d="M390,585.39 C390,598.42 390,611.64 390,624.99 " fill="none" id="org.apache.wiki.htmltowiki.SyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="383,585.07,390,565.07,397,585.07,383,585.07" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
+reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><path codeLine="131" d="M390,585.39 C390,598.42 390,611.64 390,624.99 " fill="none" id="org.apache.wiki.htmltowiki.SyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="383,585.07,390,565.07,397,585.07,383,585.07" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -144,5 +144,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.svg
index 0c0d171049..c1b35a7566 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/JSPWikiSyntaxDecorator.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:778px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 778 194" width="778px" zoomAndPan="magnify"><defs><filter height="300%" id="flbes5t4fzr16" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><a href="JSPWikiSyntaxDecorator.html" target="_top" title="JSPWikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="JSPWikiSyntaxDecorator.html" xlink:show="new" xlink:title="JSPWikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#flbes5t4fzr16)" height="58.7422" id="org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width: [...]
 class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#flbes5t4fzr16)" height="37.9375" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="202" x="2 [...]
-reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><path codeLine="11" d="M385.5,65.22 C385.5,78.3 385.5,92.7 385.5,104.89 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="378.5,65.07,385.5,45.07,392.5,65.07,378.5,65.07" style="stroke:#A80 [...]
+reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><path codeLine="11" d="M385.5,65.22 C385.5,78.3 385.5,92.7 385.5,104.89 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="378.5,65.07,385.5,45.07,392.5,65.07,378.5,65.07" style="stroke:#A80 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/package.svg
index 5d67acc7f9..94b86523f7 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/jspwiki/package.svg
@@ -3,7 +3,7 @@ cluster org.apache.wiki.htmltowiki.syntax.jspwiki--><polygon fill="#FFFFFF" filt
 cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f6xa5xavbjusv)" points="268,6,542,6,549,28.2969,552,28.2969,552,630,268,630,268,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="268" x2="549" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="272" y="20.9951">org.apache.wiki.htmltowiki.syntax</text><!--MD5=[38d54 [...]
 class org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><a href="JSPWikiSyntaxDecorator.html" target="_top" title="JSPWikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="JSPWikiSyntaxDecorator.html" xlink:show="new" xlink:title="JSPWikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f6xa5xavbjusv)" height="60.8047" id="org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width: [...]
 class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f6xa5xavbjusv)" height="572.9922" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="252" x= [...]
-reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><path codeLine="7" d="M410,634.46 C410,655.73 410,674.35 410,688.63 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="403,634.24,410,614.24,417,634.24,403,634.24" style="stroke:#A80036;stro [...]
+reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator--><path codeLine="7" d="M410,634.46 C410,655.73 410,674.35 410,688.63 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.jspwiki.JSPWikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="403,634.24,410,614.24,417,634.24,403,634.24" style="stroke:#A80036;stro [...]
 @startuml
     namespace org.apache.wiki.htmltowiki.syntax.jspwiki {
 
@@ -69,5 +69,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.svg
index df8d55a26f..bd4eae69c1 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/MarkdownSyntaxDecorator.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:778px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 778 194" width="778px" zoomAndPan="magnify"><defs><filter height="300%" id="fs9hbne5pq6wc" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><a href="MarkdownSyntaxDecorator.html" target="_top" title="MarkdownSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="MarkdownSyntaxDecorator.html" xlink:show="new" xlink:title="MarkdownSyntaxDecorator.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fs9hbne5pq6wc)" height="58.7422" id="org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;strok [...]
 class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#fs9hbne5pq6wc)" height="37.9375" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="202" x="2 [...]
-reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><path codeLine="11" d="M385.5,65.22 C385.5,78.3 385.5,92.7 385.5,104.89 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="378.5,65.07,385.5,45.07,392.5,65.07,378.5,65.07" style="stroke: [...]
+reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><path codeLine="11" d="M385.5,65.22 C385.5,78.3 385.5,92.7 385.5,104.89 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="378.5,65.07,385.5,45.07,392.5,65.07,378.5,65.07" style="stroke: [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/package.svg
index 0e89816586..1fa7f022f4 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/markdown/package.svg
@@ -3,7 +3,7 @@ cluster org.apache.wiki.htmltowiki.syntax.markdown--><polygon fill="#FFFFFF" fil
 cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f18bm034xn1mdj)" points="268,6,542,6,549,28.2969,552,28.2969,552,630,268,630,268,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="268" x2="549" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="272" y="20.9951">org.apache.wiki.htmltowiki.syntax</text><!--MD5=[c899 [...]
 class org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><a href="MarkdownSyntaxDecorator.html" target="_top" title="MarkdownSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="MarkdownSyntaxDecorator.html" xlink:show="new" xlink:title="MarkdownSyntaxDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f18bm034xn1mdj)" height="60.8047" id="org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stro [...]
 class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="../WikiSyntaxDecorator.html" target="_top" title="../WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../WikiSyntaxDecorator.html" xlink:show="new" xlink:title="../WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f18bm034xn1mdj)" height="572.9922" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="252" x [...]
-reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><path codeLine="7" d="M410,634.46 C410,655.73 410,674.35 410,688.63 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="403,634.24,410,614.24,417,634.24,403,634.24" style="stroke:#A80036; [...]
+reverse link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator--><path codeLine="7" d="M410,634.46 C410,655.73 410,674.35 410,688.63 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.markdown.MarkdownSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="403,634.24,410,614.24,417,634.24,403,634.24" style="stroke:#A80036; [...]
 @startuml
     namespace org.apache.wiki.htmltowiki.syntax.markdown {
 
@@ -69,5 +69,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/package.svg
index df4c024536..f312dd40dc 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/htmltowiki/syntax/package.svg
@@ -1,119 +1,126 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="2687px" preserveAspectRatio="none" style="width:14109px;height:2687px;background:#FFFFFF;" version="1.1" viewBox="0 0 14109 2687" width="14109px" zoomAndPan="magnify"><defs><filter height="300%" id="f1eh9wbfqlhzeb" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" s [...]
-cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f1eh9wbfqlhzeb)" points="16,650,290,650,297,672.2969,14092,672.2969,14092,2664,16,2664,16,650" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="297" y1="672.2969" y2="672.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="20" y="664.9951">org.apache.wiki.htmltowiki.syntax</text>< [...]
-cluster org.apache.wiki.htmltowiki--><polygon fill="#FFFFFF" filter="url(#f1eh9wbfqlhzeb)" points="6878,6,7095,6,7102,28.2969,7676,28.2969,7676,617,6878,617,6878,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="6878" x2="7102" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="211" x="6882" y="20.9951">org.apache.wiki.htmltowiki</text><!--MD5=[e46a4371 [...]
-class org.apache.wiki.htmltowiki.syntax.MarkupHelper--><a href="MarkupHelper.html" target="_top" title="MarkupHelper.html" xlink:actuate="onRequest" xlink:href="MarkupHelper.html" xlink:show="new" xlink:title="MarkupHelper.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.MarkupHelper" style="stroke:#A80036;stroke-width:1.5;" width="385" x="10640.5" y="903"/><ellipse cx="10785.25" cy="919" fil [...]
-class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html" target="_top" title="BrDecorator.html" xlink:actuate="onRequest" xlink:href="BrDecorator.html" xlink:show="new" xlink:title="BrDecorator.html" xlink:type="simple"><rect codeLine="14" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="439" x="32.5" y="1380"/><ellipse cx="209.75" cy="1396" fill="#A9DC [...]
-class org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><a href="TbodyDecorator.html" target="_top" title="TbodyDecorator.html" xlink:actuate="onRequest" xlink:href="TbodyDecorator.html" xlink:show="new" xlink:title="TbodyDecorator.html" xlink:type="simple"><rect codeLine="23" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.5;" width="364" x="507" y="1393"/><ellipse cx="634.75" cy="1 [...]
-class org.apache.wiki.htmltowiki.syntax.FormDecorator--><a href="FormDecorator.html" target="_top" title="FormDecorator.html" xlink:actuate="onRequest" xlink:href="FormDecorator.html" xlink:show="new" xlink:title="FormDecorator.html" xlink:type="simple"><rect codeLine="30" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.5;" width="359" x="906.5" y="1380"/><ellipse cx="1034.75" cy="139 [...]
-class org.apache.wiki.htmltowiki.syntax.PDecorator--><a href="PDecorator.html" target="_top" title="PDecorator.html" xlink:actuate="onRequest" xlink:href="PDecorator.html" xlink:show="new" xlink:title="PDecorator.html" xlink:type="simple"><rect codeLine="39" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.5;" width="337" x="1300.5" y="1380"/><ellipse cx="1429.75" cy="1396" fill="#A9DCDF" [...]
-class org.apache.wiki.htmltowiki.syntax.SupDecorator--><a href="SupDecorator.html" target="_top" title="SupDecorator.html" xlink:actuate="onRequest" xlink:href="SupDecorator.html" xlink:show="new" xlink:title="SupDecorator.html" xlink:type="simple"><rect codeLine="48" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="1673" y="1380"/><ellipse cx="1801.25" cy="1396" fill [...]
-class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElementDecorator.html" target="_top" title="TextElementDecorator.html" xlink:actuate="onRequest" xlink:href="TextElementDecorator.html" xlink:show="new" xlink:title="TextElementDecorator.html" xlink:type="simple"><rect codeLine="57" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.5;" width="315" x="2060. [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="PlainTextItalicDecorator.html" target="_top" title="PlainTextItalicDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextItalicDecorator.html" xlink:show="new" xlink:title="PlainTextItalicDecorator.html" xlink:type="simple"><rect codeLine="64" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1 [...]
-class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="WikiSyntaxDecorator.html" target="_top" title="WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="WikiSyntaxDecorator.html" xlink:show="new" xlink:title="WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="74" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="585.7969" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="261" x="7146.5" y= [...]
-class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html" target="_top" title="UlDecorator.html" xlink:actuate="onRequest" xlink:href="UlDecorator.html" xlink:show="new" xlink:title="UlDecorator.html" xlink:type="simple"><rect codeLine="119" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="437" x="2447.5" y="1380"/><ellipse cx="2624.25" cy="1396" fill="# [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="PlainTextMonospaceDecorator.html" target="_top" title="PlainTextMonospaceDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextMonospaceDecorator.html" xlink:show="new" xlink:title="PlainTextMonospaceDecorator.html" xlink:type="simple"><rect codeLine="128" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A8 [...]
-class org.apache.wiki.htmltowiki.syntax.SelectDecorator--><a href="SelectDecorator.html" target="_top" title="SelectDecorator.html" xlink:actuate="onRequest" xlink:href="SelectDecorator.html" xlink:show="new" xlink:title="SelectDecorator.html" xlink:type="simple"><rect codeLine="139" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="3012.5" y="1367.5"/><ellipse cx=" [...]
-class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.html" target="_top" title="CodeDecorator.html" xlink:actuate="onRequest" xlink:href="CodeDecorator.html" xlink:show="new" xlink:title="CodeDecorator.html" xlink:type="simple"><rect codeLine="150" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="455" x="3412.5" y="1373.5"/><ellipse cx="3588.25" cy= [...]
-class org.apache.wiki.htmltowiki.syntax.ImageDecorator--><a href="ImageDecorator.html" target="_top" title="ImageDecorator.html" xlink:actuate="onRequest" xlink:href="ImageDecorator.html" xlink:show="new" xlink:title="ImageDecorator.html" xlink:type="simple"><rect codeLine="160" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.5;" width="383" x="3902.5" y="1367.5"/><ellipse cx="4038.7 [...]
-class org.apache.wiki.htmltowiki.syntax.H4Decorator--><a href="H4Decorator.html" target="_top" title="H4Decorator.html" xlink:actuate="onRequest" xlink:href="H4Decorator.html" xlink:show="new" xlink:title="H4Decorator.html" xlink:type="simple"><rect codeLine="171" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H4Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="4320.5" y="1386.5"/><ellipse cx="4448.75" cy="1402.5" fil [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainTextBoldDecorator.html" target="_top" title="PlainTextBoldDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextBoldDecorator.html" xlink:show="new" xlink:title="PlainTextBoldDecorator.html" xlink:type="simple"><rect codeLine="179" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.5;" width= [...]
-class org.apache.wiki.htmltowiki.syntax.TableDecorator--><a href="TableDecorator.html" target="_top" title="TableDecorator.html" xlink:actuate="onRequest" xlink:href="TableDecorator.html" xlink:show="new" xlink:title="TableDecorator.html" xlink:type="simple"><rect codeLine="189" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.5;" width="492" x="5254" y="1386.5"/><ellipse cx="5447.25" [...]
-class org.apache.wiki.htmltowiki.syntax.InputDecorator--><a href="InputDecorator.html" target="_top" title="InputDecorator.html" xlink:actuate="onRequest" xlink:href="InputDecorator.html" xlink:show="new" xlink:title="InputDecorator.html" xlink:type="simple"><rect codeLine="197" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.5;" width="358" x="5781" y="1373.5"/><ellipse cx="5907.75" [...]
-class org.apache.wiki.htmltowiki.syntax.DdDecorator--><a href="DdDecorator.html" target="_top" title="DdDecorator.html" xlink:actuate="onRequest" xlink:href="DdDecorator.html" xlink:show="new" xlink:title="DdDecorator.html" xlink:type="simple"><rect codeLine="207" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="6174.5" y="1386.5"/><ellipse cx="6302.75" cy="1402.5" fil [...]
-class org.apache.wiki.htmltowiki.syntax.OptionDecorator--><a href="OptionDecorator.html" target="_top" title="OptionDecorator.html" xlink:actuate="onRequest" xlink:href="OptionDecorator.html" xlink:show="new" xlink:title="OptionDecorator.html" xlink:type="simple"><rect codeLine="215" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.5;" width="367" x="6554.5" y="1393"/><ellipse cx="668 [...]
-class org.apache.wiki.htmltowiki.syntax.HrDecorator--><a href="HrDecorator.html" target="_top" title="HrDecorator.html" xlink:actuate="onRequest" xlink:href="HrDecorator.html" xlink:show="new" xlink:title="HrDecorator.html" xlink:type="simple"><rect codeLine="222" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="343" x="6956.5" y="1386.5"/><ellipse cx="7085.25" cy="1402.5" fil [...]
-class org.apache.wiki.htmltowiki.syntax.H3Decorator--><a href="H3Decorator.html" target="_top" title="H3Decorator.html" xlink:actuate="onRequest" xlink:href="H3Decorator.html" xlink:show="new" xlink:title="H3Decorator.html" xlink:type="simple"><rect codeLine="230" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7334.5" y="1386.5"/><ellipse cx="7462.75" cy="1402.5" fil [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="PlainTextCssSpecialDecorator.html" target="_top" title="PlainTextCssSpecialDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssSpecialDecorator.html" xlink:show="new" xlink:title="PlainTextCssSpecialDecorator.html" xlink:type="simple"><rect codeLine="238" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stro [...]
-class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html" target="_top" title="TdDecorator.html" xlink:actuate="onRequest" xlink:href="TdDecorator.html" xlink:show="new" xlink:title="TdDecorator.html" xlink:type="simple"><rect codeLine="249" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="7751" y="1380"/><ellipse cx="7927.75" cy="1396" fill="#A9 [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextDecorator.html" target="_top" title="PlainTextDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextDecorator.html" xlink:show="new" xlink:title="PlainTextDecorator.html" xlink:type="simple"><rect codeLine="258" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.5;" width="518" x="4701" y="1393"/> [...]
-class org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><a href="UnderlineDecorator.html" target="_top" title="UnderlineDecorator.html" xlink:actuate="onRequest" xlink:href="UnderlineDecorator.html" xlink:show="new" xlink:title="UnderlineDecorator.html" xlink:type="simple"><rect codeLine="265" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.5;" width="384" x="8263" y="1380"/ [...]
-class org.apache.wiki.htmltowiki.syntax.DtDecorator--><a href="DtDecorator.html" target="_top" title="DtDecorator.html" xlink:actuate="onRequest" xlink:href="DtDecorator.html" xlink:show="new" xlink:title="DtDecorator.html" xlink:type="simple"><rect codeLine="274" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="8682" y="1386.5"/><ellipse cx="8810.25" cy="1402.5" fill= [...]
-class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTextCssDecorator.html" target="_top" title="PlainTextCssDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssDecorator.html" xlink:show="new" xlink:title="PlainTextCssDecorator.html" xlink:type="simple"><rect codeLine="282" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.5;" width="543"  [...]
-class org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><a href="TextAreaDecorator.html" target="_top" title="TextAreaDecorator.html" xlink:actuate="onRequest" xlink:href="TextAreaDecorator.html" xlink:show="new" xlink:title="TextAreaDecorator.html" xlink:type="simple"><rect codeLine="293" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.5;" width="380" x="9096" y="1373.5"/><el [...]
-class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html" target="_top" title="ThDecorator.html" xlink:actuate="onRequest" xlink:href="ThDecorator.html" xlink:show="new" xlink:title="ThDecorator.html" xlink:type="simple"><rect codeLine="303" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="9511" y="1380"/><ellipse cx="9687.75" cy="1396" fill="#A9 [...]
-class org.apache.wiki.htmltowiki.syntax.TrDecorator--><a href="TrDecorator.html" target="_top" title="TrDecorator.html" xlink:actuate="onRequest" xlink:href="TrDecorator.html" xlink:show="new" xlink:title="TrDecorator.html" xlink:type="simple"><rect codeLine="312" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="9986" y="1393"/><ellipse cx="10115.25" cy="1409" fill="#AD [...]
-class org.apache.wiki.htmltowiki.syntax.TheadDecorator--><a href="TheadDecorator.html" target="_top" title="TheadDecorator.html" xlink:actuate="onRequest" xlink:href="TheadDecorator.html" xlink:show="new" xlink:title="TheadDecorator.html" xlink:type="simple"><rect codeLine="319" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="10363.5" y="1393"/><ellipse cx="10490.75 [...]
-class org.apache.wiki.htmltowiki.syntax.SubDecorator--><a href="SubDecorator.html" target="_top" title="SubDecorator.html" xlink:actuate="onRequest" xlink:href="SubDecorator.html" xlink:show="new" xlink:title="SubDecorator.html" xlink:type="simple"><rect codeLine="326" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="10763" y="1380"/><ellipse cx="10891.25" cy="1396" f [...]
-class org.apache.wiki.htmltowiki.syntax.H1Decorator--><a href="H1Decorator.html" target="_top" title="H1Decorator.html" xlink:actuate="onRequest" xlink:href="H1Decorator.html" xlink:show="new" xlink:title="H1Decorator.html" xlink:type="simple"><rect codeLine="335" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="11149.5" y="1386.5"/><ellipse cx="11277.75" cy="1402.5" f [...]
-class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html" target="_top" title="LiDecorator.html" xlink:actuate="onRequest" xlink:href="LiDecorator.html" xlink:show="new" xlink:title="LiDecorator.html" xlink:type="simple"><rect codeLine="343" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="11529.5" y="1380"/><ellipse cx="11706.25" cy="1396" fill= [...]
-class org.apache.wiki.htmltowiki.syntax.ADecorator--><a href="ADecorator.html" target="_top" title="ADecorator.html" xlink:actuate="onRequest" xlink:href="ADecorator.html" xlink:show="new" xlink:title="ADecorator.html" xlink:type="simple"><rect codeLine="352" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="188.8516" id="org.apache.wiki.htmltowiki.syntax.ADecorator" style="stroke:#A80036;stroke-width:1.5;" width="449" x="11999.5" y="1348"/><ellipse cx="12184.25" cy="1364" fill="#A9DC [...]
-class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html" target="_top" title="OlDecorator.html" xlink:actuate="onRequest" xlink:href="OlDecorator.html" xlink:show="new" xlink:title="OlDecorator.html" xlink:type="simple"><rect codeLine="366" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="438" x="12484" y="1380"/><ellipse cx="12661.75" cy="1396" fill="# [...]
-class org.apache.wiki.htmltowiki.syntax.H2Decorator--><a href="H2Decorator.html" target="_top" title="H2Decorator.html" xlink:actuate="onRequest" xlink:href="H2Decorator.html" xlink:show="new" xlink:title="H2Decorator.html" xlink:type="simple"><rect codeLine="375" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H2Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="12957.5" y="1386.5"/><ellipse cx="13085.75" cy="1402.5" f [...]
-class org.apache.wiki.htmltowiki.syntax.DlDecorator--><a href="DlDecorator.html" target="_top" title="DlDecorator.html" xlink:actuate="onRequest" xlink:href="DlDecorator.html" xlink:show="new" xlink:title="DlDecorator.html" xlink:type="simple"><rect codeLine="383" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="341" x="13337.5" y="1380"/><ellipse cx="13466.25" cy="1396" fill= [...]
-class org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><a href="StrikeDecorator.html" target="_top" title="StrikeDecorator.html" xlink:actuate="onRequest" xlink:href="StrikeDecorator.html" xlink:show="new" xlink:title="StrikeDecorator.html" xlink:type="simple"><rect codeLine="392" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.StrikeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="363" x="13713.5" y="1380"/><ellipse cx="1 [...]
-class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="../SyntaxDecorator.html" target="_top" title="../SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../SyntaxDecorator.html" xlink:show="new" xlink:title="../SyntaxDecorator.html" xlink:type="simple"><rect codeLine="448" fill="#FEFECE" filter="url(#f1eh9wbfqlhzeb)" height="560.1875" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="6894" y="41"/><ellipse cx="7219.75" [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><path codeLine="401" d="M7874.19,2194.09 C7929.59,2217.79 7992.07,2244.51 8048.89,2268.82 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8053.67,2270.86,8046.9625,2263.6482,8049.0713,2268.897 [...]
-reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><path codeLine="402" d="M7277,621.37 C7277,642.47 7277,663.73 7277,684.79 " fill="none" id="org.apache.wiki.htmltowiki.SyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="7270,621.2,7277,601.2,7284,621.2,7270,621.2" style="stroke:#A80036;stroke-width:1.0; [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ADecorator--><path codeLine="403" d="M7407.57,992.64 C7855.15,1038.92 9368.92,1191.47 10623,1271 C10959.03,1292.31 11043.87,1281.23 11380,1301 C11647.91,1316.76 11720.29,1288.57 11982,1348 C11986.1,1348.93 11990.23,1349.92 11994.37,1350.96 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ADecorator" style="stroke:#A80036;stroke-width: [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.BrDecorator--><path codeLine="404" d="M7146.3,983.87 C6488.66,1008.75 3475.97,1127.36 1014,1301 C780.76,1317.45 717.57,1294.26 490,1348 C458.32,1355.48 425.26,1366.35 394.21,1378.05 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="389.25,1379.93,399 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.CodeDecorator--><path codeLine="405" d="M7146.34,981.24 C6690.34,991.57 5129.62,1048.08 3885,1348 C3858.96,1354.28 3831.95,1362.61 3805.78,1371.71 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3800.91,1373.42,3810.7272,1374.209,3805.6271,1371.7 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DdDecorator--><path codeLine="406" d="M7146.19,1145.82 C7085.23,1211.18 7007.13,1279.59 6921,1318 C6764.65,1387.72 6702.09,1302.73 6537,1348 C6506.21,1356.44 6474.44,1369.92 6445.9,1384.04 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6441.35,138 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DlDecorator--><path codeLine="407" d="M7407.5,993.86 C7854.86,1044.08 9367.99,1207.77 10623,1271 C11600.07,1320.23 11847.12,1248.15 12824,1301 C13045.11,1312.96 13107.07,1287.23 13320,1348 C13345.57,1355.3 13371.84,1366.03 13396.33,1377.65 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DtDecorator--><path codeLine="408" d="M7407.94,1004.58 C7657.38,1055.32 8215.9,1178.61 8665,1348 C8692.24,1358.28 8720.79,1371.24 8747.17,1384.22 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8751.73,1386.47,8745.4303,1378.8995,8747.2465,1384.256 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.FormDecorator--><path codeLine="409" d="M7146.32,984.59 C6535.88,1011.12 3904.09,1130.23 1751,1301 C1542.61,1317.53 1484.38,1291.92 1283,1348 C1256.39,1355.41 1228.95,1366.19 1203.31,1377.82 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1198.54 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.HrDecorator--><path codeLine="410" d="M7182.85,1271.25 C7169.48,1312.73 7157.03,1351.39 7147.38,1381.35 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7145.73,1386.46,7152.2915,1379.1151,7147.2596,1381.6997,7144.675,1376.6678,7145.73,1386.46" styl [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H1Decorator--><path codeLine="411" d="M7407.71,990.17 C8061.15,1046.16 10949.52,1295.76 11133,1348 C11163.41,1356.66 11194.82,1370.12 11223.09,1384.16 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="11227.6,1386.41,11221.3487,1378.7994,11223.1307,1 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H2Decorator--><path codeLine="412" d="M7407.51,993.67 C7854.9,1043.26 9368.12,1205.21 10623,1271 C11374.53,1310.4 11564.25,1266.06 12316,1301 C12593.82,1313.91 12671.68,1274.82 12940,1348 C12970.81,1356.4 13002.58,1369.86 13031.12,1383.99 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H2Decorator" style="stroke:#A80036;stroke-width: [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H3Decorator--><path codeLine="413" d="M7407.62,1241.67 C7433.69,1294.09 7458.67,1344.32 7477.06,1381.3 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7479.5,1386.2,7479.0654,1376.3607,7477.2697,1381.725,7471.9054,1379.9293,7479.5,1386.2" style="st [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H4Decorator--><path codeLine="414" d="M7146.39,1019.69 C6897.28,1095.13 6335.76,1254.75 5850,1318 C5592.97,1351.47 4935.74,1286.27 4684,1348 C4652.01,1355.85 4619.11,1369.58 4589.83,1384.15 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H4Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4585.16,13 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ImageDecorator--><path codeLine="415" d="M7146.35,1002.89 C6795.27,1066.06 5801.47,1238.12 4967,1318 C4819.97,1332.07 4446.72,1313.91 4303,1348 C4284.19,1352.46 4264.99,1358.6 4246.22,1365.62 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4241. [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.InputDecorator--><path codeLine="416" d="M7146.15,1102.49 C7055.43,1179.72 6927.67,1272.84 6796,1318 C6661.53,1364.12 6294.91,1313.52 6157,1348 C6134.37,1353.66 6111.22,1362.01 6089.11,1371.43 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6084 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.LiDecorator--><path codeLine="417" d="M7407.74,990.44 C7855.85,1029.64 9371.12,1162.16 10623,1271 C11018.1,1305.35 11126.08,1256.61 11512,1348 C11543.43,1355.44 11576.21,1366.33 11606.95,1378.07 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="11611 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.OlDecorator--><path codeLine="418" d="M7407.53,993.33 C7854.98,1041.84 9368.37,1200.69 10623,1271 C11157.44,1300.95 11292.37,1274.69 11827,1301 C12111.42,1315 12188.38,1284.58 12466,1348 C12497.93,1355.29 12531.21,1366.19 12562.39,1377.99 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width: [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.OptionDecorator--><path codeLine="419" d="M7146.34,1165.74 C7102.77,1219.4 7051.15,1274.97 6996,1318 C6989.23,1323.29 6914.34,1358.97 6846.98,1390.62 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6842.15,1392.9,6851.9964,1392.6796,6846.6725,1 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PDecorator--><path codeLine="420" d="M7146.23,985.47 C6561.46,1014.79 4127.62,1140.63 2134,1301 C1921.22,1318.12 1861.11,1288.84 1656,1348 C1630.56,1355.34 1604.43,1366.09 1580.07,1377.71 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1575.54,1379. [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><path codeLine="421" d="M7146.27,1039.95 C6964.8,1121.08 6624.16,1260.96 6317,1318 C5844.89,1405.67 5709.71,1263.61 5237,1348 C5185.43,1357.21 5130.42,1374.19 5083.13,1391.17 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" point [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><path codeLine="422" d="M7146.31,978.49 C6405.43,976.91 2754.6,987.56 2430,1348 C2401.89,1379.21 2405.84,1502.65 2430,1537 C2600.01,1778.69 2942.6,1864.13 3187.26,1893.9 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" po [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><path codeLine="423" d="M7146.42,979.95 C6457.03,986.3 3261.46,1032.67 2972,1348 C2915.2,1409.88 2922.03,1469.48 2972,1537 C3000.69,1575.77 3092.48,1608.62 3189.27,1633.67 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" po [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><path codeLine="424" d="M7407.78,987.97 C7776.4,1015.97 8811.98,1114.29 9042,1348 C9071.68,1378.16 9060,1399.18 9060,1441.5 C9060,1441.5 9060,1441.5 9060,2347 C9060,2445.71 8968.26,2501.33 8870.94,2532.56 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:#A80036 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><path codeLine="425" d="M7407.52,1045.87 C7536.61,1122.39 7715,1260.83 7715,1441.5 C7715,1441.5 7715,1441.5 7715,1911 C7715,1957.46 7715,2009.61 7715,2050.68 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="77 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><path codeLine="426" d="M7407.6,983.96 C7667.99,1001.55 8227,1081.27 8227,1441.5 C8227,1441.5 8227,1441.5 8227,2126 C8227,2172.4 8227,2224.33 8227,2265.97 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points= [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SelectDecorator--><path codeLine="427" d="M7146.47,985.41 C6555.46,1015.35 4127.38,1148.43 3395,1348 C3377.85,1352.67 3360.34,1358.73 3343.18,1365.5 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3338.34,1367.43,3348.1819,1367.8014,3342.9824,1 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><path codeLine="428" d="M7407.89,994 C7855.71,1044.57 9368.29,1209.06 10623,1271 C11771.01,1327.67 12061.26,1239.07 13209,1301 C13426.13,1312.72 13486.3,1290.48 13696,1348 C13722.86,1355.37 13750.57,1366.13 13776.47,1377.75 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.StrikeDecorator" style="stroke:#A80036;stroke [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SubDecorator--><path codeLine="429" d="M7407.78,986.87 C7959.56,1021.01 10098.73,1162.89 10746,1348 C10772.03,1355.45 10798.85,1366.21 10823.9,1377.8 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10828.56,1379.97,10822.0972,1372.5382,10824.0294, [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SupDecorator--><path codeLine="430" d="M7146.14,980.52 C6568.93,988.66 4193.71,1037.31 2266,1301 C2165.65,1314.73 2138.88,1315.33 2043,1348 C2018.78,1356.25 1993.64,1366.78 1969.82,1377.76 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1965.07,13 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TableDecorator--><path codeLine="431" d="M7146.31,1068.62 C7018.54,1150.71 6815.27,1266.95 6620,1318 C6435.85,1366.14 5951,1312.48 5764,1348 C5721.2,1356.13 5676.01,1370.02 5635.36,1384.65 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5630.42, [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><path codeLine="432" d="M7146.35,984.13 C6511.7,1009.47 3687.2,1127.08 1378,1301 C1160.28,1317.4 1099.62,1290.49 889,1348 C852.35,1358.01 814.09,1374.28 780.97,1390.47 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="776.13,1392. [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TdDecorator--><path codeLine="433" d="M7407.54,1065.99 C7543.25,1156.44 7752.53,1295.91 7874.19,1376.98 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7878.48,1379.84,7873.1972,1371.5278,7874.3154,1377.0731,7868.7701,1378.1913,7878.48,1379.84" sty [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><path codeLine="434" d="M7407.78,984.88 C7710.37,1002.2 8478.08,1067.59 9069,1301 C9112.62,1318.23 9156.79,1344.81 9193.79,1370.23 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9198.27,1373.32,9193.1395,1364.913,9194.156 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><path codeLine="435" d="M7146.36,981 C6406.34,993.17 2758.4,1064.86 2323,1301 C2287.54,1320.23 2260.66,1357.19 2242.98,1388.37 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="2240.43,1392.93,2248.2974,1387.0052,2242. [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ThDecorator--><path codeLine="436" d="M7407.77,991.04 C7753.53,1024.95 8718.46,1133.07 9494,1348 C9523.74,1356.24 9554.87,1366.94 9584.43,1378.13 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9589.16,1379.93,9582.1815,1372.9801,9584.4896,1378.144 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TheadDecorator--><path codeLine="437" d="M7407.8,980.03 C7837.46,986.5 9241.17,1032.11 10346,1348 C10382.18,1358.34 10420.02,1374.5 10452.93,1390.5 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10457.75,1392.86,10451.4309,1385.3056,10453.2608, [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TrDecorator--><path codeLine="438" d="M7407.71,981.99 C7802.94,994.15 9016.64,1054.58 9969,1348 C10003.03,1358.49 10038.47,1374.59 10069.28,1390.49 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10073.8,1392.83,10067.6659,1385.1246,10069.3656,1390 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.UlDecorator--><path codeLine="439" d="M7146.38,981.52 C6512.58,994.81 3754.68,1065.44 2933,1301 C2873.98,1317.92 2813.03,1348.8 2764.3,1377.31 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="2759.92,1379.88,2769.7045,1378.7561,2764.2275,1377.3412,2 [...]
-link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><path codeLine="440" d="M7407.76,1011.87 C7596.12,1061.65 7952.34,1164.96 8236,1301 C8280.6,1322.39 8327.12,1351.19 8365.75,1377.15 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8369.95,1379.97,8364.7332,1371.6163,8365 [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><path codeLine="441" d="M8364.41,2421.14 C8408.57,2444.97 8457.57,2471.41 8502.06,2495.41 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8506.62,2497.88,8500.5952,2490.0889,8502.2186, [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><path codeLine="442" d="M3739.88,1924.73 C4499.52,1962.81 6628.76,2069.55 7416.8,2109.05 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7421.98,2109.31,7413.1973,2104.853,7416.9866,2109.0532,7412.7864, [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><path codeLine="443" d="M4833.98,1492.03 C4787.17,1508.46 4733.22,1525.53 4683,1537 C4364.77,1609.67 3991.19,1649.45 3742.71,1669.68 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3737.6,1670.1,3746.9003,1673.341,37 [...]
-link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><path codeLine="444" d="M3466,1764.14 C3466,1787.22 3466,1812.64 3466,1835.65 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3466,1840.83,3470,1831.83,3466,1835.83,3462,1831.83,3466,1840.83" style="stroke:#A [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="2687px" preserveAspectRatio="none" style="width:14108px;height:2687px;background:#FFFFFF;" version="1.1" viewBox="0 0 14108 2687" width="14108px" zoomAndPan="magnify"><defs><filter height="300%" id="f5s7s0pwdwx15" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" st [...]
+cluster org.apache.wiki.htmltowiki.syntax--><polygon fill="#FFFFFF" filter="url(#f5s7s0pwdwx15)" points="16,650,290,650,297,672.2969,14091,672.2969,14091,2664,16,2664,16,650" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="297" y1="672.2969" y2="672.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="268" x="20" y="664.9951">org.apache.wiki.htmltowiki.syntax</text><! [...]
+cluster org.apache.wiki.htmltowiki--><polygon fill="#FFFFFF" filter="url(#f5s7s0pwdwx15)" points="7288,6,7505,6,7512,28.2969,8086,28.2969,8086,617,7288,617,7288,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="7288" x2="7512" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="211" x="7292" y="20.9951">org.apache.wiki.htmltowiki</text><!--MD5=[ed1ac7cb8 [...]
+class org.apache.wiki.htmltowiki.syntax.TableDecorator--><a href="TableDecorator.html" target="_top" title="TableDecorator.html" xlink:actuate="onRequest" xlink:href="TableDecorator.html" xlink:show="new" xlink:title="TableDecorator.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.5;" width="492" x="32" y="1386.5"/><ellipse cx="225.25" cy="1 [...]
+class org.apache.wiki.htmltowiki.syntax.DtDecorator--><a href="DtDecorator.html" target="_top" title="DtDecorator.html" xlink:actuate="onRequest" xlink:href="DtDecorator.html" xlink:show="new" xlink:title="DtDecorator.html" xlink:type="simple"><rect codeLine="11" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="559" y="1386.5"/><ellipse cx="687.25" cy="1402.5" fill="#A9 [...]
+class org.apache.wiki.htmltowiki.syntax.TdDecorator--><a href="TdDecorator.html" target="_top" title="TdDecorator.html" xlink:actuate="onRequest" xlink:href="TdDecorator.html" xlink:show="new" xlink:title="TdDecorator.html" xlink:type="simple"><rect codeLine="19" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="936" y="1380"/><ellipse cx="1112.75" cy="1396" fill="#A9DCD [...]
+class org.apache.wiki.htmltowiki.syntax.OlDecorator--><a href="OlDecorator.html" target="_top" title="OlDecorator.html" xlink:actuate="onRequest" xlink:href="OlDecorator.html" xlink:show="new" xlink:title="OlDecorator.html" xlink:type="simple"><rect codeLine="28" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="438" x="1411" y="1380"/><ellipse cx="1588.75" cy="1396" fill="#A9DC [...]
+class org.apache.wiki.htmltowiki.syntax.FormDecorator--><a href="FormDecorator.html" target="_top" title="FormDecorator.html" xlink:actuate="onRequest" xlink:href="FormDecorator.html" xlink:show="new" xlink:title="FormDecorator.html" xlink:type="simple"><rect codeLine="37" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.5;" width="359" x="1884.5" y="1380"/><ellipse cx="2012.75" cy="139 [...]
+class org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><a href="UnderlineDecorator.html" target="_top" title="UnderlineDecorator.html" xlink:actuate="onRequest" xlink:href="UnderlineDecorator.html" xlink:show="new" xlink:title="UnderlineDecorator.html" xlink:type="simple"><rect codeLine="46" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke-width:1.5;" width="384" x="2279" y="1380"/>< [...]
+class org.apache.wiki.htmltowiki.syntax.SelectDecorator--><a href="SelectDecorator.html" target="_top" title="SelectDecorator.html" xlink:actuate="onRequest" xlink:href="SelectDecorator.html" xlink:show="new" xlink:title="SelectDecorator.html" xlink:type="simple"><rect codeLine="55" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="2698.5" y="1367.5"/><ellipse cx="28 [...]
+class org.apache.wiki.htmltowiki.syntax.CodeDecorator--><a href="CodeDecorator.html" target="_top" title="CodeDecorator.html" xlink:actuate="onRequest" xlink:href="CodeDecorator.html" xlink:show="new" xlink:title="CodeDecorator.html" xlink:type="simple"><rect codeLine="66" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="455" x="3098.5" y="1373.5"/><ellipse cx="3274.25" cy="1 [...]
+class org.apache.wiki.htmltowiki.syntax.DlDecorator--><a href="DlDecorator.html" target="_top" title="DlDecorator.html" xlink:actuate="onRequest" xlink:href="DlDecorator.html" xlink:show="new" xlink:title="DlDecorator.html" xlink:type="simple"><rect codeLine="76" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="341" x="3588.5" y="1380"/><ellipse cx="3717.25" cy="1396" fill="#A9 [...]
+class org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><a href="TbodyDecorator.html" target="_top" title="TbodyDecorator.html" xlink:actuate="onRequest" xlink:href="TbodyDecorator.html" xlink:show="new" xlink:title="TbodyDecorator.html" xlink:type="simple"><rect codeLine="85" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.5;" width="364" x="3965" y="1393"/><ellipse cx="4092.75" cy=" [...]
+class org.apache.wiki.htmltowiki.syntax.ImageDecorator--><a href="ImageDecorator.html" target="_top" title="ImageDecorator.html" xlink:actuate="onRequest" xlink:href="ImageDecorator.html" xlink:show="new" xlink:title="ImageDecorator.html" xlink:type="simple"><rect codeLine="92" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.5;" width="383" x="4364.5" y="1367.5"/><ellipse cx="4500.75" [...]
+class org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><a href="WikiSyntaxDecorator.html" target="_top" title="WikiSyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="WikiSyntaxDecorator.html" xlink:show="new" xlink:title="WikiSyntaxDecorator.html" xlink:type="simple"><rect codeLine="103" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="585.7969" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="261" x="7556.5" y= [...]
+class org.apache.wiki.htmltowiki.syntax.H1Decorator--><a href="H1Decorator.html" target="_top" title="H1Decorator.html" xlink:actuate="onRequest" xlink:href="H1Decorator.html" xlink:show="new" xlink:title="H1Decorator.html" xlink:type="simple"><rect codeLine="148" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="4782.5" y="1386.5"/><ellipse cx="4910.75" cy="1402.5" fill [...]
+class org.apache.wiki.htmltowiki.syntax.H3Decorator--><a href="H3Decorator.html" target="_top" title="H3Decorator.html" xlink:actuate="onRequest" xlink:href="H3Decorator.html" xlink:show="new" xlink:title="H3Decorator.html" xlink:type="simple"><rect codeLine="156" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="5162.5" y="1386.5"/><ellipse cx="5290.75" cy="1402.5" fill [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><a href="PlainTextBoldDecorator.html" target="_top" title="PlainTextBoldDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextBoldDecorator.html" xlink:show="new" xlink:title="PlainTextBoldDecorator.html" xlink:type="simple"><rect codeLine="164" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.5;" width=" [...]
+class org.apache.wiki.htmltowiki.syntax.BrDecorator--><a href="BrDecorator.html" target="_top" title="BrDecorator.html" xlink:actuate="onRequest" xlink:href="BrDecorator.html" xlink:show="new" xlink:title="BrDecorator.html" xlink:type="simple"><rect codeLine="174" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="439" x="5579.5" y="1380"/><ellipse cx="5756.75" cy="1396" fill="#A [...]
+class org.apache.wiki.htmltowiki.syntax.InputDecorator--><a href="InputDecorator.html" target="_top" title="InputDecorator.html" xlink:actuate="onRequest" xlink:href="InputDecorator.html" xlink:show="new" xlink:title="InputDecorator.html" xlink:type="simple"><rect codeLine="183" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.5;" width="358" x="6054" y="1373.5"/><ellipse cx="6180.75"  [...]
+class org.apache.wiki.htmltowiki.syntax.ADecorator--><a href="ADecorator.html" target="_top" title="ADecorator.html" xlink:actuate="onRequest" xlink:href="ADecorator.html" xlink:show="new" xlink:title="ADecorator.html" xlink:type="simple"><rect codeLine="193" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="188.8516" id="org.apache.wiki.htmltowiki.syntax.ADecorator" style="stroke:#A80036;stroke-width:1.5;" width="449" x="6447.5" y="1348"/><ellipse cx="6632.25" cy="1364" fill="#A9DCDF" [...]
+class org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><a href="TextAreaDecorator.html" target="_top" title="TextAreaDecorator.html" xlink:actuate="onRequest" xlink:href="TextAreaDecorator.html" xlink:show="new" xlink:title="TextAreaDecorator.html" xlink:type="simple"><rect codeLine="207" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.5;" width="380" x="6932" y="1373.5"/><ell [...]
+class org.apache.wiki.htmltowiki.syntax.H2Decorator--><a href="H2Decorator.html" target="_top" title="H2Decorator.html" xlink:actuate="onRequest" xlink:href="H2Decorator.html" xlink:show="new" xlink:title="H2Decorator.html" xlink:type="simple"><rect codeLine="217" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H2Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="7347.5" y="1386.5"/><ellipse cx="7475.75" cy="1402.5" fill [...]
+class org.apache.wiki.htmltowiki.syntax.ThDecorator--><a href="ThDecorator.html" target="_top" title="ThDecorator.html" xlink:actuate="onRequest" xlink:href="ThDecorator.html" xlink:show="new" xlink:title="ThDecorator.html" xlink:type="simple"><rect codeLine="225" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.5;" width="440" x="7728" y="1380"/><ellipse cx="7904.75" cy="1396" fill="#A9D [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><a href="PlainTextItalicDecorator.html" target="_top" title="PlainTextItalicDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextItalicDecorator.html" xlink:show="new" xlink:title="PlainTextItalicDecorator.html" xlink:type="simple"><rect codeLine="234" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="137.6328" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1 [...]
+class org.apache.wiki.htmltowiki.syntax.TheadDecorator--><a href="TheadDecorator.html" target="_top" title="TheadDecorator.html" xlink:actuate="onRequest" xlink:href="TheadDecorator.html" xlink:show="new" xlink:title="TheadDecorator.html" xlink:type="simple"><rect codeLine="244" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.5;" width="365" x="8239.5" y="1393"/><ellipse cx="8366.75" c [...]
+class org.apache.wiki.htmltowiki.syntax.TrDecorator--><a href="TrDecorator.html" target="_top" title="TrDecorator.html" xlink:actuate="onRequest" xlink:href="TrDecorator.html" xlink:show="new" xlink:title="TrDecorator.html" xlink:type="simple"><rect codeLine="251" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="342" x="8640" y="1393"/><ellipse cx="8769.25" cy="1409" fill="#ADD1 [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><a href="PlainTextCssDecorator.html" target="_top" title="PlainTextCssDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssDecorator.html" xlink:show="new" xlink:title="PlainTextCssDecorator.html" xlink:type="simple"><rect codeLine="258" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.5;" width="543" x [...]
+class org.apache.wiki.htmltowiki.syntax.OptionDecorator--><a href="OptionDecorator.html" target="_top" title="OptionDecorator.html" xlink:actuate="onRequest" xlink:href="OptionDecorator.html" xlink:show="new" xlink:title="OptionDecorator.html" xlink:type="simple"><rect codeLine="269" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.5;" width="367" x="9570.5" y="1393"/><ellipse cx="9697 [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><a href="PlainTextDecorator.html" target="_top" title="PlainTextDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextDecorator.html" xlink:show="new" xlink:title="PlainTextDecorator.html" xlink:type="simple"><rect codeLine="276" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.5;" width="518" x="9017" y="1393"/>< [...]
+class org.apache.wiki.htmltowiki.syntax.H4Decorator--><a href="H4Decorator.html" target="_top" title="H4Decorator.html" xlink:actuate="onRequest" xlink:href="H4Decorator.html" xlink:show="new" xlink:title="H4Decorator.html" xlink:type="simple"><rect codeLine="283" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.H4Decorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="10065.5" y="1386.5"/><ellipse cx="10193.75" cy="1402.5" fi [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><a href="PlainTextMonospaceDecorator.html" target="_top" title="PlainTextMonospaceDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextMonospaceDecorator.html" xlink:show="new" xlink:title="PlainTextMonospaceDecorator.html" xlink:type="simple"><rect codeLine="291" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80 [...]
+class org.apache.wiki.htmltowiki.syntax.DdDecorator--><a href="DdDecorator.html" target="_top" title="DdDecorator.html" xlink:actuate="onRequest" xlink:href="DdDecorator.html" xlink:show="new" xlink:title="DdDecorator.html" xlink:type="simple"><rect codeLine="302" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.5;" width="345" x="10481.5" y="1386.5"/><ellipse cx="10609.75" cy="1402.5" fi [...]
+class org.apache.wiki.htmltowiki.syntax.PDecorator--><a href="PDecorator.html" target="_top" title="PDecorator.html" xlink:actuate="onRequest" xlink:href="PDecorator.html" xlink:show="new" xlink:title="PDecorator.html" xlink:type="simple"><rect codeLine="310" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.5;" width="337" x="10861.5" y="1380"/><ellipse cx="10990.75" cy="1396" fill="#A9DCD [...]
+class org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><a href="TextElementDecorator.html" target="_top" title="TextElementDecorator.html" xlink:actuate="onRequest" xlink:href="TextElementDecorator.html" xlink:show="new" xlink:title="TextElementDecorator.html" xlink:type="simple"><rect codeLine="319" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="99.2188" id="org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.5;" width="315" x="11233 [...]
+class org.apache.wiki.htmltowiki.syntax.LiDecorator--><a href="LiDecorator.html" target="_top" title="LiDecorator.html" xlink:actuate="onRequest" xlink:href="LiDecorator.html" xlink:show="new" xlink:title="LiDecorator.html" xlink:type="simple"><rect codeLine="326" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.5;" width="435" x="11583.5" y="1380"/><ellipse cx="11760.25" cy="1396" fill=" [...]
+class org.apache.wiki.htmltowiki.syntax.UlDecorator--><a href="UlDecorator.html" target="_top" title="UlDecorator.html" xlink:actuate="onRequest" xlink:href="UlDecorator.html" xlink:show="new" xlink:title="UlDecorator.html" xlink:type="simple"><rect codeLine="335" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.5;" width="437" x="12053.5" y="1380"/><ellipse cx="12230.25" cy="1396" fill=" [...]
+class org.apache.wiki.htmltowiki.syntax.SubDecorator--><a href="SubDecorator.html" target="_top" title="SubDecorator.html" xlink:actuate="onRequest" xlink:href="SubDecorator.html" xlink:show="new" xlink:title="SubDecorator.html" xlink:type="simple"><rect codeLine="344" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="12525" y="1380"/><ellipse cx="12653.25" cy="1396" fi [...]
+class org.apache.wiki.htmltowiki.syntax.HrDecorator--><a href="HrDecorator.html" target="_top" title="HrDecorator.html" xlink:actuate="onRequest" xlink:href="HrDecorator.html" xlink:show="new" xlink:title="HrDecorator.html" xlink:type="simple"><rect codeLine="353" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="112.0234" id="org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.5;" width="343" x="12911.5" y="1386.5"/><ellipse cx="13040.25" cy="1402.5" fi [...]
+class org.apache.wiki.htmltowiki.syntax.MarkupHelper--><a href="MarkupHelper.html" target="_top" title="MarkupHelper.html" xlink:actuate="onRequest" xlink:href="MarkupHelper.html" xlink:show="new" xlink:title="MarkupHelper.html" xlink:type="simple"><rect codeLine="361" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.MarkupHelper" style="stroke:#A80036;stroke-width:1.5;" width="385" x="3668.5" y="903"/><ellipse cx="3813.25" cy="919" fill [...]
+class org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><a href="PlainTextCssSpecialDecorator.html" target="_top" title="PlainTextCssSpecialDecorator.html" xlink:actuate="onRequest" xlink:href="PlainTextCssSpecialDecorator.html" xlink:show="new" xlink:title="PlainTextCssSpecialDecorator.html" xlink:type="simple"><rect codeLine="372" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="150.4375" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="strok [...]
+class org.apache.wiki.htmltowiki.syntax.SupDecorator--><a href="SupDecorator.html" target="_top" title="SupDecorator.html" xlink:actuate="onRequest" xlink:href="SupDecorator.html" xlink:show="new" xlink:title="SupDecorator.html" xlink:type="simple"><rect codeLine="383" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.5;" width="352" x="13326" y="1380"/><ellipse cx="13454.25" cy="1396" fi [...]
+class org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><a href="StrikeDecorator.html" target="_top" title="StrikeDecorator.html" xlink:actuate="onRequest" xlink:href="StrikeDecorator.html" xlink:show="new" xlink:title="StrikeDecorator.html" xlink:type="simple"><rect codeLine="392" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="124.8281" id="org.apache.wiki.htmltowiki.syntax.StrikeDecorator" style="stroke:#A80036;stroke-width:1.5;" width="363" x="13712.5" y="1380"/><ellipse cx="13 [...]
+class org.apache.wiki.htmltowiki.SyntaxDecorator--><a href="../SyntaxDecorator.html" target="_top" title="../SyntaxDecorator.html" xlink:actuate="onRequest" xlink:href="../SyntaxDecorator.html" xlink:show="new" xlink:title="../SyntaxDecorator.html" xlink:type="simple"><rect codeLine="448" fill="#FEFECE" filter="url(#f5s7s0pwdwx15)" height="560.1875" id="org.apache.wiki.htmltowiki.SyntaxDecorator" style="stroke:#A80036;stroke-width:1.5;" width="766" x="7304" y="41"/><ellipse cx="7629.75"  [...]
+reverse link org.apache.wiki.htmltowiki.SyntaxDecorator to org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator--><path codeLine="401" d="M7687,621.37 C7687,642.47 7687,663.73 7687,684.79 " fill="none" id="org.apache.wiki.htmltowiki.SyntaxDecorator-backto-org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="7680,621.2,7687,601.2,7694,621.2,7680,621.2" style="stroke:#A80036;stroke-width:1.0; [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ADecorator--><path codeLine="402" d="M7556.38,1038.52 C7385.86,1116.22 7085.27,1253.19 6882.42,1345.62 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ADecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6877.64,1347.8,6887.4884,1347.7056,6882.1894,1345.7256,6884.1694,1340.4266,6877.64,1347.8" style=" [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.BrDecorator--><path codeLine="403" d="M7556.34,1001.13 C7274.99,1050.31 6592.37,1177.92 6037,1348 C6008.61,1356.69 5978.81,1367.23 5950.27,1378.04 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.BrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5945.34,1379.92,5955.1735,1380.469,5950.0152,1378.147 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.CodeDecorator--><path codeLine="404" d="M7556.11,990.45 C7085.44,1031.66 5434.64,1176.6 4073,1301 C3849.84,1321.39 3789.24,1297.14 3571,1348 C3544.6,1354.15 3517.22,1362.5 3490.76,1371.69 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.CodeDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3485.83,13 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DdDecorator--><path codeLine="405" d="M7817.65,985.64 C8297.73,1011.34 9961.89,1112.41 10455,1301 C10504.17,1319.8 10552.56,1353.53 10589.32,1383.23 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DdDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10593.29,1386.46,10588.8237,1377.6821,10589.4081,13 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DlDecorator--><path codeLine="406" d="M7556.37,985.58 C6978.44,1015.65 4649.16,1147.22 3948,1348 C3922.32,1355.35 3895.93,1366.11 3871.32,1377.73 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3866.74,1379.91,3876.5851,1379.6387,3871.2514,1377.754 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.DtDecorator--><path codeLine="407" d="M7556.27,992.83 C7086.1,1041.86 5436.65,1207.86 4071,1271 C2945.01,1323.06 2661.1,1251.43 1535,1301 C1260.69,1313.07 1183.79,1275.35 919,1348 C888.34,1356.41 856.73,1369.88 828.34,1384 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.DtDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon  [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.FormDecorator--><path codeLine="408" d="M7556.24,992.28 C7085.98,1039.48 5436.26,1200.02 4071,1271 C3499.62,1300.71 3355.24,1268.66 2784,1301 C2551.43,1314.17 2486.78,1286.88 2262,1348 C2235.15,1355.3 2207.47,1366.07 2181.62,1377.73 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.FormDecorator" style="stroke:#A80036;stroke-width:1.0; [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.HrDecorator--><path codeLine="409" d="M7817.91,986.63 C8372.94,1019.28 10586.71,1152.27 12403,1301 C12621.93,1318.93 12683.79,1287.64 12895,1348 C12925.28,1356.65 12956.52,1370.11 12984.64,1384.15 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.HrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="129 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H1Decorator--><path codeLine="410" d="M7556.19,997.57 C7212.15,1046.48 6253.51,1183.19 5456,1301 C5317.71,1321.43 5278.4,1306.2 5145,1348 C5115.65,1357.2 5085.19,1370.37 5057.48,1383.93 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H1Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5052.7,1386.29 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H2Decorator--><path codeLine="411" d="M7581.47,1271.25 C7566.43,1312.9 7552.42,1351.71 7541.59,1381.72 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H2Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7539.87,1386.46,7546.6927,1379.3572,7541.5707,1381.7581,7539.1697,1376.6361,7539.87,1386.46" styl [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H3Decorator--><path codeLine="412" d="M7556.49,989.62 C7146.51,1024.33 5889.51,1141.46 5516,1301 C5471,1320.22 5427.46,1353.4 5394.36,1382.7 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H3Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="5390.38,1386.25,5399.7577,1383.2403,5394.1099,1382.9202,539 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.H4Decorator--><path codeLine="413" d="M7817.68,989.68 C8246.32,1025.86 9605.62,1149.99 10017,1301 C10069.71,1320.35 10123,1353.73 10164.04,1383.1 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.H4Decorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10168.47,1386.29,10163.5137,1377.7791,10164.4159,1383. [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ImageDecorator--><path codeLine="414" d="M7556.09,994.44 C7005.77,1059.5 4901.86,1309.66 4765,1348 C4747.68,1352.85 4729.96,1358.91 4712.51,1365.59 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ImageDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4707.6,1367.5,4717.4368,1367.9864,4712.2638,1365. [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.InputDecorator--><path codeLine="415" d="M7556.3,1010.12 C7325.37,1066.7 6831.64,1194.83 6430,1348 C6411.66,1355 6392.66,1362.99 6374.03,1371.3 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.InputDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="6369.3,1373.42,6379.1488,1373.3885,6373.8625,1371.374 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.LiDecorator--><path codeLine="416" d="M7817.88,990.28 C8275.95,1029.96 9849.57,1167.87 11147,1301 C11333.41,1320.13 11384.21,1302.51 11566,1348 C11596.83,1355.71 11629.01,1366.54 11659.32,1378.1 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.LiDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="11664 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.OlDecorator--><path codeLine="417" d="M7556.25,992.55 C7086.04,1040.64 5436.45,1203.83 4071,1271 C3319.79,1307.95 3130,1259.93 2379,1301 C2150.83,1313.48 2089.3,1295.09 1867,1348 C1835.45,1355.51 1802.53,1366.39 1771.61,1378.09 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.OlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><pol [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.OptionDecorator--><path codeLine="418" d="M7817.54,993.85 C8125.61,1031.25 8919.6,1141.39 9553,1348 C9587.87,1359.38 9624.64,1375.24 9657.06,1390.68 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.OptionDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9661.81,1392.95,9655.4334,1385.4441,9657.3042,1 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PDecorator--><path codeLine="419" d="M7817.63,992.48 C8220.29,1034.32 9477.87,1167.24 10517,1301 C10662.63,1319.75 10703.92,1304.01 10844,1348 C10868.41,1355.66 10893.54,1366.24 10917.12,1377.53 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10921. [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextDecorator--><path codeLine="420" d="M7817.65,1013.27 C8054.48,1075.94 8569.96,1214.83 9000,1348 C9043.28,1361.4 9090.05,1376.87 9132.57,1391.31 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9137.47,1392.98,9130.2388,1386.2934,9132 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><path codeLine="421" d="M7817.51,1040.11 C7933.21,1101.33 8097.2,1206.72 8186,1348 C8231.5,1420.4 8163.63,1474.51 8222,1537 C8375.9,1701.74 8995.33,1816.45 9363.3,1871.6 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" po [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><path codeLine="422" d="M7817.66,979.19 C8258.09,982.87 9676.36,1020.37 9955,1348 C10009.42,1411.99 9999.67,1465.86 9955,1537 C9936.04,1567.2 9909.16,1591.5 9879.02,1611.01 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" p [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><path codeLine="423" d="M7817.89,985.75 C8399.27,1016.05 10805.92,1144.86 12778,1301 C12997.86,1318.41 13108.8,1199.66 13272,1348 C13303.32,1376.46 13290,1399.18 13290,1441.5 C13290,1441.5 13290,1441.5 13290,2347 C13290,2506.14 12182.24,2553.89 11693.3,2567.21 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.sy [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><path codeLine="424" d="M7817.79,996.52 C8178.51,1044.86 9218,1184.24 10082,1301 C10235.79,1321.78 10315.28,1241.33 10428,1348 C10458.74,1377.09 10446,1399.18 10446,1441.5 C10446,1441.5 10446,1441.5 10446,1911 C10446,1968.5 10406.78,2016.76 10362.98,2052.73 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.Pl [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><path codeLine="425" d="M7556.28,983.03 C7138.95,998.65 5849.07,1069.01 5562,1348 C5531.59,1377.55 5543,1399.1 5543,1441.5 C5543,1441.5 5543,1441.5 5543,2126 C5543,2234.41 8775.39,2313.6 9880.05,2337.5 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80036;stro [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SelectDecorator--><path codeLine="426" d="M7556.48,989.68 C7086.19,1028.13 5434.22,1162.94 4071,1271 C3631.05,1305.87 3507.78,1235.62 3081,1348 C3063.55,1352.59 3045.76,1358.66 3028.33,1365.5 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SelectDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="3023 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.StrikeDecorator--><path codeLine="427" d="M7817.63,982.26 C8438.64,998.65 11154.13,1080.05 13368,1301 C13514.54,1315.62 13554.96,1305.64 13696,1348 C13721.88,1355.77 13748.65,1366.44 13773.82,1377.79 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.StrikeDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" poin [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SubDecorator--><path codeLine="428" d="M7817.56,982.41 C8492.03,1001.05 11585.67,1098.92 12508,1348 C12534.56,1355.17 12561.87,1366 12587.29,1377.77 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SubDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="12592.01,1379.97,12585.5472,1372.5382,12587.4794,1 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.SupDecorator--><path codeLine="429" d="M7817.65,982.26 C8610.91,1002.61 12765.14,1117.32 13299,1301 C13346.51,1317.35 13393.08,1348.18 13429.6,1376.81 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.SupDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="13433.55,1379.93,13428.9626,1371.2148,13429.6249 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TableDecorator--><path codeLine="430" d="M7556.27,992.92 C7086.12,1042.28 5436.71,1209.23 4071,1271 C2714.54,1332.35 2371.84,1227.27 1016,1301 C804.61,1312.5 748.62,1301.88 542,1348 C501.07,1357.14 457.76,1370.73 418.31,1384.74 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TableDecorator" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TbodyDecorator--><path codeLine="431" d="M7556.32,978.27 C7103.03,978.89 5559.87,1007.53 4347,1348 C4310.6,1358.22 4272.55,1374.45 4239.53,1390.53 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TbodyDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="4234.7,1392.91,4244.5418,1392.5383,4239.1892,1390. [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TdDecorator--><path codeLine="432" d="M7556.26,992.7 C7086.07,1041.3 5436.56,1206 4071,1271 C3155.5,1314.58 2924.6,1259.39 2009,1301 C1735.15,1313.44 1661.2,1286.76 1394,1348 C1361.96,1355.34 1328.55,1366.26 1297.23,1378.07 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TdDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TextAreaDecorator--><path codeLine="433" d="M7556.31,1085.98 C7449.69,1173.26 7302.01,1294.15 7209.27,1370.06 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TextAreaDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7205.17,1373.42,7214.6623,1370.7938,7209.0321,1370.2445,7209.5814,1364.6143,7205.17, [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TextElementDecorator--><path codeLine="434" d="M7817.88,985.93 C8376.24,1016.54 10560.41,1147.04 11216,1348 C11248.51,1357.97 11281.97,1374.15 11310.82,1390.27 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TextElementDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="11315.4,1392.86,11309.5255,1384 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.ThDecorator--><path codeLine="435" d="M7817.69,1210.59 C7851.79,1271.01 7885.87,1331.4 7910.62,1375.26 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.ThDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="7913.13,1379.72,7912.1933,1369.9158,7910.6739,1375.3648,7905.2249,1373.8455,7913.13,1379.72" styl [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TheadDecorator--><path codeLine="436" d="M7817.65,1056.87 C7924.67,1121.16 8079.64,1215.41 8213,1301 C8257.91,1329.82 8307.5,1363.1 8347.11,1390.03 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TheadDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8351.4,1392.95,8346.2164,1384.5756,8347.2686,1390 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.TrDecorator--><path codeLine="437" d="M7817.73,1026.65 C7999.82,1093.91 8339.27,1222.54 8622,1348 C8651.54,1361.11 8683.18,1376.29 8711.96,1390.57 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.TrDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="8716.55,1392.85,8710.2793,1385.2554,8712.075,1390.619 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.UlDecorator--><path codeLine="438" d="M7817.57,984.93 C8450.45,1014.45 11202.36,1151.99 12036,1348 C12067.56,1355.42 12100.47,1366.3 12131.35,1378.03 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.UlDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="12136.28,1379.92,12129.3015,1372.9701,12131.6096,1 [...]
+link org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator to org.apache.wiki.htmltowiki.syntax.UnderlineDecorator--><path codeLine="439" d="M7556.22,991.84 C7085.88,1037.54 5435.91,1193.63 4071,1271 C3663.44,1294.1 3560.33,1274.09 3153,1301 C2942.64,1314.89 2884.78,1293.99 2681,1348 C2652.83,1355.47 2623.64,1366.28 2596.31,1377.93 " fill="none" id="org.apache.wiki.htmltowiki.syntax.WikiSyntaxDecorator-to-org.apache.wiki.htmltowiki.syntax.UnderlineDecorator" style="stroke:#A80036;stroke- [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator--><path codeLine="440" d="M9834.87,1979.13 C9902.76,2003.11 9979.13,2030.08 10047.4,2054.2 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10052.3,2055.93,10045.154,2049.1525,10047.5874,2054.2592,10042.48 [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator--><path codeLine="441" d="M10245,2194.09 C10245,2216.74 10245,2242.16 10245,2265.58 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextItalicDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="10245,2270.86,10249,2261.86,10245,2265.86,10241,2261.86,10245, [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator--><path codeLine="442" d="M9642,1764.14 C9642,1787.22 9642,1812.64 9642,1835.65 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextBoldDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9642,1840.83,9646,1831.83,9642,1835.83,9638,1831.83,9642,1840.83" style="stroke:#A [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator--><path codeLine="443" d="M9348.75,1492.1 C9399.64,1526.1 9468.68,1572.22 9526.98,1611.16 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="9531.16,1613.96,9525.9101,1605.627,9527.0063,1611.1766,9521.4567,1612.2728,9531. [...]
+link org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator to org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator--><path codeLine="444" d="M10604.74,2413.29 C10809.98,2451.11 11060.99,2497.37 11238.95,2530.16 " fill="none" id="org.apache.wiki.htmltowiki.syntax.PlainTextMonospaceDecorator-to-org.apache.wiki.htmltowiki.syntax.PlainTextCssSpecialDecorator" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="11243.93,2531.08,11235.7978,2525.5241,1123 [...]
 @startuml
     namespace org.apache.wiki.htmltowiki.syntax {
 
-        class MarkupHelper [[MarkupHelper.html]] {
-            {static} +printUnescaped(PrintWriter, String): void
-            {static} +isFootnoteLink(String): boolean
-            {static} +isUndefinedPageLink(Element): boolean
-            {static} +isHtmlBaseDiv(ElementDecoratorData): boolean
-            {static} +isHtmlBaseSpan(ElementDecoratorData): boolean
-            {static} +getAugmentedWikiLinkAttributes(Element): Map<String, String>
-            {static} +augmentedWikiLinkMapToString(Map<String, String>): String
-            {static} +nameSansNbf(Element): String
+        class TableDecorator [[TableDecorator.html]] {
+            #out: PrintWriter
+            #chain: XHtmlElementToWikiTranslator
+            #outTrimmer: WhitespaceTrimWriter
+            +TableDecorator(PrintWriter, WhitespaceTrimWriter, XHtmlElementToWikiTranslator)
+            +decorate(Element): void
         }
 
-        abstract class BrDecorator [[BrDecorator.html]] {
+        abstract class DtDecorator [[DtDecorator.html]] {
+            #out: PrintWriter
+            #chain: XHtmlElementToWikiTranslator
+            #DtDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            +decorate(Element): void
+            {abstract} #markupDt(): String
+        }
+
+        abstract class TdDecorator [[TdDecorator.html]] {
             #out: PrintWriter
             #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #BrDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
-            +decorate(Element, Element): void
-            {abstract} #markupBr(): String
+            #TdDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
+            +decorate(Element): void
+            {abstract} #markupTd(): String
         }
 
-        class TbodyDecorator [[TbodyDecorator.html]] {
+        abstract class OlDecorator [[OlDecorator.html]] {
             #out: PrintWriter
+            #liStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            +TbodyDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #OlDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element): void
+            {abstract} #markupOl(): String
         }
 
         abstract class FormDecorator [[FormDecorator.html]] {
@@ -125,39 +132,61 @@ link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.
             {abstract} #markupFormClose(): String
         }
 
-        abstract class PDecorator [[PDecorator.html]] {
+        abstract class UnderlineDecorator [[UnderlineDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #PDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #UnderlineDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupPOpen(): String
-            {abstract} #markupPClose(): String
+            {abstract} #markupUnderlineOpen(): String
+            {abstract} #markupUnderlineClose(): String
         }
 
-        abstract class SupDecorator [[SupDecorator.html]] {
+        abstract class SelectDecorator [[SelectDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #SupDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            +SelectDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupSupOpen(): String
-            {abstract} #markupSupClose(): String
+            {abstract} #markupForSelectAttributeOpen(String): String
+            {abstract} #markupForSelectAttributeClose(): String
+            {abstract} #markupSelectOpen(): String
+            {abstract} #markupSelectClose(): String
         }
 
-        class TextElementDecorator [[TextElementDecorator.html]] {
+        abstract class CodeDecorator [[CodeDecorator.html]] {
             #out: PrintWriter
             #preStack: Deque<String>
-            +TextElementDecorator(PrintWriter, Deque<String>)
-            +decorate(Text): void
+            #chain: XHtmlElementToWikiTranslator
+            #CodeDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
+            +decorate(Element): void
+            {abstract} #markupCodeOpen(): String
+            {abstract} #markupCodeClose(): String
         }
 
-        abstract class PlainTextItalicDecorator [[PlainTextItalicDecorator.html]] {
+        abstract class DlDecorator [[DlDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #PlainTextItalicDecorator(PlainTextMonospaceDecorator, PrintWriter, XHtmlElementToWikiTranslator)
-            +decorate(ElementDecoratorData): void
+            #DlDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupItalicOpen(): String
-            {abstract} #markupItalicClose(): String
+            {abstract} #markupDlOpen(): String
+            {abstract} #markupDlClose(): String
+        }
+
+        class TbodyDecorator [[TbodyDecorator.html]] {
+            #out: PrintWriter
+            #chain: XHtmlElementToWikiTranslator
+            +TbodyDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            +decorate(Element): void
+        }
+
+        abstract class ImageDecorator [[ImageDecorator.html]] {
+            #out: PrintWriter
+            #config: XHtmlToWikiConfig
+            #ImageDecorator(PrintWriter, XHtmlToWikiConfig)
+            +decorate(String, Map<String, Object>): void
+            +decorate(Element): void
+            {abstract} #markupImageSimpleOpen(): String
+            {abstract} #markupImageSimpleClose(): String
+            {abstract} #markupImageWithAttributes(String, Map<String, Object>): void
         }
 
         abstract class WikiSyntaxDecorator [[WikiSyntaxDecorator.html]] {
@@ -205,64 +234,20 @@ link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.
             +underline(Element): void
         }
 
-        abstract class UlDecorator [[UlDecorator.html]] {
-            #out: PrintWriter
-            #liStack: Deque<String>
-            #chain: XHtmlElementToWikiTranslator
-            #UlDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
-            +decorate(Element): void
-            {abstract} #markupUl(): String
-        }
-
-        abstract class PlainTextMonospaceDecorator [[PlainTextMonospaceDecorator.html]] {
-            #out: PrintWriter
-            #preStack: Deque<String>
-            #chain: XHtmlElementToWikiTranslator
-            #PlainTextMonospaceDecorator(PlainTextCssSpecialDecorator, PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
-            +decorate(ElementDecoratorData): void
-            +decorate(Element): void
-            {abstract} #markupMonospaceOpen(): String
-            {abstract} #markupMonospaceClose(): String
-        }
-
-        abstract class SelectDecorator [[SelectDecorator.html]] {
-            #out: PrintWriter
-            #chain: XHtmlElementToWikiTranslator
-            +SelectDecorator(PrintWriter, XHtmlElementToWikiTranslator)
-            +decorate(Element): void
-            {abstract} #markupForSelectAttributeOpen(String): String
-            {abstract} #markupForSelectAttributeClose(): String
-            {abstract} #markupSelectOpen(): String
-            {abstract} #markupSelectClose(): String
-        }
-
-        abstract class CodeDecorator [[CodeDecorator.html]] {
+        abstract class H1Decorator [[H1Decorator.html]] {
             #out: PrintWriter
-            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #CodeDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
-            +decorate(Element): void
-            {abstract} #markupCodeOpen(): String
-            {abstract} #markupCodeClose(): String
-        }
-
-        abstract class ImageDecorator [[ImageDecorator.html]] {
-            #out: PrintWriter
-            #config: XHtmlToWikiConfig
-            #ImageDecorator(PrintWriter, XHtmlToWikiConfig)
-            +decorate(String, Map<String, Object>): void
+            #H1Decorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupImageSimpleOpen(): String
-            {abstract} #markupImageSimpleClose(): String
-            {abstract} #markupImageWithAttributes(String, Map<String, Object>): void
+            {abstract} #markupH1(): String
         }
 
-        abstract class H4Decorator [[H4Decorator.html]] {
+        abstract class H3Decorator [[H3Decorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #H4Decorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #H3Decorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupH4(): String
+            {abstract} #markupH3(): String
         }
 
         abstract class PlainTextBoldDecorator [[PlainTextBoldDecorator.html]] {
@@ -275,12 +260,13 @@ link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.
             {abstract} #markupBoldClose(): String
         }
 
-        class TableDecorator [[TableDecorator.html]] {
+        abstract class BrDecorator [[BrDecorator.html]] {
             #out: PrintWriter
+            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #outTrimmer: WhitespaceTrimWriter
-            +TableDecorator(PrintWriter, WhitespaceTrimWriter, XHtmlElementToWikiTranslator)
-            +decorate(Element): void
+            #BrDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
+            +decorate(Element, Element): void
+            {abstract} #markupBr(): String
         }
 
         abstract class InputDecorator [[InputDecorator.html]] {
@@ -293,79 +279,69 @@ link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.
             {abstract} #markupInputClose(): String
         }
 
-        abstract class DdDecorator [[DdDecorator.html]] {
-            #out: PrintWriter
-            #chain: XHtmlElementToWikiTranslator
-            #DdDecorator(PrintWriter, XHtmlElementToWikiTranslator)
-            +decorate(Element): void
-            {abstract} #markupDd(): String
-        }
-
-        class OptionDecorator [[OptionDecorator.html]] {
+        abstract class ADecorator [[ADecorator.html]] {
             #out: PrintWriter
+            #config: XHtmlToWikiConfig
             #chain: XHtmlElementToWikiTranslator
-            +OptionDecorator(PrintWriter, XHtmlElementToWikiTranslator)
-            +decorate(Element, Element): void
+            #ADecorator(PrintWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)
+            +decorate(Element, String): void
+            +decorateFootnote(String, String): void
+            +decorateUndefinedLink(Element): void
+            {abstract} #linkMarkup(Element): void
+            {abstract} #linkMarkup(Element, String): void
+            {abstract} #linkMarkup(Element, String, String): void
+            {abstract} #linkMarkup(String, String): void
         }
 
-        abstract class HrDecorator [[HrDecorator.html]] {
+        abstract class TextAreaDecorator [[TextAreaDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #HrDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #TextAreaDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupHr(): String
+            {abstract} #markupForTextAreaAttribute(String, String): String
+            {abstract} #markupTextAreaOpen(): String
+            {abstract} #markupTextAreaClose(): String
         }
 
-        abstract class H3Decorator [[H3Decorator.html]] {
+        abstract class H2Decorator [[H2Decorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #H3Decorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #H2Decorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupH3(): String
-        }
-
-        abstract class PlainTextCssSpecialDecorator [[PlainTextCssSpecialDecorator.html]] {
-            #out: PrintWriter
-            #chain: XHtmlElementToWikiTranslator
-            #PlainTextCssSpecialDecorator(PrintWriter, XHtmlElementToWikiTranslator)
-            +decorate(ElementDecoratorData): void
-            {abstract} #markupCssSpecialDivOpen(String): String
-            {abstract} #markupCssSpecialDivClose(String): String
-            {abstract} #markupCssSpecialOpen(String): String
-            {abstract} #markupCssSpecialClose(String): String
+            {abstract} #markupH2(): String
         }
 
-        abstract class TdDecorator [[TdDecorator.html]] {
+        abstract class ThDecorator [[ThDecorator.html]] {
             #out: PrintWriter
             #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #TdDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
+            #ThDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupTd(): String
+            {abstract} #markupTh(): String
         }
 
-        class PlainTextDecorator [[PlainTextDecorator.html]] {
+        abstract class PlainTextItalicDecorator [[PlainTextItalicDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            +PlainTextDecorator(PlainTextCssDecorator, PrintWriter, XHtmlElementToWikiTranslator)
+            #PlainTextItalicDecorator(PlainTextMonospaceDecorator, PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(ElementDecoratorData): void
+            +decorate(Element): void
+            {abstract} #markupItalicOpen(): String
+            {abstract} #markupItalicClose(): String
         }
 
-        abstract class UnderlineDecorator [[UnderlineDecorator.html]] {
+        class TheadDecorator [[TheadDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #UnderlineDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            +TheadDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupUnderlineOpen(): String
-            {abstract} #markupUnderlineClose(): String
         }
 
-        abstract class DtDecorator [[DtDecorator.html]] {
+        class TrDecorator [[TrDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #DtDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            +TrDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupDt(): String
         }
 
         abstract class PlainTextCssDecorator [[PlainTextCssDecorator.html]] {
@@ -379,54 +355,61 @@ link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.
             {abstract} #markupCssSpanClose(String): String
         }
 
-        abstract class TextAreaDecorator [[TextAreaDecorator.html]] {
+        class OptionDecorator [[OptionDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #TextAreaDecorator(PrintWriter, XHtmlElementToWikiTranslator)
-            +decorate(Element): void
-            {abstract} #markupForTextAreaAttribute(String, String): String
-            {abstract} #markupTextAreaOpen(): String
-            {abstract} #markupTextAreaClose(): String
+            +OptionDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            +decorate(Element, Element): void
         }
 
-        abstract class ThDecorator [[ThDecorator.html]] {
+        class PlainTextDecorator [[PlainTextDecorator.html]] {
             #out: PrintWriter
-            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #ThDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
-            +decorate(Element): void
-            {abstract} #markupTh(): String
+            +PlainTextDecorator(PlainTextCssDecorator, PrintWriter, XHtmlElementToWikiTranslator)
+            +decorate(ElementDecoratorData): void
         }
 
-        class TrDecorator [[TrDecorator.html]] {
+        abstract class H4Decorator [[H4Decorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            +TrDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #H4Decorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
+            {abstract} #markupH4(): String
         }
 
-        class TheadDecorator [[TheadDecorator.html]] {
+        abstract class PlainTextMonospaceDecorator [[PlainTextMonospaceDecorator.html]] {
             #out: PrintWriter
+            #preStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            +TheadDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #PlainTextMonospaceDecorator(PlainTextCssSpecialDecorator, PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
+            +decorate(ElementDecoratorData): void
             +decorate(Element): void
+            {abstract} #markupMonospaceOpen(): String
+            {abstract} #markupMonospaceClose(): String
         }
 
-        abstract class SubDecorator [[SubDecorator.html]] {
+        abstract class DdDecorator [[DdDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #SubDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #DdDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupSubOpen(): String
-            {abstract} #markupSubClose(): String
+            {abstract} #markupDd(): String
         }
 
-        abstract class H1Decorator [[H1Decorator.html]] {
+        abstract class PDecorator [[PDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #H1Decorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #PDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupH1(): String
+            {abstract} #markupPOpen(): String
+            {abstract} #markupPClose(): String
+        }
+
+        class TextElementDecorator [[TextElementDecorator.html]] {
+            #out: PrintWriter
+            #preStack: Deque<String>
+            +TextElementDecorator(PrintWriter, Deque<String>)
+            +decorate(Text): void
         }
 
         abstract class LiDecorator [[LiDecorator.html]] {
@@ -438,44 +421,61 @@ link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.
             {abstract} #markupLi(Deque<String>): String
         }
 
-        abstract class ADecorator [[ADecorator.html]] {
+        abstract class UlDecorator [[UlDecorator.html]] {
             #out: PrintWriter
-            #config: XHtmlToWikiConfig
+            #liStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #ADecorator(PrintWriter, XHtmlToWikiConfig, XHtmlElementToWikiTranslator)
-            +decorate(Element, String): void
-            +decorateFootnote(String, String): void
-            +decorateUndefinedLink(Element): void
-            {abstract} #linkMarkup(Element): void
-            {abstract} #linkMarkup(Element, String): void
-            {abstract} #linkMarkup(Element, String, String): void
-            {abstract} #linkMarkup(String, String): void
+            #UlDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
+            +decorate(Element): void
+            {abstract} #markupUl(): String
         }
 
-        abstract class OlDecorator [[OlDecorator.html]] {
+        abstract class SubDecorator [[SubDecorator.html]] {
             #out: PrintWriter
-            #liStack: Deque<String>
             #chain: XHtmlElementToWikiTranslator
-            #OlDecorator(PrintWriter, Deque<String>, XHtmlElementToWikiTranslator)
+            #SubDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupOl(): String
+            {abstract} #markupSubOpen(): String
+            {abstract} #markupSubClose(): String
         }
 
-        abstract class H2Decorator [[H2Decorator.html]] {
+        abstract class HrDecorator [[HrDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #H2Decorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #HrDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupH2(): String
+            {abstract} #markupHr(): String
         }
 
-        abstract class DlDecorator [[DlDecorator.html]] {
+        class MarkupHelper [[MarkupHelper.html]] {
+            {static} +printUnescaped(PrintWriter, String): void
+            {static} +isFootnoteLink(String): boolean
+            {static} +isUndefinedPageLink(Element): boolean
+            {static} +isHtmlBaseDiv(ElementDecoratorData): boolean
+            {static} +isHtmlBaseSpan(ElementDecoratorData): boolean
+            {static} +getAugmentedWikiLinkAttributes(Element): Map<String, String>
+            {static} +augmentedWikiLinkMapToString(Map<String, String>): String
+            {static} +nameSansNbf(Element): String
+        }
+
+        abstract class PlainTextCssSpecialDecorator [[PlainTextCssSpecialDecorator.html]] {
             #out: PrintWriter
             #chain: XHtmlElementToWikiTranslator
-            #DlDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            #PlainTextCssSpecialDecorator(PrintWriter, XHtmlElementToWikiTranslator)
+            +decorate(ElementDecoratorData): void
+            {abstract} #markupCssSpecialDivOpen(String): String
+            {abstract} #markupCssSpecialDivClose(String): String
+            {abstract} #markupCssSpecialOpen(String): String
+            {abstract} #markupCssSpecialClose(String): String
+        }
+
+        abstract class SupDecorator [[SupDecorator.html]] {
+            #out: PrintWriter
+            #chain: XHtmlElementToWikiTranslator
+            #SupDecorator(PrintWriter, XHtmlElementToWikiTranslator)
             +decorate(Element): void
-            {abstract} #markupDlOpen(): String
-            {abstract} #markupDlClose(): String
+            {abstract} #markupSupOpen(): String
+            {abstract} #markupSupClose(): String
         }
 
         abstract class StrikeDecorator [[StrikeDecorator.html]] {
@@ -487,7 +487,6 @@ link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.
             {abstract} #markupStrikeClose(): String
         }
 
-        PlainTextItalicDecorator - -> PlainTextMonospaceDecorator: ptmd
         org.apache.wiki.htmltowiki.SyntaxDecorator <|.. WikiSyntaxDecorator
         WikiSyntaxDecorator - -> ADecorator: a
         WikiSyntaxDecorator - -> BrDecorator: br
@@ -527,10 +526,11 @@ link org.apache.wiki.htmltowiki.syntax.PlainTextCssDecorator to org.apache.wiki.
         WikiSyntaxDecorator - -> TrDecorator: tr
         WikiSyntaxDecorator - -> UlDecorator: ul
         WikiSyntaxDecorator - -> UnderlineDecorator: underline
-        PlainTextMonospaceDecorator - -> PlainTextCssSpecialDecorator: ptcsd
         PlainTextBoldDecorator - -> PlainTextItalicDecorator: ptid
-        PlainTextDecorator - -> PlainTextCssDecorator: ptcd
+        PlainTextItalicDecorator - -> PlainTextMonospaceDecorator: ptmd
         PlainTextCssDecorator - -> PlainTextBoldDecorator: ptbd
+        PlainTextDecorator - -> PlainTextCssDecorator: ptcd
+        PlainTextMonospaceDecorator - -> PlainTextCssSpecialDecorator: ptcsd
     }
 
     namespace org.apache.wiki.htmltowiki {
@@ -587,5 +587,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/http/filter/CsrfProtectionFilter.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/http/filter/CsrfProtectionFilter.svg
index 542a5fb228..9c7782695e 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/http/filter/CsrfProtectionFilter.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/http/filter/CsrfProtectionFilter.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="299px" preserveAspectRatio="none" style="width:386px;height:299px;background:#FFFFFF;" version="1.1" viewBox="0 0 386 299" width="386px" zoomAndPan="magnify"><defs><filter height="300%" id="fqxgwg8ql6z0n" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.http.filter.CsrfProtectionFilter--><a href="CsrfProtectionFilter.html" target="_top" title="CsrfProtectionFilter.html" xlink:actuate="onRequest" xlink:href="CsrfProtectionFilter.html" xlink:show="new" xlink:title="CsrfProtectionFilter.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fqxgwg8ql6z0n)" height="117.9609" id="org.apache.wiki.http.filter.CsrfProtectionFilter" style="stroke:#A80036;stroke-width:1.5;" width="365" x="7" y="151"/><ellip [...]
 class javax.servlet.Filter--><rect codeLine="13" fill="#FEFECE" filter="url(#fqxgwg8ql6z0n)" height="84.3516" id="javax.servlet.Filter" style="stroke:#A80036;stroke-width:1.5;" width="365" x="7" y="7"/><ellipse cx="153.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M149.1719,21.7344 L149.1719,19.5781 L156.5625,19.5781 L156.5625,21.7344 L154.0938,21.7344 L154.0938,29.8125 L156.5625,29.8125 L156.5625,31.9688 L149.1719,31.9688 L149.1719,29 [...]
-reverse link javax.servlet.Filter to org.apache.wiki.http.filter.CsrfProtectionFilter--><path codeLine="19" d="M189.5,111.53 C189.5,124.44 189.5,138.01 189.5,150.79 " fill="none" id="javax.servlet.Filter-backto-org.apache.wiki.http.filter.CsrfProtectionFilter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="182.5,111.36,189.5,91.36,196.5,111.36,182.5,111.36" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-se [...]
+reverse link javax.servlet.Filter to org.apache.wiki.http.filter.CsrfProtectionFilter--><path codeLine="19" d="M189.5,111.53 C189.5,124.44 189.5,138.01 189.5,150.79 " fill="none" id="javax.servlet.Filter-backto-org.apache.wiki.http.filter.CsrfProtectionFilter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="182.5,111.36,189.5,91.36,196.5,111.36,182.5,111.36" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-se [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -32,5 +32,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/http/filter/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/http/filter/package.svg
index ecabfc4dd5..d7fb2240eb 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/http/filter/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/http/filter/package.svg
@@ -3,7 +3,7 @@ cluster org.apache.wiki.http.filter--><polygon fill="#FFFFFF" filter="url(#fnhfh
 cluster javax.servlet--><polygon fill="#FFFFFF" filter="url(#fnhfhafolhk2l)" points="16,6,122,6,129,28.2969,412,28.2969,412,143,16,143,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="129" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="100" x="20" y="20.9951">javax.servlet</text><!--MD5=[0fc050eccb03c7d6247f0bdfa09ee7ed]
 class org.apache.wiki.http.filter.CsrfProtectionFilter--><a href="CsrfProtectionFilter.html" target="_top" title="CsrfProtectionFilter.html" xlink:actuate="onRequest" xlink:href="CsrfProtectionFilter.html" xlink:show="new" xlink:title="CsrfProtectionFilter.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fnhfhafolhk2l)" height="112.0234" id="org.apache.wiki.http.filter.CsrfProtectionFilter" style="stroke:#A80036;stroke-width:1.5;" width="365" x="31.5" y="202"/><el [...]
 class javax.servlet.Filter--><rect codeLine="15" fill="#FEFECE" filter="url(#fnhfhafolhk2l)" height="86.4141" id="javax.servlet.Filter" style="stroke:#A80036;stroke-width:1.5;" width="365" x="31.5" y="41"/><ellipse cx="194.25" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M190.1719,52.7656 L190.1719,50.6094 L197.5625,50.6094 L197.5625,52.7656 L195.0938,52.7656 L195.0938,60.8438 L197.5625,60.8438 L197.5625,63 L190.1719,63 L190.1719,60.8438 L192. [...]
-reverse link javax.servlet.Filter to org.apache.wiki.http.filter.CsrfProtectionFilter--><path codeLine="11" d="M214,147.13 C214,164.98 214,184.31 214,201.71 " fill="none" id="javax.servlet.Filter-backto-org.apache.wiki.http.filter.CsrfProtectionFilter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="207,147.08,214,127.08,221,147.08,207,147.08" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size= [...]
+reverse link javax.servlet.Filter to org.apache.wiki.http.filter.CsrfProtectionFilter--><path codeLine="11" d="M214,147.13 C214,164.98 214,184.31 214,201.71 " fill="none" id="javax.servlet.Filter-backto-org.apache.wiki.http.filter.CsrfProtectionFilter" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="207,147.08,214,127.08,221,147.08,207,147.08" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size= [...]
 @startuml
     namespace org.apache.wiki.http.filter {
 
@@ -35,5 +35,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/DefaultInternationalizationManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/DefaultInternationalizationManager.svg
index 7875aa26ff..a0e53efbff 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/DefaultInternationalizationManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/DefaultInternationalizationManager.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:292px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 292 194" width="292px" zoomAndPan="magnify"><defs><filter height="300%" id="f1s9b8vjcuykm3" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.i18n.DefaultInternationalizationManager--><a href="DefaultInternationalizationManager.html" target="_top" title="DefaultInternationalizationManager.html" xlink:actuate="onRequest" xlink:href="DefaultInternationalizationManager.html" xlink:show="new" xlink:title="DefaultInternationalizationManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1s9b8vjcuykm3)" height="58.7422" id="org.apache.wiki.i18n.DefaultInternationalizationManager" styl [...]
 class org.apache.wiki.i18n.InternationalizationManager--><a href="InternationalizationManager.html" target="_top" title="InternationalizationManager.html" xlink:actuate="onRequest" xlink:href="InternationalizationManager.html" xlink:show="new" xlink:title="InternationalizationManager.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1s9b8vjcuykm3)" height="37.9375" id="org.apache.wiki.i18n.InternationalizationManager" style="stroke:#A80036;stroke-width:1.5;" width [...]
-reverse link org.apache.wiki.i18n.InternationalizationManager to org.apache.wiki.i18n.DefaultInternationalizationManager--><path codeLine="11" d="M142.5,65.22 C142.5,78.3 142.5,92.7 142.5,104.89 " fill="none" id="org.apache.wiki.i18n.InternationalizationManager-backto-org.apache.wiki.i18n.DefaultInternationalizationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="135.5,65.07,142.5,45.07,149.5,65.07,135.5,65.07" style="stroke:#A80036 [...]
+reverse link org.apache.wiki.i18n.InternationalizationManager to org.apache.wiki.i18n.DefaultInternationalizationManager--><path codeLine="11" d="M142.5,65.22 C142.5,78.3 142.5,92.7 142.5,104.89 " fill="none" id="org.apache.wiki.i18n.InternationalizationManager-backto-org.apache.wiki.i18n.DefaultInternationalizationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="135.5,65.07,142.5,45.07,149.5,65.07,135.5,65.07" style="stroke:#A80036 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/InternationalizationManager.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/InternationalizationManager.svg
index ca6985694c..b5e0ecf072 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/InternationalizationManager.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/InternationalizationManager.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:291px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 291 162" width="291px" zoomAndPan="magnify"><defs><filter height="300%" id="f1mhyuyc0ejnnm" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
-class org.apache.wiki.i18n.InternationalizationManager--><a href="InternationalizationManager.html" target="_top" title="InternationalizationManager.html" xlink:actuate="onRequest" xlink:href="InternationalizationManager.html" xlink:show="new" xlink:title="InternationalizationManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1mhyuyc0ejnnm)" height="130.7656" id="org.apache.wiki.i18n.InternationalizationManager" style="stroke:#A80036;stroke-width:1.5;" widt [...]
+class org.apache.wiki.i18n.InternationalizationManager--><a href="InternationalizationManager.html" target="_top" title="InternationalizationManager.html" xlink:actuate="onRequest" xlink:href="InternationalizationManager.html" xlink:show="new" xlink:title="InternationalizationManager.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1mhyuyc0ejnnm)" height="130.7656" id="org.apache.wiki.i18n.InternationalizationManager" style="stroke:#A80036;stroke-width:1.5;" widt [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/package.svg
index f360875da1..f06d167a36 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/i18n/package.svg
@@ -2,7 +2,7 @@
 cluster org.apache.wiki.i18n--><polygon fill="#FFFFFF" filter="url(#fmyjdu4th7r7q)" points="16,6,186,6,193,28.2969,318,28.2969,318,303,16,303,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="193" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="164" x="20" y="20.9951">org.apache.wiki.i18n</text><!--MD5=[487d3db0123a944731b7cef06001c699]
 class org.apache.wiki.i18n.InternationalizationManager--><a href="InternationalizationManager.html" target="_top" title="InternationalizationManager.html" xlink:actuate="onRequest" xlink:href="InternationalizationManager.html" xlink:show="new" xlink:title="InternationalizationManager.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fmyjdu4th7r7q)" height="124.8281" id="org.apache.wiki.i18n.InternationalizationManager" style="stroke:#A80036;stroke-width:1.5;" width [...]
 class org.apache.wiki.i18n.DefaultInternationalizationManager--><a href="DefaultInternationalizationManager.html" target="_top" title="DefaultInternationalizationManager.html" xlink:actuate="onRequest" xlink:href="DefaultInternationalizationManager.html" xlink:show="new" xlink:title="DefaultInternationalizationManager.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#fmyjdu4th7r7q)" height="60.8047" id="org.apache.wiki.i18n.DefaultInternationalizationManager" styl [...]
-reverse link org.apache.wiki.i18n.InternationalizationManager to org.apache.wiki.i18n.DefaultInternationalizationManager--><path codeLine="16" d="M167,186.78 C167,200.73 167,214.36 167,225.76 " fill="none" id="org.apache.wiki.i18n.InternationalizationManager-backto-org.apache.wiki.i18n.DefaultInternationalizationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="160,186.35,167,166.35,174,186.35,160,186.35" style="stroke:#A80036;stroke [...]
+reverse link org.apache.wiki.i18n.InternationalizationManager to org.apache.wiki.i18n.DefaultInternationalizationManager--><path codeLine="16" d="M167,186.78 C167,200.73 167,214.36 167,225.76 " fill="none" id="org.apache.wiki.i18n.InternationalizationManager-backto-org.apache.wiki.i18n.DefaultInternationalizationManager" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="160,186.35,167,166.35,174,186.35,160,186.35" style="stroke:#A80036;stroke [...]
 @startuml
     namespace org.apache.wiki.i18n {
 
@@ -31,5 +31,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/AnonymousViewIT.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/AnonymousViewIT.svg
index 02c3c268f5..33210ac4b4 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/AnonymousViewIT.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/AnonymousViewIT.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="173px" preserveAspectRatio="none" style="width:229px;height:173px;background:#FFFFFF;" version="1.1" viewBox="0 0 229 173" width="229px" zoomAndPan="magnify"><defs><filter height="300%" id="frsota485qwr" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation [...]
 class org.apache.wiki.its.AnonymousViewIT--><a href="AnonymousViewIT.html" target="_top" title="AnonymousViewIT.html" xlink:actuate="onRequest" xlink:href="AnonymousViewIT.html" xlink:show="new" xlink:title="AnonymousViewIT.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#frsota485qwr)" height="37.9375" id="org.apache.wiki.its.AnonymousViewIT" style="stroke:#A80036;stroke-width:1.5;" width="158" x="32" y="105"/><ellipse cx="47" cy="123.9688" fill="#ADD1B2" rx="11" [...]
 class org.apache.wiki.its.WithIntegrationTestSetup--><a href="WithIntegrationTestSetup.html" target="_top" title="WithIntegrationTestSetup.html" xlink:actuate="onRequest" xlink:href="WithIntegrationTestSetup.html" xlink:show="new" xlink:title="WithIntegrationTestSetup.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#frsota485qwr)" height="37.9375" id="org.apache.wiki.its.WithIntegrationTestSetup" style="stroke:#A80036;stroke-width:1.5;" width="208" x="7" y="7"/><e [...]
-reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.AnonymousViewIT--><path codeLine="10" d="M111,65.43 C111,78.98 111,93.59 111,104.7 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.AnonymousViewIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="104,65.06,111,45.06,118,65.06,104,65.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" length [...]
+reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.AnonymousViewIT--><path codeLine="10" d="M111,65.43 C111,78.98 111,93.59 111,104.7 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.AnonymousViewIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="104,65.06,111,45.06,118,65.06,104,65.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" length [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/EditIT.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/EditIT.svg
index 2a3c8727e6..198a57887b 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/EditIT.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/EditIT.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="173px" preserveAspectRatio="none" style="width:229px;height:173px;background:#FFFFFF;" version="1.1" viewBox="0 0 229 173" width="229px" zoomAndPan="magnify"><defs><filter height="300%" id="flr34k3fif9v7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.its.EditIT--><a href="EditIT.html" target="_top" title="EditIT.html" xlink:actuate="onRequest" xlink:href="EditIT.html" xlink:show="new" xlink:title="EditIT.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#flr34k3fif9v7)" height="37.9375" id="org.apache.wiki.its.EditIT" style="stroke:#A80036;stroke-width:1.5;" width="120" x="51" y="105"/><ellipse cx="66" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><p [...]
 class org.apache.wiki.its.WithIntegrationTestSetup--><a href="WithIntegrationTestSetup.html" target="_top" title="WithIntegrationTestSetup.html" xlink:actuate="onRequest" xlink:href="WithIntegrationTestSetup.html" xlink:show="new" xlink:title="WithIntegrationTestSetup.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#flr34k3fif9v7)" height="37.9375" id="org.apache.wiki.its.WithIntegrationTestSetup" style="stroke:#A80036;stroke-width:1.5;" width="208" x="7" y="7"/>< [...]
-reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.EditIT--><path codeLine="10" d="M111,65.43 C111,78.98 111,93.59 111,104.7 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.EditIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="104,65.06,111,45.06,118,65.06,104,65.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" t [...]
+reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.EditIT--><path codeLine="10" d="M111,65.43 C111,78.98 111,93.59 111,104.7 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.EditIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="104,65.06,111,45.06,118,65.06,104,65.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" t [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/LoginIT.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/LoginIT.svg
index c727677eb2..b8906bf7a6 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/LoginIT.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/LoginIT.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="173px" preserveAspectRatio="none" style="width:229px;height:173px;background:#FFFFFF;" version="1.1" viewBox="0 0 229 173" width="229px" zoomAndPan="magnify"><defs><filter height="300%" id="fpsrxbgxne467" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.its.LoginIT--><a href="LoginIT.html" target="_top" title="LoginIT.html" xlink:actuate="onRequest" xlink:href="LoginIT.html" xlink:show="new" xlink:title="LoginIT.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fpsrxbgxne467)" height="37.9375" id="org.apache.wiki.its.LoginIT" style="stroke:#A80036;stroke-width:1.5;" width="120" x="51" y="105"/><ellipse cx="66" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0 [...]
 class org.apache.wiki.its.WithIntegrationTestSetup--><a href="WithIntegrationTestSetup.html" target="_top" title="WithIntegrationTestSetup.html" xlink:actuate="onRequest" xlink:href="WithIntegrationTestSetup.html" xlink:show="new" xlink:title="WithIntegrationTestSetup.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#fpsrxbgxne467)" height="37.9375" id="org.apache.wiki.its.WithIntegrationTestSetup" style="stroke:#A80036;stroke-width:1.5;" width="208" x="7" y="7"/>< [...]
-reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.LoginIT--><path codeLine="10" d="M111,65.43 C111,78.98 111,93.59 111,104.7 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.LoginIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="104,65.06,111,45.06,118,65.06,104,65.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" [...]
+reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.LoginIT--><path codeLine="10" d="M111,65.43 C111,78.98 111,93.59 111,104.7 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.LoginIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="104,65.06,111,45.06,118,65.06,104,65.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/SearchIT.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/SearchIT.svg
index 089d53d6cf..01f58d28ca 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/SearchIT.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/SearchIT.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="173px" preserveAspectRatio="none" style="width:229px;height:173px;background:#FFFFFF;" version="1.1" viewBox="0 0 229 173" width="229px" zoomAndPan="magnify"><defs><filter height="300%" id="f6uj9296t3czx" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.its.SearchIT--><a href="SearchIT.html" target="_top" title="SearchIT.html" xlink:actuate="onRequest" xlink:href="SearchIT.html" xlink:show="new" xlink:title="SearchIT.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f6uj9296t3czx)" height="37.9375" id="org.apache.wiki.its.SearchIT" style="stroke:#A80036;stroke-width:1.5;" width="120" x="51" y="105"/><ellipse cx="66" cy="123.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-wid [...]
 class org.apache.wiki.its.WithIntegrationTestSetup--><a href="WithIntegrationTestSetup.html" target="_top" title="WithIntegrationTestSetup.html" xlink:actuate="onRequest" xlink:href="WithIntegrationTestSetup.html" xlink:show="new" xlink:title="WithIntegrationTestSetup.html" xlink:type="simple"><rect codeLine="8" fill="#FEFECE" filter="url(#f6uj9296t3czx)" height="37.9375" id="org.apache.wiki.its.WithIntegrationTestSetup" style="stroke:#A80036;stroke-width:1.5;" width="208" x="7" y="7"/>< [...]
-reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.SearchIT--><path codeLine="10" d="M111,65.43 C111,78.98 111,93.59 111,104.7 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.SearchIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="104,65.06,111,45.06,118,65.06,104,65.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacin [...]
+reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.SearchIT--><path codeLine="10" d="M111,65.43 C111,78.98 111,93.59 111,104.7 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.SearchIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="104,65.06,111,45.06,118,65.06,104,65.06" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacin [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -23,5 +23,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/WithIntegrationTestSetup.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/WithIntegrationTestSetup.svg
index 3261fca052..c6279b60fa 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/WithIntegrationTestSetup.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/WithIntegrationTestSetup.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:229px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 229 90" width="229px" zoomAndPan="magnify"><defs><filter height="300%" id="f1il8mp9st95qz" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation= [...]
-class org.apache.wiki.its.WithIntegrationTestSetup--><a href="WithIntegrationTestSetup.html" target="_top" title="WithIntegrationTestSetup.html" xlink:actuate="onRequest" xlink:href="WithIntegrationTestSetup.html" xlink:show="new" xlink:title="WithIntegrationTestSetup.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1il8mp9st95qz)" height="58.7422" id="org.apache.wiki.its.WithIntegrationTestSetup" style="stroke:#A80036;stroke-width:1.5;" width="208" x="7" y="7"/> [...]
+class org.apache.wiki.its.WithIntegrationTestSetup--><a href="WithIntegrationTestSetup.html" target="_top" title="WithIntegrationTestSetup.html" xlink:actuate="onRequest" xlink:href="WithIntegrationTestSetup.html" xlink:show="new" xlink:title="WithIntegrationTestSetup.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1il8mp9st95qz)" height="58.7422" id="org.apache.wiki.its.WithIntegrationTestSetup" style="stroke:#A80036;stroke-width:1.5;" width="208" x="7" y="7"/> [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/environment/Env.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/environment/Env.svg
index 7fe4cd6d07..1a64539016 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/environment/Env.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/environment/Env.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:302px;height:213px;background:#FFFFFF;" version="1.1" viewBox="0 0 302 213" width="302px" zoomAndPan="magnify"><defs><filter height="300%" id="fdseiu0mwmgms" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-class org.apache.wiki.its.environment.Env--><a href="Env.html" target="_top" title="Env.html" xlink:actuate="onRequest" xlink:href="Env.html" xlink:show="new" xlink:title="Env.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fdseiu0mwmgms)" height="181.9844" id="org.apache.wiki.its.environment.Env" style="stroke:#A80036;stroke-width:1.5;" width="281" x="7" y="7"/><ellipse cx="66.75" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0 [...]
+class org.apache.wiki.its.environment.Env--><a href="Env.html" target="_top" title="Env.html" xlink:actuate="onRequest" xlink:href="Env.html" xlink:show="new" xlink:title="Env.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fdseiu0mwmgms)" height="181.9844" id="org.apache.wiki.its.environment.Env" style="stroke:#A80036;stroke-width:1.5;" width="281" x="7" y="7"/><ellipse cx="66.75" cy="25.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/environment/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/environment/package.svg
index 21b9bb2ce5..92cb891c47 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/environment/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/environment/package.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:347px;height:256px;background:#FFFFFF;" version="1.1" viewBox="0 0 347 256" width="347px" zoomAndPan="magnify"><defs><filter height="300%" id="f93ztwtanxe6m" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 cluster org.apache.wiki.its.environment--><polygon fill="#FFFFFF" filter="url(#f93ztwtanxe6m)" points="16,6,276,6,283,28.2969,330,28.2969,330,233,16,233,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="283" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="254" x="20" y="20.9951">org.apache.wiki.its.environment</text><!--MD5=[1dfb8dff936220 [...]
-class org.apache.wiki.its.environment.Env--><a href="Env.html" target="_top" title="Env.html" xlink:actuate="onRequest" xlink:href="Env.html" xlink:show="new" xlink:title="Env.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f93ztwtanxe6m)" height="176.0469" id="org.apache.wiki.its.environment.Env" style="stroke:#A80036;stroke-width:1.5;" width="281" x="32.5" y="41"/><ellipse cx="157.75" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0 [...]
+class org.apache.wiki.its.environment.Env--><a href="Env.html" target="_top" title="Env.html" xlink:actuate="onRequest" xlink:href="Env.html" xlink:show="new" xlink:title="Env.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f93ztwtanxe6m)" height="176.0469" id="org.apache.wiki.its.environment.Env" style="stroke:#A80036;stroke-width:1.5;" width="281" x="32.5" y="41"/><ellipse cx="157.75" cy="57" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0 [...]
 @startuml
     namespace org.apache.wiki.its.environment {
 
@@ -28,5 +28,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/package.svg
index 04ce2ba70a..b74dce4647 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/its/package.svg
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="249px" preserveAspectRatio="none" style="width:539px;height:249px;background:#FFFFFF;" version="1.1" viewBox="0 0 539 249" width="539px" zoomAndPan="magnify"><defs><filter height="300%" id="fdikti5j4myit" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
-cluster org.apache.wiki.its--><polygon fill="#FFFFFF" filter="url(#fdikti5j4myit)" points="16,6,171,6,178,28.2969,522,28.2969,522,226,16,226,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="178" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="149" x="20" y="20.9951">org.apache.wiki.its</text><!--MD5=[96a12772fc3ff570f24627a504b1bc64]
-class org.apache.wiki.its.SearchIT--><a href="SearchIT.html" target="_top" title="SearchIT.html" xlink:actuate="onRequest" xlink:href="SearchIT.html" xlink:show="new" xlink:title="SearchIT.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#fdikti5j4myit)" height="48" id="org.apache.wiki.its.SearchIT" style="stroke:#A80036;stroke-width:1.5;" width="86" x="32" y="162"/><ellipse cx="47" cy="178" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/>< [...]
-class org.apache.wiki.its.EditIT--><a href="EditIT.html" target="_top" title="EditIT.html" xlink:actuate="onRequest" xlink:href="EditIT.html" xlink:show="new" xlink:title="EditIT.html" xlink:type="simple"><rect codeLine="6" fill="#FEFECE" filter="url(#fdikti5j4myit)" height="48" id="org.apache.wiki.its.EditIT" style="stroke:#A80036;stroke-width:1.5;" width="66" x="153" y="162"/><ellipse cx="168" cy="178" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M1 [...]
-class org.apache.wiki.its.AnonymousViewIT--><a href="AnonymousViewIT.html" target="_top" title="AnonymousViewIT.html" xlink:actuate="onRequest" xlink:href="AnonymousViewIT.html" xlink:show="new" xlink:title="AnonymousViewIT.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#fdikti5j4myit)" height="48" id="org.apache.wiki.its.AnonymousViewIT" style="stroke:#A80036;stroke-width:1.5;" width="142" x="254" y="162"/><ellipse cx="269" cy="178" fill="#ADD1B2" rx="11" ry="11 [...]
-class org.apache.wiki.its.WithIntegrationTestSetup--><a href="WithIntegrationTestSetup.html" target="_top" title="WithIntegrationTestSetup.html" xlink:actuate="onRequest" xlink:href="WithIntegrationTestSetup.html" xlink:show="new" xlink:title="WithIntegrationTestSetup.html" xlink:type="simple"><rect codeLine="12" fill="#FEFECE" filter="url(#fdikti5j4myit)" height="60.8047" id="org.apache.wiki.its.WithIntegrationTestSetup" style="stroke:#A80036;stroke-width:1.5;" width="192" x="159" y="41 [...]
-class org.apache.wiki.its.LoginIT--><a href="LoginIT.html" target="_top" title="LoginIT.html" xlink:actuate="onRequest" xlink:href="LoginIT.html" xlink:show="new" xlink:title="LoginIT.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#fdikti5j4myit)" height="48" id="org.apache.wiki.its.LoginIT" style="stroke:#A80036;stroke-width:1.5;" width="75" x="431.5" y="162"/><ellipse cx="446.5" cy="178" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/> [...]
-reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.SearchIT--><path codeLine="19" d="M190.53,112.79 C164.18,129.26 134.65,147.72 112.04,161.85 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.SearchIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="187.04,106.72,207.71,102.06,194.46,118.59,187.04,106.72" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1dd3bbcdc508febf7fd1c0b68565ec6c]
-reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.EditIT--><path codeLine="20" d="M226.36,119.2 C217.38,133.84 207.85,149.37 200.31,161.67 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.EditIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="220.45,115.45,236.87,102.06,232.38,122.77,220.45,115.45" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6d6b5089fdce13fc42e1d63163e08421]
-reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.AnonymousViewIT--><path codeLine="21" d="M284.06,119.2 C293.17,133.84 302.83,149.37 310.48,161.67 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.AnonymousViewIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="278.01,122.74,273.39,102.06,289.9,115.34,278.01,122.74" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3b34439046f78d85f2803f7036786dec]
-reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.LoginIT--><path codeLine="22" d="M329.22,111.52 C363.67,129.63 403.14,150.38 431.33,165.2 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.LoginIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="325.67,117.56,311.23,102.06,332.19,105.17,325.67,117.56" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-s [...]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="249px" preserveAspectRatio="none" style="width:539px;height:249px;background:#FFFFFF;" version="1.1" viewBox="0 0 539 249" width="539px" zoomAndPan="magnify"><defs><filter height="300%" id="f1gjfom4tni29n" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
+cluster org.apache.wiki.its--><polygon fill="#FFFFFF" filter="url(#f1gjfom4tni29n)" points="16,6,171,6,178,28.2969,522,28.2969,522,226,16,226,16,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="178" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="149" x="20" y="20.9951">org.apache.wiki.its</text><!--MD5=[d4d664769afa60747f9155074c89c8b6]
+class org.apache.wiki.its.EditIT--><a href="EditIT.html" target="_top" title="EditIT.html" xlink:actuate="onRequest" xlink:href="EditIT.html" xlink:show="new" xlink:title="EditIT.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1gjfom4tni29n)" height="48" id="org.apache.wiki.its.EditIT" style="stroke:#A80036;stroke-width:1.5;" width="66" x="32" y="162"/><ellipse cx="47" cy="178" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M49 [...]
+class org.apache.wiki.its.WithIntegrationTestSetup--><a href="WithIntegrationTestSetup.html" target="_top" title="WithIntegrationTestSetup.html" xlink:actuate="onRequest" xlink:href="WithIntegrationTestSetup.html" xlink:show="new" xlink:title="WithIntegrationTestSetup.html" xlink:type="simple"><rect codeLine="6" fill="#FEFECE" filter="url(#f1gjfom4tni29n)" height="60.8047" id="org.apache.wiki.its.WithIntegrationTestSetup" style="stroke:#A80036;stroke-width:1.5;" width="192" x="154" y="41 [...]
+class org.apache.wiki.its.SearchIT--><a href="SearchIT.html" target="_top" title="SearchIT.html" xlink:actuate="onRequest" xlink:href="SearchIT.html" xlink:show="new" xlink:title="SearchIT.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1gjfom4tni29n)" height="48" id="org.apache.wiki.its.SearchIT" style="stroke:#A80036;stroke-width:1.5;" width="86" x="133" y="162"/><ellipse cx="148" cy="178" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0; [...]
+class org.apache.wiki.its.AnonymousViewIT--><a href="AnonymousViewIT.html" target="_top" title="AnonymousViewIT.html" xlink:actuate="onRequest" xlink:href="AnonymousViewIT.html" xlink:show="new" xlink:title="AnonymousViewIT.html" xlink:type="simple"><rect codeLine="13" fill="#FEFECE" filter="url(#f1gjfom4tni29n)" height="48" id="org.apache.wiki.its.AnonymousViewIT" style="stroke:#A80036;stroke-width:1.5;" width="142" x="254" y="162"/><ellipse cx="269" cy="178" fill="#ADD1B2" rx="11" ry=" [...]
+class org.apache.wiki.its.LoginIT--><a href="LoginIT.html" target="_top" title="LoginIT.html" xlink:actuate="onRequest" xlink:href="LoginIT.html" xlink:show="new" xlink:title="LoginIT.html" xlink:type="simple"><rect codeLine="16" fill="#FEFECE" filter="url(#f1gjfom4tni29n)" height="48" id="org.apache.wiki.its.LoginIT" style="stroke:#A80036;stroke-width:1.5;" width="75" x="431.5" y="162"/><ellipse cx="446.5" cy="178" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/ [...]
+reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.EditIT--><path codeLine="19" d="M184.3,112.45 C155.12,130.2 122.04,150.31 98.13,164.85 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.EditIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="180.67,106.47,201.39,102.06,187.94,118.43,180.67,106.47" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[618a8b14e39c6f2a22fd04a3305247ae]
+reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.SearchIT--><path codeLine="20" d="M219.28,119.2 C209.65,133.84 199.43,149.37 191.35,161.67 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.SearchIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="213.72,114.92,230.56,102.06,225.41,122.61,213.72,114.92" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6d6b5089fdce13fc42e1d63163e08421]
+reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.AnonymousViewIT--><path codeLine="21" d="M280.81,118.72 C290.67,133.5 301.16,149.24 309.45,161.67 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.AnonymousViewIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="274.98,122.58,269.71,102.06,286.62,114.82,274.98,122.58" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[3b34439046f78d85f2803f7036786dec]
+reverse link org.apache.wiki.its.WithIntegrationTestSetup to org.apache.wiki.its.LoginIT--><path codeLine="22" d="M325.65,111.36 C361.38,129.72 402.46,150.82 431.45,165.71 " fill="none" id="org.apache.wiki.its.WithIntegrationTestSetup-backto-org.apache.wiki.its.LoginIT" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="322.13,117.42,307.54,102.06,328.53,104.97,322.13,117.42" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font- [...]
 @startuml
     namespace org.apache.wiki.its {
 
-        class SearchIT [[SearchIT.html]] {
+        class EditIT [[EditIT.html]] {
         }
 
-        class EditIT [[EditIT.html]] {
+        class WithIntegrationTestSetup [[WithIntegrationTestSetup.html]] {
+            {static} +setUp(): void
         }
 
-        class AnonymousViewIT [[AnonymousViewIT.html]] {
+        class SearchIT [[SearchIT.html]] {
         }
 
-        class WithIntegrationTestSetup [[WithIntegrationTestSetup.html]] {
-            {static} +setUp(): void
+        class AnonymousViewIT [[AnonymousViewIT.html]] {
         }
 
         class LoginIT [[LoginIT.html]] {
         }
 
-        WithIntegrationTestSetup <|- - SearchIT
         WithIntegrationTestSetup <|- - EditIT
+        WithIntegrationTestSetup <|- - SearchIT
         WithIntegrationTestSetup <|- - AnonymousViewIT
         WithIntegrationTestSetup <|- - LoginIT
     }
@@ -43,5 +43,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/management/SimpleMBean.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/management/SimpleMBean.svg
index 439682ca97..ec5cf2f980 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/management/SimpleMBean.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/management/SimpleMBean.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:274px;height:402px;background:#FFFFFF;" version="1.1" viewBox="0 0 274 402" width="274px" zoomAndPan="magnify"><defs><filter height="300%" id="f179sb475pwcx6" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.management.SimpleMBean--><a href="SimpleMBean.html" target="_top" title="SimpleMBean.html" xlink:actuate="onRequest" xlink:href="SimpleMBean.html" xlink:show="new" xlink:title="SimpleMBean.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f179sb475pwcx6)" height="181.9844" id="org.apache.wiki.management.SimpleMBean" style="stroke:#A80036;stroke-width:1.5;" width="251" x="9" y="190"/><ellipse cx="56.75" cy="208.9688" fill="#A9DCDF" rx="11" ry=" [...]
 class javax.management.DynamicMBean--><rect codeLine="18" fill="#FEFECE" filter="url(#f179sb475pwcx6)" height="122.7656" id="javax.management.DynamicMBean" style="stroke:#A80036;stroke-width:1.5;" width="250" x="9.5" y="7"/><ellipse cx="76.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M72.1719,21.7344 L72.1719,19.5781 L79.5625,19.5781 L79.5625,21.7344 L77.0938,21.7344 L77.0938,29.8125 L79.5625,29.8125 L79.5625,31.9688 L72.1719,31.9688  [...]
-reverse link javax.management.DynamicMBean to org.apache.wiki.management.SimpleMBean--><path codeLine="27" d="M134.5,150.42 C134.5,163.26 134.5,176.62 134.5,189.67 " fill="none" id="javax.management.DynamicMBean-backto-org.apache.wiki.management.SimpleMBean" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="127.5,150.1,134.5,130.1,141.5,150.1,127.5,150.1" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif"  [...]
+reverse link javax.management.DynamicMBean to org.apache.wiki.management.SimpleMBean--><path codeLine="27" d="M134.5,150.42 C134.5,163.26 134.5,176.62 134.5,189.67 " fill="none" id="javax.management.DynamicMBean-backto-org.apache.wiki.management.SimpleMBean" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="127.5,150.1,134.5,130.1,141.5,150.1,127.5,150.1" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif"  [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -40,5 +40,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/management/package.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/management/package.svg
index e1ca821b29..043b41b722 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/management/package.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/management/package.svg
@@ -3,7 +3,7 @@ cluster org.apache.wiki.management--><polygon fill="#FFFFFF" filter="url(#f1szuv
 cluster javax.management--><polygon fill="#FFFFFF" filter="url(#f1szuvjz77plmy)" points="17,6,170,6,177,28.2969,299,28.2969,299,182,17,182,17,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="17" x2="177" y1="28.2969" y2="28.2969"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="147" x="21" y="20.9951">javax.management</text><!--MD5=[a9696cc3406e3bfeff149f6647ff5cab]
 class org.apache.wiki.management.SimpleMBean--><a href="SimpleMBean.html" target="_top" title="SimpleMBean.html" xlink:actuate="onRequest" xlink:href="SimpleMBean.html" xlink:show="new" xlink:title="SimpleMBean.html" xlink:type="simple"><rect codeLine="3" fill="#FEFECE" filter="url(#f1szuvjz77plmy)" height="176.0469" id="org.apache.wiki.management.SimpleMBean" style="stroke:#A80036;stroke-width:1.5;" width="251" x="32.5" y="241"/><ellipse cx="112.25" cy="257" fill="#A9DCDF" rx="11" ry="1 [...]
 class javax.management.DynamicMBean--><rect codeLine="20" fill="#FEFECE" filter="url(#f1szuvjz77plmy)" height="124.8281" id="javax.management.DynamicMBean" style="stroke:#A80036;stroke-width:1.5;" width="250" x="33" y="41"/><ellipse cx="106.25" cy="57" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M102.1719,52.7656 L102.1719,50.6094 L109.5625,50.6094 L109.5625,52.7656 L107.0938,52.7656 L107.0938,60.8438 L109.5625,60.8438 L109.5625,63 L102.1719,63 L102. [...]
-reverse link javax.management.DynamicMBean to org.apache.wiki.management.SimpleMBean--><path codeLine="16" d="M158,186.3 C158,203.97 158,222.73 158,240.61 " fill="none" id="javax.management.DynamicMBean-backto-org.apache.wiki.management.SimpleMBean" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="151,186.16,158,166.16,165,186.16,151,186.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10 [...]
+reverse link javax.management.DynamicMBean to org.apache.wiki.management.SimpleMBean--><path codeLine="16" d="M158,186.3 C158,203.97 158,222.73 158,240.61 " fill="none" id="javax.management.DynamicMBean-backto-org.apache.wiki.management.SimpleMBean" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="151,186.16,158,166.16,165,186.16,151,186.16" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#888888" font-family="sans-serif" font-size="10 [...]
 @startuml
     namespace org.apache.wiki.management {
 
@@ -43,5 +43,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/MarkdownForJSPWikiExtension.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/MarkdownForJSPWikiExtension.svg
index cceb3648c4..9d97a34084 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/MarkdownForJSPWikiExtension.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/MarkdownForJSPWikiExtension.svg
@@ -3,7 +3,7 @@ class org.apache.wiki.markdown.MarkdownForJSPWikiExtension--><a href="MarkdownFo
 class com.vladsch.flexmark.parser.Parser.ParserExtension--><rect codeLine="13" fill="#FEFECE" filter="url(#fsgul71i6j82i)" height="71.5469" id="com.vladsch.flexmark.parser.Parser.ParserExtension" style="stroke:#A80036;stroke-width:1.5;" width="253" x="7" y="7"/><ellipse cx="51.25" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M47.1719,21.7344 L47.1719,19.5781 L54.5625,19.5781 L54.5625,21.7344 L52.0938,21.7344 L52.0938,29.8125 L54.5625,29.8 [...]
 class com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension--><rect codeLine="17" fill="#FEFECE" filter="url(#fsgul71i6j82i)" height="71.5469" id="com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension" style="stroke:#A80036;stroke-width:1.5;" width="298" x="295.5" y="7"/><ellipse cx="310.5" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M306.4219,21.7344 L306.4219,19.5781 L313.8125,19.5781 L313.8125,21.7344 L311.3438,21.7344 L [...]
 reverse link com.vladsch.flexmark.parser.Parser.ParserExtension to org.apache.wiki.markdown.MarkdownForJSPWikiExtension--><path codeLine="22" d="M184.84,93.36 C200.07,107.99 216.81,124.09 232.32,139 " fill="none" id="com.vladsch.flexmark.parser.Parser.ParserExtension-backto-org.apache.wiki.markdown.MarkdownForJSPWikiExtension" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="179.8,98.22,170.23,79.31,189.5,88.12,179.8,98.22" style="stroke:#A8 [...]
-reverse link com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension to org.apache.wiki.markdown.MarkdownForJSPWikiExtension--><path codeLine="23" d="M392.82,93.36 C377.5,107.99 360.65,124.09 345.04,139 " fill="none" id="com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension-backto-org.apache.wiki.markdown.MarkdownForJSPWikiExtension" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="388.23,88.06,407.53,79.31,397.9,98.19,388.23,88. [...]
+reverse link com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension to org.apache.wiki.markdown.MarkdownForJSPWikiExtension--><path codeLine="23" d="M392.82,93.36 C377.5,107.99 360.65,124.09 345.04,139 " fill="none" id="com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension-backto-org.apache.wiki.markdown.MarkdownForJSPWikiExtension" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="388.23,88.06,407.53,79.31,397.9,98.19,388.23,88. [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -38,5 +38,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtension.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtension.svg
index 53500865e7..8d8c528a6c 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtension.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/MarkdownSetupEngineLifecycleExtension.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="194px" preserveAspectRatio="none" style="width:339px;height:194px;background:#FFFFFF;" version="1.1" viewBox="0 0 339 194" width="339px" zoomAndPan="magnify"><defs><filter height="300%" id="f1sjpz3zvasjbd" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.markdown.MarkdownSetupEngineLifecycleExtension--><a href="MarkdownSetupEngineLifecycleExtension.html" target="_top" title="MarkdownSetupEngineLifecycleExtension.html" xlink:actuate="onRequest" xlink:href="MarkdownSetupEngineLifecycleExtension.html" xlink:show="new" xlink:title="MarkdownSetupEngineLifecycleExtension.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1sjpz3zvasjbd)" height="58.7422" id="org.apache.wiki.markdown.MarkdownSetupEngi [...]
 class org.apache.wiki.api.engine.EngineLifecycleExtension--><a href="../api/engine/EngineLifecycleExtension.html" target="_top" title="../api/engine/EngineLifecycleExtension.html" xlink:actuate="onRequest" xlink:href="../api/engine/EngineLifecycleExtension.html" xlink:show="new" xlink:title="../api/engine/EngineLifecycleExtension.html" xlink:type="simple"><rect codeLine="9" fill="#FEFECE" filter="url(#f1sjpz3zvasjbd)" height="37.9375" id="org.apache.wiki.api.engine.EngineLifecycleExtensi [...]
-reverse link org.apache.wiki.api.engine.EngineLifecycleExtension to org.apache.wiki.markdown.MarkdownSetupEngineLifecycleExtension--><path codeLine="11" d="M166,65.22 C166,78.3 166,92.7 166,104.89 " fill="none" id="org.apache.wiki.api.engine.EngineLifecycleExtension-backto-org.apache.wiki.markdown.MarkdownSetupEngineLifecycleExtension" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="159,65.07,166,45.07,173,65.07,159,65.07" style="stroke:#A8 [...]
+reverse link org.apache.wiki.api.engine.EngineLifecycleExtension to org.apache.wiki.markdown.MarkdownSetupEngineLifecycleExtension--><path codeLine="11" d="M166,65.22 C166,78.3 166,92.7 166,104.89 " fill="none" id="org.apache.wiki.api.engine.EngineLifecycleExtension-backto-org.apache.wiki.markdown.MarkdownSetupEngineLifecycleExtension" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" points="159,65.07,166,45.07,173,65.07,159,65.07" style="stroke:#A8 [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -24,5 +24,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.svg
index ab1e4e1157..9e97a2b1aa 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ExternalLinkAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:484px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 484 231" width="484px" zoomAndPan="magnify"><defs><filter height="300%" id="f1ku1fzntuaej7" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ExternalLinkAttributeProviderState--><a href="ExternalLinkAttributeProviderState.html" target="_top" title="ExternalLinkAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="ExternalLinkAttributeProviderState.html" xlink:show="new" xlink:title="ExternalLinkAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1ku1fzntuaej7)" height="71.5469" id="org.apache.wiki [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1ku1fzntuaej7)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attri [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ExternalLinkAttributeProviderState--><path codeLine="14" d="M238.5,89.46 C238.5,102.64 238.5,116.64 238.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ExternalLinkAttri [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ExternalLinkAttributeProviderState--><path codeLine="14" d="M238.5,89.46 C238.5,102.64 238.5,116.64 238.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ExternalLinkAttri [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.svg
index 6f4ccd4cd7..432f3a8941 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/ImageLinkAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:462px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 462 231" width="462px" zoomAndPan="magnify"><defs><filter height="300%" id="f11qykp9v3neq4" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ImageLinkAttributeProviderState--><a href="ImageLinkAttributeProviderState.html" target="_top" title="ImageLinkAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="ImageLinkAttributeProviderState.html" xlink:show="new" xlink:title="ImageLinkAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f11qykp9v3neq4)" height="71.5469" id="org.apache.wiki.markdown.exten [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f11qykp9v3neq4)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attri [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ImageLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ImageLinkAttributePr [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ImageLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.ImageLinkAttributePr [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.svg
index 9ae02b470c..27768e4c89 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/InterWikiLinkAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:485px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 485 231" width="485px" zoomAndPan="magnify"><defs><filter height="300%" id="f1ar08kz0oyxv2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.InterWikiLinkAttributeProviderState--><a href="InterWikiLinkAttributeProviderState.html" target="_top" title="InterWikiLinkAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="InterWikiLinkAttributeProviderState.html" xlink:show="new" xlink:title="InterWikiLinkAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1ar08kz0oyxv2)" height="71.5469" id="org.apache [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1ar08kz0oyxv2)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attri [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.InterWikiLinkAttributeProviderState--><path codeLine="14" d="M239,89.46 C239,102.64 239,116.64 239,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.InterWikiLinkAttributePr [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.InterWikiLinkAttributeProviderState--><path codeLine="14" d="M239,89.46 C239,102.64 239,116.64 239,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.InterWikiLinkAttributePr [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.svg
index 323005cdf6..6ec6a90e5f 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProvider.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="261px" preserveAspectRatio="none" style="width:396px;height:261px;background:#FFFFFF;" version="1.1" viewBox="0 0 396 261" width="396px" zoomAndPan="magnify"><defs><filter height="300%" id="fj1keextumue0" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProvider--><a href="JSPWikiLinkAttributeProvider.html" target="_top" title="JSPWikiLinkAttributeProvider.html" xlink:actuate="onRequest" xlink:href="JSPWikiLinkAttributeProvider.html" xlink:show="new" xlink:title="JSPWikiLinkAttributeProvider.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fj1keextumue0)" height="105.1563" id="org.apache.wiki.markdown.extensions.jspwikili [...]
 class com.vladsch.flexmark.html.AttributeProvider--><rect codeLine="12" fill="#FEFECE" filter="url(#fj1keextumue0)" height="58.7422" id="com.vladsch.flexmark.html.AttributeProvider" style="stroke:#A80036;stroke-width:1.5;" width="371" x="10" y="7"/><ellipse cx="122.75" cy="25.9688" fill="#B4A7E5" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M118.6719,21.7344 L118.6719,19.5781 L126.0625,19.5781 L126.0625,21.7344 L123.5938,21.7344 L123.5938,29.8125 L126.0625,29.8125 L [...]
-reverse link com.vladsch.flexmark.html.AttributeProvider to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProvider--><path codeLine="16" d="M195.5,86.38 C195.5,99.17 195.5,113.01 195.5,125.94 " fill="none" id="com.vladsch.flexmark.html.AttributeProvider-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" point [...]
+reverse link com.vladsch.flexmark.html.AttributeProvider to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProvider--><path codeLine="16" d="M195.5,86.38 C195.5,99.17 195.5,113.01 195.5,125.94 " fill="none" id="com.vladsch.flexmark.html.AttributeProvider-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProvider" style="stroke:#A80036;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="none" point [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -29,5 +29,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.svg
index c54c246247..cbeabd87ab 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/JSPWikiLinkAttributeProviderFactory.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="207px" preserveAspectRatio="none" style="width:435px;height:207px;background:#FFFFFF;" version="1.1" viewBox="0 0 435 207" width="435px" zoomAndPan="magnify"><defs><filter height="300%" id="fe3b4gthkpp0f" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProviderFactory--><a href="JSPWikiLinkAttributeProviderFactory.html" target="_top" title="JSPWikiLinkAttributeProviderFactory.html" xlink:actuate="onRequest" xlink:href="JSPWikiLinkAttributeProviderFactory.html" xlink:show="new" xlink:title="JSPWikiLinkAttributeProviderFactory.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fe3b4gthkpp0f)" height="71.5469" id="org.apache. [...]
 class com.vladsch.flexmark.html.IndependentAttributeProviderFactory--><rect codeLine="10" fill="#FEFECE" filter="url(#fe3b4gthkpp0f)" height="37.9375" id="com.vladsch.flexmark.html.IndependentAttributeProviderFactory" style="stroke:#A80036;stroke-width:1.5;" width="289" x="69.5" y="7"/><ellipse cx="84.5" cy="25.9688" fill="#A9DCDF" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M84.6094,21.3125 L83.4531,26.3906 L85.7813,26.3906 L84.6094,21.3125 Z M83.125,19.0781 L86.1 [...]
-reverse link com.vladsch.flexmark.html.IndependentAttributeProviderFactory to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProviderFactory--><path codeLine="12" d="M214,65.3 C214,78 214,92.08 214,104.56 " fill="none" id="com.vladsch.flexmark.html.IndependentAttributeProviderFactory-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProviderFactory" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill= [...]
+reverse link com.vladsch.flexmark.html.IndependentAttributeProviderFactory to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProviderFactory--><path codeLine="12" d="M214,65.3 C214,78 214,92.08 214,104.56 " fill="none" id="com.vladsch.flexmark.html.IndependentAttributeProviderFactory-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.JSPWikiLinkAttributeProviderFactory" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill= [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -25,5 +25,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.svg
index 5620633d09..cdde357e0d 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalEditLinkAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:462px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 462 231" width="462px" zoomAndPan="magnify"><defs><filter height="300%" id="f1hyhr3511awlw" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalEditLinkAttributeProviderState--><a href="LocalEditLinkAttributeProviderState.html" target="_top" title="LocalEditLinkAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="LocalEditLinkAttributeProviderState.html" xlink:show="new" xlink:title="LocalEditLinkAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1hyhr3511awlw)" height="71.5469" id="org.apache [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1hyhr3511awlw)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attri [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalEditLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalEditLinkAtt [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalEditLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalEditLinkAtt [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.svg
index 7ac47a6420..b1cc9b4559 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteLinkAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:462px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 462 231" width="462px" zoomAndPan="magnify"><defs><filter height="300%" id="fpg15uab6lr4j" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFootnoteLinkAttributeProviderState--><a href="LocalFootnoteLinkAttributeProviderState.html" target="_top" title="LocalFootnoteLinkAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="LocalFootnoteLinkAttributeProviderState.html" xlink:show="new" xlink:title="LocalFootnoteLinkAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#fpg15uab6lr4j)" height="71.5 [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#fpg15uab6lr4j)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attrib [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFootnoteLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFootnot [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFootnoteLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFootnot [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.svg
index 514c133dbf..2081f87871 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalFootnoteRefLinkAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:462px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 462 231" width="462px" zoomAndPan="magnify"><defs><filter height="300%" id="f1v7huttuiazng" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFootnoteRefLinkAttributeProviderState--><a href="LocalFootnoteRefLinkAttributeProviderState.html" target="_top" title="LocalFootnoteRefLinkAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="LocalFootnoteRefLinkAttributeProviderState.html" xlink:show="new" xlink:title="LocalFootnoteRefLinkAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1v7huttuiazn [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1v7huttuiazng)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attri [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFootnoteRefLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFoot [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFootnoteRefLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalFoot [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.svg
index f427753d4c..95d3e12bf4 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalLinkAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:467px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 467 231" width="467px" zoomAndPan="magnify"><defs><filter height="300%" id="flao6g0gmfikz" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviatio [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalLinkAttributeProviderState--><a href="LocalLinkAttributeProviderState.html" target="_top" title="LocalLinkAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="LocalLinkAttributeProviderState.html" xlink:show="new" xlink:title="LocalLinkAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#flao6g0gmfikz)" height="71.5469" id="org.apache.wiki.markdown.extens [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#flao6g0gmfikz)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attrib [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalLinkAttributeProviderState--><path codeLine="14" d="M230,89.46 C230,102.64 230,116.64 230,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalLinkAttributeProviderSt [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalLinkAttributeProviderState--><path codeLine="14" d="M230,89.46 C230,102.64 230,116.64 230,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalLinkAttributeProviderSt [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.svg
index 2dc988e2a7..600d0fccfb 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/LocalReadLinkAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:462px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 462 231" width="462px" zoomAndPan="magnify"><defs><filter height="300%" id="f1w0ik8cngbxv9" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalReadLinkAttributeProviderState--><a href="LocalReadLinkAttributeProviderState.html" target="_top" title="LocalReadLinkAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="LocalReadLinkAttributeProviderState.html" xlink:show="new" xlink:title="LocalReadLinkAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f1w0ik8cngbxv9)" height="71.5469" id="org.apache [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f1w0ik8cngbxv9)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attri [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalReadLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalReadLinkAtt [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalReadLinkAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.LocalReadLinkAtt [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/NodeAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/NodeAttributeProviderState.svg
index 162064cc0a..0533d618e5 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/NodeAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/NodeAttributeProviderState.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="90px" preserveAspectRatio="none" style="width:491px;height:90px;background:#FFFFFF;" version="1.1" viewBox="0 0 491 90" width="491px" zoomAndPan="magnify"><defs><filter height="300%" id="f2tpkl3ng55ru" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation=" [...]
-class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f2tpkl3ng55ru)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attribu [...]
+class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f2tpkl3ng55ru)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attribu [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -18,5 +18,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
 Language: en
-Country: null
+Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.svg b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.svg
index d0d42230cc..eb7cafd29c 100644
--- a/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.svg
+++ b/apidocs/2.12.2-SNAPSHOT/org/apache/wiki/markdown/extensions/jspwikilinks/attributeprovider/WysiwygEditingAttributeProviderState.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="231px" preserveAspectRatio="none" style="width:462px;height:231px;background:#FFFFFF;" version="1.1" viewBox="0 0 462 231" width="462px" zoomAndPan="magnify"><defs><filter height="300%" id="f16pn6h65xajrr" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviati [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.WysiwygEditingAttributeProviderState--><a href="WysiwygEditingAttributeProviderState.html" target="_top" title="WysiwygEditingAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="WysiwygEditingAttributeProviderState.html" xlink:show="new" xlink:title="WysiwygEditingAttributeProviderState.html" xlink:type="simple"><rect codeLine="5" fill="#FEFECE" filter="url(#f16pn6h65xajrr)" height="71.5469" id="org.a [...]
 class org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState--><a href="NodeAttributeProviderState.html" target="_top" title="NodeAttributeProviderState.html" xlink:actuate="onRequest" xlink:href="NodeAttributeProviderState.html" xlink:show="new" xlink:title="NodeAttributeProviderState.html" xlink:type="simple"><rect codeLine="10" fill="#FEFECE" filter="url(#f16pn6h65xajrr)" height="58.7422" id="org.apache.wiki.markdown.extensions.jspwikilinks.attri [...]
-reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.WysiwygEditingAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.WysiwygEditingA [...]
+reverse link org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState to org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.WysiwygEditingAttributeProviderState--><path codeLine="14" d="M227.5,89.46 C227.5,102.64 227.5,116.64 227.5,128.9 " fill="none" id="org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.NodeAttributeProviderState-backto-org.apache.wiki.markdown.extensions.jspwikilinks.attributeprovider.WysiwygEditingA [...]
 @startuml
     set namespaceSeparator none
     hide empty fields
@@ -27,5 +27,5 @@ Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Default Encoding: UTF-8
... 20491 lines suppressed ...