You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/11/15 20:22:49 UTC

[juneau] branch master updated: Move doc topics to a more convenient location.

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

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


The following commit(s) were added to refs/heads/master by this push:
     new dc806d1  Move doc topics to a more convenient location.
dc806d1 is described below

commit dc806d1a47b69069914133b41522393eec6d59e2
Author: JamesBognar <ja...@apache.org>
AuthorDate: Thu Nov 15 15:22:37 2018 -0500

    Move doc topics to a more convenient location.
---
 juneau-doc/.classpath                               |  11 -----------
 .../.settings/org.eclipse.core.resources.prefs      |   2 --
 .../resources => docs}/Topics/01.Introduction.html  |   0
 .../Topics/01.Introduction/01.Features.html         |   0
 .../Topics/01.Introduction/02.Components.html       |   0
 .../Topics/02.juneau-marshall.html                  |   0
 .../Topics/02.juneau-marshall/01.Serializers.html   |   0
 .../Topics/02.juneau-marshall/02.Parsers.html       |   0
 .../Topics/02.juneau-marshall/03.Marshalls.html     |   0
 .../02.juneau-marshall/04.HttpPartSerializers.html  |   0
 .../02.juneau-marshall/05.HttpPartParsers.html      |   0
 .../06.ConfigurableProperties.html                  |   0
 .../06.ConfigurableProperties/01.Common.html        |   0
 .../02.CommonSerializer.html                        |   0
 .../06.ConfigurableProperties/03.CommonParser.html  |   0
 .../Topics/02.juneau-marshall/07.ObjectMap.html     |   0
 .../Topics/02.juneau-marshall/08.Groups.html        |   0
 .../09.ContextsBuildersSessionsPropertyStores.html  |   0
 .../Topics/02.juneau-marshall/10.Transforms.html    |   0
 .../10.Transforms/01.PojoSwaps.html                 |   0
 .../10.Transforms/02.PerMediaTypePojoSwaps.html     |   0
 .../10.Transforms/03.OneWayPojoSwaps.html           |   0
 .../10.Transforms/04.SwapAnnotation.html            |   0
 .../10.Transforms/05.TemplatedSwaps.html            |   0
 .../10.Transforms/06.SwapMethods.html               |   0
 .../10.Transforms/07.SurrogateClasses.html          |   0
 .../10.Transforms/08.BeanAnnotation.html            |   0
 .../10.Transforms/09.BeanPropertyAnnotation.html    |   0
 .../10.Transforms/10.BeanConstructorAnnotation.html |   0
 .../10.Transforms/11.BeanIgnoreAnnotation.html      |   0
 .../10.Transforms/12.NamePropertyAnnotation.html    |   0
 .../10.Transforms/13.ParentPropertyAnnotation.html  |   0
 .../10.Transforms/14.PojoBuilders.html              |   0
 .../10.Transforms/15.BeanFilters.html               |   0
 .../10.Transforms/16.InterfaceFilters.html          |   0
 .../10.Transforms/17.StopClasses.html               |   0
 .../10.Transforms/18.BypassSerialization.html       |   0
 .../02.juneau-marshall/11.BeanDictionaries.html     |   0
 .../11.BeanDictionaries/01.BeanSubTypes.html        |   0
 .../Topics/02.juneau-marshall/12.VirtualBeans.html  |   0
 .../Topics/02.juneau-marshall/13.Recursion.html     |   0
 .../14.ParsingIntoGenericModels.html                |   0
 .../15.ReadingContinuousStreams.html                |   0
 .../Topics/02.juneau-marshall/16.URIs.html          |   0
 .../02.juneau-marshall/17.JacksonComparison.html    |   0
 .../02.juneau-marshall/18.PojoCategories.html       |   0
 .../Topics/02.juneau-marshall/19.JsonDetails.html   |   0
 .../19.JsonDetails/01.Methodology.html              |   0
 .../19.JsonDetails/02.Serializers.html              |   0
 .../19.JsonDetails/03.SimplifiedJson.html           |   0
 .../19.JsonDetails/04.Parsers.html                  |   0
 .../19.JsonDetails/05.JsonAnnotation.html           |   0
 .../19.JsonDetails/06.JsonSchema.html               |   0
 .../Topics/02.juneau-marshall/20.XmlDetails.html    |   0
 .../20.XmlDetails/01.Methodology.html               |   0
 .../20.XmlDetails/02.Serializers.html               |   0
 .../20.XmlDetails/03.Parsers.html                   |   0
 .../20.XmlDetails/04.BeanTypeNameAnnotation.html    |   0
 .../20.XmlDetails/05.XmlChildNameAnnotation.html    |   0
 .../20.XmlDetails/06.XmlFormatAnnotation.html       |   0
 .../20.XmlDetails/07.Namespaces.html                |   0
 .../20.XmlDetails/08.XmlSchema.html                 |   0
 .../Topics/02.juneau-marshall/21.HtmlDetails.html   |   0
 .../21.HtmlDetails/01.Methodology.html              |   0
 .../21.HtmlDetails/02.Serializers.html              |   0
 .../21.HtmlDetails/03.Parsers.html                  |   0
 .../21.HtmlDetails/04.HtmlAnnotation.html           |   0
 .../21.HtmlDetails/05.HtmlRenderAnnotation.html     |   0
 .../21.HtmlDetails/06.HtmlDocSerializer.html        |   0
 .../21.HtmlDetails/07.BasicHtmlDocTemplate.html     |   0
 .../21.HtmlDetails/08.CustomTemplates.html          |   0
 .../21.HtmlDetails/09.HtmlSchema.html               |   0
 .../Topics/02.juneau-marshall/22.UonDetails.html    |   0
 .../22.UonDetails/01.Methodology.html               |   0
 .../22.UonDetails/02.Serializers.html               |   0
 .../22.UonDetails/03.Parsers.html                   |   0
 .../02.juneau-marshall/23.UrlEncodingDetails.html   |   0
 .../23.UrlEncodingDetails/01.Methodology.html       |   0
 .../23.UrlEncodingDetails/02.Serializers.html       |   0
 .../23.UrlEncodingDetails/03.Parsers.html           |   0
 .../04.UrlEncodingAnnotation.html                   |   0
 .../02.juneau-marshall/24.MsgPackDetails.html       |   0
 .../24.MsgPackDetails/01.Serializers.html           |   0
 .../24.MsgPackDetails/02.Parsers.html               |   0
 .../02.juneau-marshall/25.OpenApiDetails.html       |   0
 .../25.OpenApiDetails/01.Methodology.html           |   0
 .../25.OpenApiDetails/02.Serializers.html           |   0
 .../25.OpenApiDetails/03.Parsers.html               |   0
 .../Topics/02.juneau-marshall/26.BestPractices.html |   0
 .../Topics/02.juneau-marshall/doc-files/rfc_uon.txt |   0
 .../Topics/03.juneau-marshall-rdf.html              |   0
 .../03.juneau-marshall-rdf/01.RdfDetails.html       |   0
 .../01.RdfDetails/01.Serializers.html               |   0
 .../01.RdfDetails/02.Parsers.html                   |   0
 .../01.RdfDetails/03.RdfAnnotation.html             |   0
 .../01.RdfDetails/04.Namespaces.html                |   0
 .../01.RdfDetails/05.UriProperties.html             |   0
 .../01.RdfDetails/06.RootProperty.html              |   0
 .../01.RdfDetails/07.TypedLiterals.html             |   0
 .../resources => docs}/Topics/04.juneau-dto.html    |   0
 .../Topics/04.juneau-dto/01.HTML5.html              |   0
 .../Topics/04.juneau-dto/02.Atom.html               |   0
 .../Topics/04.juneau-dto/03.Swagger.html            |   0
 .../Topics/04.juneau-dto/04.SwaggerUI.html          |   0
 .../04.juneau-dto/doc-files/SwaggerUI.html.png      | Bin
 .../04.juneau-dto/doc-files/SwaggerUI.json.png      | Bin
 .../resources => docs}/Topics/05.juneau-svl.html    |   0
 .../Topics/05.juneau-svl/01.SimpleVarLanguage.html  |   0
 .../Topics/05.juneau-svl/02.SvlVariables.html       |   0
 .../Topics/05.juneau-svl/03.VarResolvers.html       |   0
 .../Topics/05.juneau-svl/04.OtherNotes.html         |   0
 .../resources => docs}/Topics/06.juneau-config.html |   0
 .../Topics/06.juneau-config/01.Overview.html        |   0
 .../01.Overview/01.SyntaxRules.html                 |   0
 .../Topics/06.juneau-config/02.EntryTypes.html      |   0
 .../02.EntryTypes/01.PrimitiveTypes.html            |   0
 .../06.juneau-config/02.EntryTypes/02.POJOs.html    |   0
 .../06.juneau-config/02.EntryTypes/03.Arrays.html   |   0
 .../02.EntryTypes/04.Collections.html               |   0
 .../02.EntryTypes/05.BinaryData.html                |   0
 .../Topics/06.juneau-config/03.Variables.html       |   0
 .../03.Variables/01.LogicVariables.html             |   0
 .../Topics/06.juneau-config/04.EncodedEntries.html  |   0
 .../Topics/06.juneau-config/05.SectionMaps.html     |   0
 .../Topics/06.juneau-config/06.SectionBeans.html    |   0
 .../06.juneau-config/07.SectionInterfaces.html      |   0
 .../Topics/06.juneau-config/08.SettingValues.html   |   0
 .../08.SettingValues/01.FileSystemChanges.html      |   0
 .../02.CustomEntrySerialization.html                |   0
 .../08.SettingValues/03.BulkSettingValues.html      |   0
 .../Topics/06.juneau-config/09.Listeners.html       |   0
 .../Topics/06.juneau-config/10.Serializing.html     |   0
 .../Topics/06.juneau-config/11.ConfigStores.html    |   0
 .../11.ConfigStores/01.ConfigMemoryStore.html       |   0
 .../11.ConfigStores/02.ConfigFileStore.html         |   0
 .../11.ConfigStores/03.CustomConfigStores.html      |   0
 .../11.ConfigStores/04.ConfigStoreListeners.html    |   0
 .../Topics/06.juneau-config/12.ReadOnlyConfigs.html |   0
 .../Topics/06.juneau-config/13.ClosingConfigs.html  |   0
 .../doc-files/juneau-config.Serializing.1.png       | Bin
 .../doc-files/juneau-config.Serializing.2.png       | Bin
 .../doc-files/juneau-config.Serializing.3.png       | Bin
 .../Topics/07.juneau-rest-server.html               |   0
 .../07.juneau-rest-server/01.HelloWorldExample.html |   0
 .../07.juneau-rest-server/02.ClassHierarchy.html    |   0
 .../07.juneau-rest-server/03.Instantiation.html     |   0
 .../03.Instantiation/01.RestServlet.html            |   0
 .../03.Instantiation/02.BasicRestServlet.html       |   0
 .../03.Instantiation/03.Children.html               |   0
 .../03.Instantiation/04.RouterPages.html            |   0
 .../03.Instantiation/05.ResourceResolvers.html      |   0
 .../03.Instantiation/06.LifecycleHooks.html         |   0
 .../07.juneau-rest-server/04.RestResource.html      |   0
 .../04.RestResource/01.AnnotationInheritance.html   |   0
 .../07.juneau-rest-server/05.RestContext.html       |   0
 .../Topics/07.juneau-rest-server/06.RestMethod.html |   0
 .../06.RestMethod/01.MethodParameters.html          |   0
 .../06.RestMethod/02.RestRequest.html               |   0
 .../06.RestMethod/03.RestResponse.html              |   0
 .../06.RestMethod/04.RequestBody.html               |   0
 .../06.RestMethod/05.RequestHeaders.html            |   0
 .../06.RestMethod/06.RequestQuery.html              |   0
 .../06.RestMethod/07.RequestFormData.html           |   0
 .../06.RestMethod/08.RestMethodPath.html            |   0
 .../06.RestMethod/09.RequestPathMatch.html          |   0
 .../06.RestMethod/10.MethodReturnTypes.html         |   0
 .../06.RestMethod/11.ReaderResource.html            |   0
 .../06.RestMethod/12.StreamResource.html            |   0
 .../06.RestMethod/13.RestMethodMatchers.html        |   0
 .../06.RestMethod/14.PredefinedResponses.html       |   0
 .../06.RestMethod/15.PredefinedExceptions.html      |   0
 .../06.RestMethod/16.PredefinedHelperBeans.html     |   0
 .../Topics/07.juneau-rest-server/07.restRPC.html    |   0
 .../08.OpenApiSchemaPartParsing.html                |   0
 .../09.OpenApiSchemaPartSerializing.html            |   0
 .../10.HttpPartAnnotations.html                     |   0
 .../10.HttpPartAnnotations/01.Body.html             |   0
 .../10.HttpPartAnnotations/02.FormData.html         |   0
 .../10.HttpPartAnnotations/03.HasFormData.html      |   0
 .../10.HttpPartAnnotations/04.Query.html            |   0
 .../10.HttpPartAnnotations/05.HasQuery.html         |   0
 .../10.HttpPartAnnotations/06.Header.html           |   0
 .../10.HttpPartAnnotations/07.Path.html             |   0
 .../10.HttpPartAnnotations/08.Request.html          |   0
 .../10.HttpPartAnnotations/09.Response.html         |   0
 .../10.HttpPartAnnotations/10.ResponseHeader.html   |   0
 .../10.HttpPartAnnotations/11.ResponseStatus.html   |   0
 .../07.juneau-rest-server/11.HandlingFormPosts.html |   0
 .../12.HandlingMultiPartFormPosts.html              |   0
 .../07.juneau-rest-server/13.Serializers.html       |   0
 .../Topics/07.juneau-rest-server/14.Parsers.html    |   0
 .../Topics/07.juneau-rest-server/15.Properties.html |   0
 .../Topics/07.juneau-rest-server/16.Transforms.html |   0
 .../Topics/07.juneau-rest-server/17.URIs.html       |   0
 .../Topics/07.juneau-rest-server/18.Guards.html     |   0
 .../Topics/07.juneau-rest-server/19.Converters.html |   0
 .../Topics/07.juneau-rest-server/20.Messages.html   |   0
 .../Topics/07.juneau-rest-server/21.Encoders.html   |   0
 .../07.juneau-rest-server/22.SvlVariables.html      |   0
 .../23.ConfigurationFiles.html                      |   0
 .../07.juneau-rest-server/24.StaticFiles.html       |   0
 .../07.juneau-rest-server/25.ClientVersioning.html  |   0
 .../07.juneau-rest-server/26.RestInfoProvider.html  |   0
 .../01.BasicRestInfoProvider.html                   |   0
 .../Topics/07.juneau-rest-server/27.Swagger.html    |   0
 .../27.Swagger/01.BasicRestServlet.html             |   0
 .../27.Swagger/02.BasicSwaggerInfo.html             |   0
 .../07.juneau-rest-server/27.Swagger/03.Tags.html   |   0
 .../27.Swagger/04.Operations.html                   |   0
 .../27.Swagger/05.Parameters.html                   |   0
 .../27.Swagger/06.ParameterExamples.html            |   0
 .../27.Swagger/07.Responses.html                    |   0
 .../27.Swagger/08.ResponseExamples.html             |   0
 .../07.juneau-rest-server/27.Swagger/09.Models.html |   0
 .../27.Swagger/10.Stylesheet.html                   |   0
 .../juneau-rest-server.Swagger.Models.1.png         | Bin
 .../juneau-rest-server.Swagger.Models.2.png         | Bin
 .../juneau-rest-server.Swagger.Models.3.png         | Bin
 .../juneau-rest-server.Swagger.Operations.1.png     | Bin
 .../juneau-rest-server.Swagger.Operations.2.png     | Bin
 .../juneau-rest-server.Swagger.Operations.3.png     | Bin
 .../juneau-rest-server.Swagger.Operations.4.png     | Bin
 .../juneau-rest-server.Swagger.Parameters.1.png     | Bin
 .../juneau-rest-server.Swagger.Parameters.2.png     | Bin
 .../juneau-rest-server.Swagger.Parameters.3.png     | Bin
 .../juneau-rest-server.Swagger.Parameters.4.png     | Bin
 ...uneau-rest-server.Swagger.ResponseExamples.1.png | Bin
 ...uneau-rest-server.Swagger.ResponseExamples.2.png | Bin
 ...uneau-rest-server.Swagger.ResponseExamples.3.png | Bin
 ...uneau-rest-server.Swagger.ResponseExamples.4.png | Bin
 .../07.juneau-rest-server/28.HtmlDocAnnotation.html |   0
 .../28.HtmlDocAnnotation/01.UIvsDI.html             |   0
 .../28.HtmlDocAnnotation/02.Widgets.html            |   0
 .../28.HtmlDocAnnotation/03.PredefinedWidgets.html  |   0
 .../28.HtmlDocAnnotation/04.UiCustomization.html    |   0
 .../28.HtmlDocAnnotation/05.Stylesheets.html        |   0
 ...server.HtmlDocAnnotation.PredefinedWidgets.1.png | Bin
 ...server.HtmlDocAnnotation.PredefinedWidgets.2.png | Bin
 ...server.HtmlDocAnnotation.PredefinedWidgets.3.png | Bin
 ...server.HtmlDocAnnotation.PredefinedWidgets.4.png | Bin
 .../07.juneau-rest-server/29.DefaultHeaders.html    |   0
 .../30.LoggingAndErrorHandling.html                 |   0
 .../07.juneau-rest-server/31.HttpStatusCodes.html   |   0
 .../32.OverloadingHttpMethods.html                  |   0
 .../07.juneau-rest-server/33.BuiltInParameters.html |   0
 .../34.CustomSerializersAndParsers.html             |   0
 .../07.juneau-rest-server/35.UsingWithOsgi.html     |   0
 .../07.juneau-rest-server/36.UnitTesting.html       |   0
 .../Topics/07.juneau-rest-server/37.Injection.html  |   0
 .../Topics/07.juneau-rest-server/38.HTTP2.html      |   0
 .../Topics/07.juneau-rest-server/39.OtherNotes.html |   0
 .../juneau-rest-server.HelloWorldExample.1.png      | Bin
 .../doc-files/juneau-rest-server.OptionsPages.1.png | Bin
 .../juneau-rest-server.PredefinedLabelBeans.1.png   | Bin
 .../juneau-rest-server.PredefinedLabelBeans.2.png   | Bin
 .../juneau-rest-server.PredefinedLabelBeans.3.png   | Bin
 .../juneau-rest-server.PredefinedLabelBeans.4.png   | Bin
 .../doc-files/juneau-rest-server.RouterPages.1.png  | Bin
 .../doc-files/juneau-rest-server.Stylesheets.0.png  | Bin
 .../doc-files/juneau-rest-server.Stylesheets.1.png  | Bin
 .../doc-files/juneau-rest-server.Stylesheets.2.png  | Bin
 .../doc-files/juneau-rest-server.Stylesheets.3.png  | Bin
 .../doc-files/juneau-rest-server.Swagger.1.png      | Bin
 .../doc-files/juneau-rest-server.Swagger.2.png      | Bin
 .../doc-files/juneau-rest-server.Swagger.3.png      | Bin
 .../doc-files/juneau-rest-server.Swagger.4.png      | Bin
 .../doc-files/juneau-rest-server.Swagger.5.png      | Bin
 .../juneau-rest-server.UiCustomization.1.png        | Bin
 .../juneau-rest-server.UiCustomization.2.png        | Bin
 .../juneau-rest-server.UiCustomization.3.png        | Bin
 .../doc-files/juneau-rest-server.restRPC.1.png      | Bin
 .../doc-files/juneau-rest-server.restRPC.2.png      | Bin
 .../doc-files/juneau-rest-server.restRPC.3.png      | Bin
 .../doc-files/juneau-rest-server.restRPC.4.png      | Bin
 .../doc-files/juneau-rest-server.restRPC.5.png      | Bin
 .../doc-files/juneau-rest-server.restRPC.6.png      | Bin
 .../doc-files/juneau-rest-server.restRPC.7.png      | Bin
 .../doc-files/juneau-rest-server.restRPC.8.png      | Bin
 .../doc-files/juneau-rest-server.restRPC.9.png      | Bin
 .../Topics/08.juneau-rest-server-jaxrs.html         |   0
 .../01.BaseProvider.html                            |   0
 .../Topics/09.juneau-rest-client.html               |   0
 .../09.juneau-rest-client/01.RestProxies.html       |   0
 .../01.RestProxies/01.RemoteResource.html           |   0
 .../01.RestProxies/02.RemoteMethod.html             |   0
 .../01.RestProxies/03.Body.html                     |   0
 .../01.RestProxies/04.FormData.html                 |   0
 .../01.RestProxies/05.Query.html                    |   0
 .../01.RestProxies/06.Header.html                   |   0
 .../01.RestProxies/07.Path.html                     |   0
 .../01.RestProxies/08.Request.html                  |   0
 .../01.RestProxies/09.Response.html                 |   0
 .../01.RestProxies/10.DualPurposeInterfaces.html    |   0
 .../Topics/09.juneau-rest-client/02.SSL.html        |   0
 .../09.juneau-rest-client/03.Authentication.html    |   0
 .../03.Authentication/01.BASIC.html                 |   0
 .../03.Authentication/02.FORM.html                  |   0
 .../03.Authentication/03.OIDC.html                  |   0
 .../09.juneau-rest-client/04.ResponsePatterns.html  |   0
 .../09.juneau-rest-client/05.PipingOutput.html      |   0
 .../Topics/09.juneau-rest-client/06.Debugging.html  |   0
 .../Topics/09.juneau-rest-client/07.Logging.html    |   0
 .../09.juneau-rest-client/08.Interceptors.html      |   0
 .../09.juneau-rest-client/09.UnitTesting.html       |   0
 .../Topics/09.juneau-rest-client/10.Other.html      |   0
 .../Topics/10.juneau-microservice-server.html       |   0
 .../01.Introduction.html                            |   0
 .../02.GettingStarted.html                          |   0
 .../02.GettingStarted/01.Installing.html            |   0
 .../02.GettingStarted/02.Running.html               |   0
 .../02.GettingStarted/03.Building.html              |   0
 .../10.juneau-microservice-server/03.Manifest.html  |   0
 .../03.Manifest/01.ManifestApi.html                 |   0
 .../10.juneau-microservice-server/04.Config.html    |   0
 .../04.Config/01.ConfigApi.html                     |   0
 .../05.ResourceClasses.html                         |   0
 .../06.PredefinedResourceClasses.html               |   0
 .../07.RestMicroservice.html                        |   0
 .../07.RestMicroservice/01.Extending.html           |   0
 .../08.UiCustomization.html                         |   0
 .../juneau-microservice-server.Installing.1.png     | Bin
 .../juneau-microservice-server.Installing.2.png     | Bin
 ...juneau-microservice-server.ResourceClasses.1.png | Bin
 .../juneau-microservice-server.Running.1.png        | Bin
 .../juneau-microservice.UiCustomization.1.png       | Bin
 .../Topics/11.juneau-examples-core.html             |   0
 .../doc-files/juneau-examples-core.1.png            | Bin
 .../doc-files/juneau-examples-core.2.png            | Bin
 .../doc-files/juneau-examples-core.3.png            | Bin
 .../Topics/12.juneau-examples-rest.html             |   0
 .../12.juneau-examples-rest/01.RootResources.html   |   0
 .../02.HelloWorldResource.html                      |   0
 .../03.PetStoreResource.html                        |   0
 .../12.juneau-examples-rest/04.DtoExamples.html     |   0
 .../12.juneau-examples-rest/05.ConfigResource.html  |   0
 .../12.juneau-examples-rest/06.LogsResource.html    |   0
 .../doc-files/juneau-examples-rest.1.png            | Bin
 .../doc-files/juneau-examples-rest.2.png            | Bin
 .../doc-files/juneau-examples-rest.3.png            | Bin
 .../doc-files/juneau-examples-rest.4.png            | Bin
 .../juneau-examples-rest.AtomFeedResource.1.png     | Bin
 .../juneau-examples-rest.AtomFeedResource.2.png     | Bin
 .../juneau-examples-rest.AtomFeedResource.3.png     | Bin
 .../juneau-examples-rest.ConfigResource.1.png       | Bin
 .../juneau-examples-rest.ConfigResource.2.png       | Bin
 ...uneau-examples-rest.DockerRegistryResource.1.png | Bin
 .../juneau-examples-rest.HelloWorldResource.1.png   | Bin
 .../juneau-examples-rest.HelloWorldResource.2.png   | Bin
 .../juneau-examples-rest.JsonSchemaResource.1.png   | Bin
 .../juneau-examples-rest.JsonSchemaResource.2.png   | Bin
 .../juneau-examples-rest.LogsResource.1.png         | Bin
 ...juneau-examples-rest.MethodExampleResource.1.png | Bin
 ...juneau-examples-rest.MethodExampleResource.2.png | Bin
 ...juneau-examples-rest.MethodExampleResource.3.png | Bin
 .../juneau-examples-rest.PetStoreResource.1.png     | Bin
 .../juneau-examples-rest.PetStoreResource.10a.png   | Bin
 .../juneau-examples-rest.PetStoreResource.10b.png   | Bin
 .../juneau-examples-rest.PetStoreResource.10c.png   | Bin
 .../juneau-examples-rest.PetStoreResource.11a.png   | Bin
 .../juneau-examples-rest.PetStoreResource.11b.png   | Bin
 .../juneau-examples-rest.PetStoreResource.2a.png    | Bin
 .../juneau-examples-rest.PetStoreResource.2b.png    | Bin
 .../juneau-examples-rest.PetStoreResource.2c.png    | Bin
 .../juneau-examples-rest.PetStoreResource.2d.png    | Bin
 .../juneau-examples-rest.PetStoreResource.3a.png    | Bin
 .../juneau-examples-rest.PetStoreResource.3b.png    | Bin
 .../juneau-examples-rest.PetStoreResource.4a.png    | Bin
 .../juneau-examples-rest.PetStoreResource.4b.png    | Bin
 .../juneau-examples-rest.PetStoreResource.5a.png    | Bin
 .../juneau-examples-rest.PetStoreResource.5b.png    | Bin
 .../juneau-examples-rest.PetStoreResource.6a.png    | Bin
 .../juneau-examples-rest.PetStoreResource.6b.png    | Bin
 .../juneau-examples-rest.PetStoreResource.7a.png    | Bin
 .../juneau-examples-rest.PetStoreResource.7b.png    | Bin
 .../juneau-examples-rest.PetStoreResource.8a.png    | Bin
 .../juneau-examples-rest.PetStoreResource.9a.png    | Bin
 .../juneau-examples-rest.PetStoreResource.9b.png    | Bin
 .../juneau-examples-rest.PetStoreResource.9c.png    | Bin
 .../juneau-examples-rest.PetStoreResource.9d.png    | Bin
 .../juneau-examples-rest.PetStoreResource.9e.png    | Bin
 .../juneau-examples-rest.PetStoreResource.9f.png    | Bin
 .../juneau-examples-rest.PetStoreResource.9g.png    | Bin
 .../juneau-examples-rest.PetStoreResource.9h.png    | Bin
 .../juneau-examples-rest.PhotosResource.1.png       | Bin
 .../juneau-examples-rest.PhotosResource.2.png       | Bin
 .../juneau-examples-rest.RequestEchoResource.1.png  | Bin
 .../juneau-examples-rest.RootResources.1.png        | Bin
 .../juneau-examples-rest.SqlQueryResource.1.png     | Bin
 .../juneau-examples-rest.SqlQueryResource.2.png     | Bin
 ...eau-examples-rest.SystemPropertiesResource.1.png | Bin
 ...eau-examples-rest.SystemPropertiesResource.2.png | Bin
 ...eau-examples-rest.SystemPropertiesResource.3.png | Bin
 .../juneau-examples-rest.TempDirResource.1.png      | Bin
 .../juneau-examples-rest.TempDirResource.2.png      | Bin
 .../juneau-examples-rest.TempDirResource.3.png      | Bin
 .../juneau-examples-rest.TumblrParserResource.1.png | Bin
 ...uneau-examples-rest.UrlEncodedFormResource.1.png | Bin
 ...uneau-examples-rest.UrlEncodedFormResource.2.png | Bin
 .../main/resources => docs}/Topics/13.Security.html |   0
 .../Topics/13.Security/01.juneau-marshall.html      |   0
 .../Topics/13.Security/02.juneau-svl.html           |   0
 .../Topics/13.Security/03.juneau-rest-server.html   |   0
 juneau-doc/juneau-doc.jar                           | Bin 23545 -> 23533 bytes
 juneau-doc/src/.DS_Store                            | Bin 6148 -> 0 bytes
 .../apache/juneau/doc/internal/DocGenerator.java    |   2 +-
 405 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/juneau-doc/.classpath b/juneau-doc/.classpath
index 6660033..96c9715 100644
--- a/juneau-doc/.classpath
+++ b/juneau-doc/.classpath
@@ -7,17 +7,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/juneau-doc/.settings/org.eclipse.core.resources.prefs b/juneau-doc/.settings/org.eclipse.core.resources.prefs
index 839d647..e9441bb 100644
--- a/juneau-doc/.settings/org.eclipse.core.resources.prefs
+++ b/juneau-doc/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/juneau-doc/src/main/resources/Topics/01.Introduction.html b/juneau-doc/docs/Topics/01.Introduction.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/01.Introduction.html
rename to juneau-doc/docs/Topics/01.Introduction.html
diff --git a/juneau-doc/src/main/resources/Topics/01.Introduction/01.Features.html b/juneau-doc/docs/Topics/01.Introduction/01.Features.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/01.Introduction/01.Features.html
rename to juneau-doc/docs/Topics/01.Introduction/01.Features.html
diff --git a/juneau-doc/src/main/resources/Topics/01.Introduction/02.Components.html b/juneau-doc/docs/Topics/01.Introduction/02.Components.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/01.Introduction/02.Components.html
rename to juneau-doc/docs/Topics/01.Introduction/02.Components.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall.html b/juneau-doc/docs/Topics/02.juneau-marshall.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall.html
rename to juneau-doc/docs/Topics/02.juneau-marshall.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/01.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/01.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/01.Serializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/01.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/02.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/02.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/02.Parsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/02.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/03.Marshalls.html b/juneau-doc/docs/Topics/02.juneau-marshall/03.Marshalls.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/03.Marshalls.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/03.Marshalls.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/04.HttpPartSerializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/04.HttpPartSerializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/04.HttpPartSerializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/04.HttpPartSerializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/05.HttpPartParsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/05.HttpPartParsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/05.HttpPartParsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/05.HttpPartParsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/06.ConfigurableProperties.html b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/06.ConfigurableProperties.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/06.ConfigurableProperties/01.Common.html b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/01.Common.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/06.ConfigurableProperties/01.Common.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/01.Common.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/06.ConfigurableProperties/02.CommonSerializer.html b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/02.CommonSerializer.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/06.ConfigurableProperties/02.CommonSerializer.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/02.CommonSerializer.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/06.ConfigurableProperties/03.CommonParser.html b/juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/03.CommonParser.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/06.ConfigurableProperties/03.CommonParser.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/06.ConfigurableProperties/03.CommonParser.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/07.ObjectMap.html b/juneau-doc/docs/Topics/02.juneau-marshall/07.ObjectMap.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/07.ObjectMap.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/07.ObjectMap.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/08.Groups.html b/juneau-doc/docs/Topics/02.juneau-marshall/08.Groups.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/08.Groups.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/08.Groups.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/09.ContextsBuildersSessionsPropertyStores.html b/juneau-doc/docs/Topics/02.juneau-marshall/09.ContextsBuildersSessionsPropertyStores.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/09.ContextsBuildersSessionsPropertyStores.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/09.ContextsBuildersSessionsPropertyStores.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/01.PojoSwaps.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/01.PojoSwaps.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/01.PojoSwaps.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/01.PojoSwaps.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/02.PerMediaTypePojoSwaps.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/02.PerMediaTypePojoSwaps.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/02.PerMediaTypePojoSwaps.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/02.PerMediaTypePojoSwaps.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/03.OneWayPojoSwaps.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/03.OneWayPojoSwaps.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/03.OneWayPojoSwaps.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/03.OneWayPojoSwaps.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/04.SwapAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/04.SwapAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/04.SwapAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/04.SwapAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/05.TemplatedSwaps.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/05.TemplatedSwaps.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/05.TemplatedSwaps.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/05.TemplatedSwaps.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/06.SwapMethods.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/06.SwapMethods.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/06.SwapMethods.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/06.SwapMethods.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/07.SurrogateClasses.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/07.SurrogateClasses.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/07.SurrogateClasses.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/07.SurrogateClasses.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/08.BeanAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/08.BeanAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/08.BeanAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/08.BeanAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/09.BeanPropertyAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/09.BeanPropertyAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/09.BeanPropertyAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/09.BeanPropertyAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/10.BeanConstructorAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/10.BeanConstructorAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/10.BeanConstructorAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/10.BeanConstructorAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/11.BeanIgnoreAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/11.BeanIgnoreAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/11.BeanIgnoreAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/11.BeanIgnoreAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/12.NamePropertyAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/12.NamePropertyAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/12.NamePropertyAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/12.NamePropertyAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/13.ParentPropertyAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/13.ParentPropertyAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/13.ParentPropertyAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/13.ParentPropertyAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/14.PojoBuilders.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/14.PojoBuilders.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/14.PojoBuilders.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/14.PojoBuilders.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/15.BeanFilters.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/15.BeanFilters.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/15.BeanFilters.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/15.BeanFilters.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/16.InterfaceFilters.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/16.InterfaceFilters.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/16.InterfaceFilters.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/16.InterfaceFilters.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/17.StopClasses.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/17.StopClasses.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/17.StopClasses.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/17.StopClasses.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/18.BypassSerialization.html b/juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/18.BypassSerialization.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/10.Transforms/18.BypassSerialization.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/10.Transforms/18.BypassSerialization.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/11.BeanDictionaries.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.BeanDictionaries.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/11.BeanDictionaries.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/11.BeanDictionaries.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/11.BeanDictionaries/01.BeanSubTypes.html b/juneau-doc/docs/Topics/02.juneau-marshall/11.BeanDictionaries/01.BeanSubTypes.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/11.BeanDictionaries/01.BeanSubTypes.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/11.BeanDictionaries/01.BeanSubTypes.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/12.VirtualBeans.html b/juneau-doc/docs/Topics/02.juneau-marshall/12.VirtualBeans.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/12.VirtualBeans.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/12.VirtualBeans.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/13.Recursion.html b/juneau-doc/docs/Topics/02.juneau-marshall/13.Recursion.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/13.Recursion.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/13.Recursion.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/14.ParsingIntoGenericModels.html b/juneau-doc/docs/Topics/02.juneau-marshall/14.ParsingIntoGenericModels.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/14.ParsingIntoGenericModels.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/14.ParsingIntoGenericModels.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/15.ReadingContinuousStreams.html b/juneau-doc/docs/Topics/02.juneau-marshall/15.ReadingContinuousStreams.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/15.ReadingContinuousStreams.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/15.ReadingContinuousStreams.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/16.URIs.html b/juneau-doc/docs/Topics/02.juneau-marshall/16.URIs.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/16.URIs.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/16.URIs.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/17.JacksonComparison.html b/juneau-doc/docs/Topics/02.juneau-marshall/17.JacksonComparison.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/17.JacksonComparison.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/17.JacksonComparison.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/18.PojoCategories.html b/juneau-doc/docs/Topics/02.juneau-marshall/18.PojoCategories.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/18.PojoCategories.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/18.PojoCategories.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails.html b/juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/01.Methodology.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/01.Methodology.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/01.Methodology.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/02.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/02.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/02.Serializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/02.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/03.SimplifiedJson.html b/juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/03.SimplifiedJson.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/03.SimplifiedJson.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/03.SimplifiedJson.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/04.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/04.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/04.Parsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/04.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/05.JsonAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/05.JsonAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/05.JsonAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/05.JsonAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/06.JsonSchema.html b/juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/06.JsonSchema.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/19.JsonDetails/06.JsonSchema.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/19.JsonDetails/06.JsonSchema.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/01.Methodology.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/01.Methodology.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/01.Methodology.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/02.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/02.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/02.Serializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/02.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/03.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/03.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/03.Parsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/03.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/04.BeanTypeNameAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/04.BeanTypeNameAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/04.BeanTypeNameAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/04.BeanTypeNameAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/05.XmlChildNameAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/05.XmlChildNameAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/05.XmlChildNameAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/05.XmlChildNameAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/06.XmlFormatAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/06.XmlFormatAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/06.XmlFormatAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/06.XmlFormatAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/07.Namespaces.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/07.Namespaces.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/07.Namespaces.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/07.Namespaces.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/08.XmlSchema.html b/juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/08.XmlSchema.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/20.XmlDetails/08.XmlSchema.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/20.XmlDetails/08.XmlSchema.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/01.Methodology.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/01.Methodology.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/01.Methodology.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/02.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/02.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/02.Serializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/02.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/03.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/03.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/03.Parsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/03.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/04.HtmlAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/04.HtmlAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/04.HtmlAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/04.HtmlAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/05.HtmlRenderAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/05.HtmlRenderAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/05.HtmlRenderAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/05.HtmlRenderAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/06.HtmlDocSerializer.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/06.HtmlDocSerializer.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/06.HtmlDocSerializer.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/06.HtmlDocSerializer.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/07.BasicHtmlDocTemplate.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/07.BasicHtmlDocTemplate.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/07.BasicHtmlDocTemplate.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/07.BasicHtmlDocTemplate.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/08.CustomTemplates.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/08.CustomTemplates.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/08.CustomTemplates.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/08.CustomTemplates.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/09.HtmlSchema.html b/juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/09.HtmlSchema.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/21.HtmlDetails/09.HtmlSchema.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/21.HtmlDetails/09.HtmlSchema.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/22.UonDetails.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.UonDetails.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/22.UonDetails.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/22.UonDetails.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/22.UonDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.UonDetails/01.Methodology.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/22.UonDetails/01.Methodology.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/22.UonDetails/01.Methodology.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/22.UonDetails/02.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.UonDetails/02.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/22.UonDetails/02.Serializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/22.UonDetails/02.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/22.UonDetails/03.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/22.UonDetails/03.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/22.UonDetails/03.Parsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/22.UonDetails/03.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails.html b/juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails/01.Methodology.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails/01.Methodology.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails/01.Methodology.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails/02.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails/02.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails/02.Serializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails/02.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails/03.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails/03.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails/03.Parsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails/03.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails/04.UrlEncodingAnnotation.html b/juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails/04.UrlEncodingAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/23.UrlEncodingDetails/04.UrlEncodingAnnotation.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/23.UrlEncodingDetails/04.UrlEncodingAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/24.MsgPackDetails.html b/juneau-doc/docs/Topics/02.juneau-marshall/24.MsgPackDetails.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/24.MsgPackDetails.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/24.MsgPackDetails.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/24.MsgPackDetails/01.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/24.MsgPackDetails/01.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/24.MsgPackDetails/01.Serializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/24.MsgPackDetails/01.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/24.MsgPackDetails/02.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/24.MsgPackDetails/02.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/24.MsgPackDetails/02.Parsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/24.MsgPackDetails/02.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/25.OpenApiDetails.html b/juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/25.OpenApiDetails.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/25.OpenApiDetails/01.Methodology.html b/juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails/01.Methodology.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/25.OpenApiDetails/01.Methodology.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails/01.Methodology.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/25.OpenApiDetails/02.Serializers.html b/juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails/02.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/25.OpenApiDetails/02.Serializers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails/02.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/25.OpenApiDetails/03.Parsers.html b/juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails/03.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/25.OpenApiDetails/03.Parsers.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/25.OpenApiDetails/03.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/26.BestPractices.html b/juneau-doc/docs/Topics/02.juneau-marshall/26.BestPractices.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/26.BestPractices.html
rename to juneau-doc/docs/Topics/02.juneau-marshall/26.BestPractices.html
diff --git a/juneau-doc/src/main/resources/Topics/02.juneau-marshall/doc-files/rfc_uon.txt b/juneau-doc/docs/Topics/02.juneau-marshall/doc-files/rfc_uon.txt
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/02.juneau-marshall/doc-files/rfc_uon.txt
rename to juneau-doc/docs/Topics/02.juneau-marshall/doc-files/rfc_uon.txt
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf.html
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails.html
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.Serializers.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.Serializers.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/01.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.Parsers.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.Parsers.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/02.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/03.RdfAnnotation.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/03.RdfAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/03.RdfAnnotation.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/03.RdfAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.Namespaces.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.Namespaces.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.Namespaces.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/04.Namespaces.html
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.UriProperties.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.UriProperties.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.UriProperties.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/05.UriProperties.html
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RootProperty.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RootProperty.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RootProperty.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/06.RootProperty.html
diff --git a/juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.TypedLiterals.html b/juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.TypedLiterals.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.TypedLiterals.html
rename to juneau-doc/docs/Topics/03.juneau-marshall-rdf/01.RdfDetails/07.TypedLiterals.html
diff --git a/juneau-doc/src/main/resources/Topics/04.juneau-dto.html b/juneau-doc/docs/Topics/04.juneau-dto.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/04.juneau-dto.html
rename to juneau-doc/docs/Topics/04.juneau-dto.html
diff --git a/juneau-doc/src/main/resources/Topics/04.juneau-dto/01.HTML5.html b/juneau-doc/docs/Topics/04.juneau-dto/01.HTML5.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/04.juneau-dto/01.HTML5.html
rename to juneau-doc/docs/Topics/04.juneau-dto/01.HTML5.html
diff --git a/juneau-doc/src/main/resources/Topics/04.juneau-dto/02.Atom.html b/juneau-doc/docs/Topics/04.juneau-dto/02.Atom.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/04.juneau-dto/02.Atom.html
rename to juneau-doc/docs/Topics/04.juneau-dto/02.Atom.html
diff --git a/juneau-doc/src/main/resources/Topics/04.juneau-dto/03.Swagger.html b/juneau-doc/docs/Topics/04.juneau-dto/03.Swagger.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/04.juneau-dto/03.Swagger.html
rename to juneau-doc/docs/Topics/04.juneau-dto/03.Swagger.html
diff --git a/juneau-doc/src/main/resources/Topics/04.juneau-dto/04.SwaggerUI.html b/juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/04.juneau-dto/04.SwaggerUI.html
rename to juneau-doc/docs/Topics/04.juneau-dto/04.SwaggerUI.html
diff --git a/juneau-doc/src/main/resources/Topics/04.juneau-dto/doc-files/SwaggerUI.html.png b/juneau-doc/docs/Topics/04.juneau-dto/doc-files/SwaggerUI.html.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/04.juneau-dto/doc-files/SwaggerUI.html.png
rename to juneau-doc/docs/Topics/04.juneau-dto/doc-files/SwaggerUI.html.png
diff --git a/juneau-doc/src/main/resources/Topics/04.juneau-dto/doc-files/SwaggerUI.json.png b/juneau-doc/docs/Topics/04.juneau-dto/doc-files/SwaggerUI.json.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/04.juneau-dto/doc-files/SwaggerUI.json.png
rename to juneau-doc/docs/Topics/04.juneau-dto/doc-files/SwaggerUI.json.png
diff --git a/juneau-doc/src/main/resources/Topics/05.juneau-svl.html b/juneau-doc/docs/Topics/05.juneau-svl.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/05.juneau-svl.html
rename to juneau-doc/docs/Topics/05.juneau-svl.html
diff --git a/juneau-doc/src/main/resources/Topics/05.juneau-svl/01.SimpleVarLanguage.html b/juneau-doc/docs/Topics/05.juneau-svl/01.SimpleVarLanguage.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/05.juneau-svl/01.SimpleVarLanguage.html
rename to juneau-doc/docs/Topics/05.juneau-svl/01.SimpleVarLanguage.html
diff --git a/juneau-doc/src/main/resources/Topics/05.juneau-svl/02.SvlVariables.html b/juneau-doc/docs/Topics/05.juneau-svl/02.SvlVariables.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/05.juneau-svl/02.SvlVariables.html
rename to juneau-doc/docs/Topics/05.juneau-svl/02.SvlVariables.html
diff --git a/juneau-doc/src/main/resources/Topics/05.juneau-svl/03.VarResolvers.html b/juneau-doc/docs/Topics/05.juneau-svl/03.VarResolvers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/05.juneau-svl/03.VarResolvers.html
rename to juneau-doc/docs/Topics/05.juneau-svl/03.VarResolvers.html
diff --git a/juneau-doc/src/main/resources/Topics/05.juneau-svl/04.OtherNotes.html b/juneau-doc/docs/Topics/05.juneau-svl/04.OtherNotes.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/05.juneau-svl/04.OtherNotes.html
rename to juneau-doc/docs/Topics/05.juneau-svl/04.OtherNotes.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config.html b/juneau-doc/docs/Topics/06.juneau-config.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config.html
rename to juneau-doc/docs/Topics/06.juneau-config.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/01.Overview.html b/juneau-doc/docs/Topics/06.juneau-config/01.Overview.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/01.Overview.html
rename to juneau-doc/docs/Topics/06.juneau-config/01.Overview.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/01.Overview/01.SyntaxRules.html b/juneau-doc/docs/Topics/06.juneau-config/01.Overview/01.SyntaxRules.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/01.Overview/01.SyntaxRules.html
rename to juneau-doc/docs/Topics/06.juneau-config/01.Overview/01.SyntaxRules.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes.html
rename to juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/01.PrimitiveTypes.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/01.PrimitiveTypes.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/01.PrimitiveTypes.html
rename to juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/01.PrimitiveTypes.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/02.POJOs.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/02.POJOs.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/02.POJOs.html
rename to juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/02.POJOs.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/03.Arrays.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/03.Arrays.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/03.Arrays.html
rename to juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/03.Arrays.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/04.Collections.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/04.Collections.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/04.Collections.html
rename to juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/04.Collections.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/05.BinaryData.html b/juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/05.BinaryData.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/02.EntryTypes/05.BinaryData.html
rename to juneau-doc/docs/Topics/06.juneau-config/02.EntryTypes/05.BinaryData.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/03.Variables.html b/juneau-doc/docs/Topics/06.juneau-config/03.Variables.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/03.Variables.html
rename to juneau-doc/docs/Topics/06.juneau-config/03.Variables.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/03.Variables/01.LogicVariables.html b/juneau-doc/docs/Topics/06.juneau-config/03.Variables/01.LogicVariables.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/03.Variables/01.LogicVariables.html
rename to juneau-doc/docs/Topics/06.juneau-config/03.Variables/01.LogicVariables.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/04.EncodedEntries.html b/juneau-doc/docs/Topics/06.juneau-config/04.EncodedEntries.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/04.EncodedEntries.html
rename to juneau-doc/docs/Topics/06.juneau-config/04.EncodedEntries.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/05.SectionMaps.html b/juneau-doc/docs/Topics/06.juneau-config/05.SectionMaps.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/05.SectionMaps.html
rename to juneau-doc/docs/Topics/06.juneau-config/05.SectionMaps.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/06.SectionBeans.html b/juneau-doc/docs/Topics/06.juneau-config/06.SectionBeans.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/06.SectionBeans.html
rename to juneau-doc/docs/Topics/06.juneau-config/06.SectionBeans.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/07.SectionInterfaces.html b/juneau-doc/docs/Topics/06.juneau-config/07.SectionInterfaces.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/07.SectionInterfaces.html
rename to juneau-doc/docs/Topics/06.juneau-config/07.SectionInterfaces.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/08.SettingValues.html b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/08.SettingValues.html
rename to juneau-doc/docs/Topics/06.juneau-config/08.SettingValues.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/08.SettingValues/01.FileSystemChanges.html b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/01.FileSystemChanges.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/08.SettingValues/01.FileSystemChanges.html
rename to juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/01.FileSystemChanges.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/08.SettingValues/02.CustomEntrySerialization.html b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/02.CustomEntrySerialization.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/08.SettingValues/02.CustomEntrySerialization.html
rename to juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/02.CustomEntrySerialization.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/08.SettingValues/03.BulkSettingValues.html b/juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/03.BulkSettingValues.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/08.SettingValues/03.BulkSettingValues.html
rename to juneau-doc/docs/Topics/06.juneau-config/08.SettingValues/03.BulkSettingValues.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/09.Listeners.html b/juneau-doc/docs/Topics/06.juneau-config/09.Listeners.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/09.Listeners.html
rename to juneau-doc/docs/Topics/06.juneau-config/09.Listeners.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/10.Serializing.html b/juneau-doc/docs/Topics/06.juneau-config/10.Serializing.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/10.Serializing.html
rename to juneau-doc/docs/Topics/06.juneau-config/10.Serializing.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores.html b/juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores.html
rename to juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores/01.ConfigMemoryStore.html b/juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores/01.ConfigMemoryStore.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores/01.ConfigMemoryStore.html
rename to juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores/01.ConfigMemoryStore.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores/02.ConfigFileStore.html b/juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores/02.ConfigFileStore.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores/02.ConfigFileStore.html
rename to juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores/02.ConfigFileStore.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores/03.CustomConfigStores.html b/juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores/03.CustomConfigStores.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores/03.CustomConfigStores.html
rename to juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores/03.CustomConfigStores.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores/04.ConfigStoreListeners.html b/juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores/04.ConfigStoreListeners.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/11.ConfigStores/04.ConfigStoreListeners.html
rename to juneau-doc/docs/Topics/06.juneau-config/11.ConfigStores/04.ConfigStoreListeners.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/12.ReadOnlyConfigs.html b/juneau-doc/docs/Topics/06.juneau-config/12.ReadOnlyConfigs.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/12.ReadOnlyConfigs.html
rename to juneau-doc/docs/Topics/06.juneau-config/12.ReadOnlyConfigs.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/13.ClosingConfigs.html b/juneau-doc/docs/Topics/06.juneau-config/13.ClosingConfigs.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/13.ClosingConfigs.html
rename to juneau-doc/docs/Topics/06.juneau-config/13.ClosingConfigs.html
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/doc-files/juneau-config.Serializing.1.png b/juneau-doc/docs/Topics/06.juneau-config/doc-files/juneau-config.Serializing.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/doc-files/juneau-config.Serializing.1.png
rename to juneau-doc/docs/Topics/06.juneau-config/doc-files/juneau-config.Serializing.1.png
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/doc-files/juneau-config.Serializing.2.png b/juneau-doc/docs/Topics/06.juneau-config/doc-files/juneau-config.Serializing.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/doc-files/juneau-config.Serializing.2.png
rename to juneau-doc/docs/Topics/06.juneau-config/doc-files/juneau-config.Serializing.2.png
diff --git a/juneau-doc/src/main/resources/Topics/06.juneau-config/doc-files/juneau-config.Serializing.3.png b/juneau-doc/docs/Topics/06.juneau-config/doc-files/juneau-config.Serializing.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/06.juneau-config/doc-files/juneau-config.Serializing.3.png
rename to juneau-doc/docs/Topics/06.juneau-config/doc-files/juneau-config.Serializing.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server.html b/juneau-doc/docs/Topics/07.juneau-rest-server.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/01.HelloWorldExample.html b/juneau-doc/docs/Topics/07.juneau-rest-server/01.HelloWorldExample.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/01.HelloWorldExample.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/01.HelloWorldExample.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/02.ClassHierarchy.html b/juneau-doc/docs/Topics/07.juneau-rest-server/02.ClassHierarchy.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/02.ClassHierarchy.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/02.ClassHierarchy.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/01.RestServlet.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/01.RestServlet.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/01.RestServlet.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/01.RestServlet.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/02.BasicRestServlet.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/02.BasicRestServlet.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/02.BasicRestServlet.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/02.BasicRestServlet.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/03.Children.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/03.Children.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/03.Children.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/03.Children.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/04.RouterPages.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/04.RouterPages.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/04.RouterPages.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/04.RouterPages.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/05.ResourceResolvers.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/05.ResourceResolvers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/05.ResourceResolvers.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/05.ResourceResolvers.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/06.LifecycleHooks.html b/juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/06.LifecycleHooks.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/03.Instantiation/06.LifecycleHooks.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/03.Instantiation/06.LifecycleHooks.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/04.RestResource.html b/juneau-doc/docs/Topics/07.juneau-rest-server/04.RestResource.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/04.RestResource.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/04.RestResource.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/04.RestResource/01.AnnotationInheritance.html b/juneau-doc/docs/Topics/07.juneau-rest-server/04.RestResource/01.AnnotationInheritance.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/04.RestResource/01.AnnotationInheritance.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/04.RestResource/01.AnnotationInheritance.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/05.RestContext.html b/juneau-doc/docs/Topics/07.juneau-rest-server/05.RestContext.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/05.RestContext.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/05.RestContext.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/01.MethodParameters.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/01.MethodParameters.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/01.MethodParameters.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/01.MethodParameters.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/02.RestRequest.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/02.RestRequest.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/02.RestRequest.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/02.RestRequest.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/03.RestResponse.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/03.RestResponse.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/03.RestResponse.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/03.RestResponse.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/04.RequestBody.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/04.RequestBody.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/04.RequestBody.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/04.RequestBody.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/05.RequestHeaders.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/05.RequestHeaders.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/05.RequestHeaders.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/05.RequestHeaders.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/06.RequestQuery.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/06.RequestQuery.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/06.RequestQuery.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/06.RequestQuery.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/07.RequestFormData.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/07.RequestFormData.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/07.RequestFormData.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/07.RequestFormData.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/08.RestMethodPath.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/08.RestMethodPath.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/08.RestMethodPath.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/08.RestMethodPath.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/09.RequestPathMatch.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/09.RequestPathMatch.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/09.RequestPathMatch.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/09.RequestPathMatch.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/10.MethodReturnTypes.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/10.MethodReturnTypes.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/10.MethodReturnTypes.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/10.MethodReturnTypes.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/11.ReaderResource.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/11.ReaderResource.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/11.ReaderResource.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/11.ReaderResource.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/12.StreamResource.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/12.StreamResource.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/12.StreamResource.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/12.StreamResource.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/13.RestMethodMatchers.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/13.RestMethodMatchers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/13.RestMethodMatchers.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/13.RestMethodMatchers.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/14.PredefinedResponses.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/14.PredefinedResponses.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/14.PredefinedResponses.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/14.PredefinedResponses.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/15.PredefinedExceptions.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/15.PredefinedExceptions.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/15.PredefinedExceptions.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/15.PredefinedExceptions.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/16.PredefinedHelperBeans.html b/juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/16.PredefinedHelperBeans.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/06.RestMethod/16.PredefinedHelperBeans.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/06.RestMethod/16.PredefinedHelperBeans.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/07.restRPC.html b/juneau-doc/docs/Topics/07.juneau-rest-server/07.restRPC.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/07.restRPC.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/07.restRPC.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html b/juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/08.OpenApiSchemaPartParsing.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html b/juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/09.OpenApiSchemaPartSerializing.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/01.Body.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/02.FormData.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/03.HasFormData.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/04.Query.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/05.HasQuery.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/06.Header.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/07.Path.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/08.Request.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/08.Request.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/08.Request.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/08.Request.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/09.Response.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/10.ResponseHeader.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/11.ResponseStatus.html b/juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/11.ResponseStatus.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/10.HttpPartAnnotations/11.ResponseStatus.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/10.HttpPartAnnotations/11.ResponseStatus.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/11.HandlingFormPosts.html b/juneau-doc/docs/Topics/07.juneau-rest-server/11.HandlingFormPosts.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/11.HandlingFormPosts.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/11.HandlingFormPosts.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/12.HandlingMultiPartFormPosts.html b/juneau-doc/docs/Topics/07.juneau-rest-server/12.HandlingMultiPartFormPosts.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/12.HandlingMultiPartFormPosts.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/12.HandlingMultiPartFormPosts.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/13.Serializers.html b/juneau-doc/docs/Topics/07.juneau-rest-server/13.Serializers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/13.Serializers.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/13.Serializers.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/14.Parsers.html b/juneau-doc/docs/Topics/07.juneau-rest-server/14.Parsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/14.Parsers.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/14.Parsers.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/15.Properties.html b/juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/15.Properties.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/15.Properties.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/16.Transforms.html b/juneau-doc/docs/Topics/07.juneau-rest-server/16.Transforms.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/16.Transforms.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/16.Transforms.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/17.URIs.html b/juneau-doc/docs/Topics/07.juneau-rest-server/17.URIs.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/17.URIs.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/17.URIs.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/18.Guards.html b/juneau-doc/docs/Topics/07.juneau-rest-server/18.Guards.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/18.Guards.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/18.Guards.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/19.Converters.html b/juneau-doc/docs/Topics/07.juneau-rest-server/19.Converters.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/19.Converters.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/19.Converters.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/20.Messages.html b/juneau-doc/docs/Topics/07.juneau-rest-server/20.Messages.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/20.Messages.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/20.Messages.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/21.Encoders.html b/juneau-doc/docs/Topics/07.juneau-rest-server/21.Encoders.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/21.Encoders.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/21.Encoders.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/22.SvlVariables.html b/juneau-doc/docs/Topics/07.juneau-rest-server/22.SvlVariables.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/22.SvlVariables.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/22.SvlVariables.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/23.ConfigurationFiles.html b/juneau-doc/docs/Topics/07.juneau-rest-server/23.ConfigurationFiles.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/23.ConfigurationFiles.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/23.ConfigurationFiles.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/24.StaticFiles.html b/juneau-doc/docs/Topics/07.juneau-rest-server/24.StaticFiles.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/24.StaticFiles.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/24.StaticFiles.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/25.ClientVersioning.html b/juneau-doc/docs/Topics/07.juneau-rest-server/25.ClientVersioning.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/25.ClientVersioning.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/25.ClientVersioning.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/26.RestInfoProvider.html b/juneau-doc/docs/Topics/07.juneau-rest-server/26.RestInfoProvider.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/26.RestInfoProvider.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/26.RestInfoProvider.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/26.RestInfoProvider/01.BasicRestInfoProvider.html b/juneau-doc/docs/Topics/07.juneau-rest-server/26.RestInfoProvider/01.BasicRestInfoProvider.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/26.RestInfoProvider/01.BasicRestInfoProvider.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/26.RestInfoProvider/01.BasicRestInfoProvider.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/01.BasicRestServlet.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/01.BasicRestServlet.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/01.BasicRestServlet.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/01.BasicRestServlet.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/02.BasicSwaggerInfo.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/02.BasicSwaggerInfo.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/02.BasicSwaggerInfo.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/02.BasicSwaggerInfo.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/03.Tags.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/03.Tags.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/03.Tags.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/03.Tags.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/04.Operations.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/04.Operations.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/04.Operations.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/04.Operations.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/05.Parameters.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/06.ParameterExamples.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/07.Responses.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/07.Responses.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/07.Responses.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/07.Responses.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/08.ResponseExamples.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/09.Models.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/09.Models.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/09.Models.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/09.Models.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/10.Stylesheet.html b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/10.Stylesheet.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/10.Stylesheet.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/10.Stylesheet.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Models.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.4.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.4.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.4.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Operations.4.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.4.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.4.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.4.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.Parameters.4.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png b/juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/27.Swagger/doc-files/juneau-rest-server.Swagger.ResponseExamples.4.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation.html b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/01.UIvsDI.html b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/01.UIvsDI.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/01.UIvsDI.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/01.UIvsDI.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/02.Widgets.html b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/02.Widgets.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/02.Widgets.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/02.Widgets.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/03.PredefinedWidgets.html b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/03.PredefinedWidgets.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/03.PredefinedWidgets.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/03.PredefinedWidgets.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/04.UiCustomization.html b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/04.UiCustomization.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/04.UiCustomization.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/04.UiCustomization.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/05.Stylesheets.html b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/05.Stylesheets.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/05.Stylesheets.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/05.Stylesheets.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.4.png b/juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.4.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.4.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/28.HtmlDocAnnotation/doc-files/juneau-rest-server.HtmlDocAnnotation.PredefinedWidgets.4.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/29.DefaultHeaders.html b/juneau-doc/docs/Topics/07.juneau-rest-server/29.DefaultHeaders.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/29.DefaultHeaders.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/29.DefaultHeaders.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/30.LoggingAndErrorHandling.html b/juneau-doc/docs/Topics/07.juneau-rest-server/30.LoggingAndErrorHandling.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/30.LoggingAndErrorHandling.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/30.LoggingAndErrorHandling.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/31.HttpStatusCodes.html b/juneau-doc/docs/Topics/07.juneau-rest-server/31.HttpStatusCodes.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/31.HttpStatusCodes.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/31.HttpStatusCodes.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/32.OverloadingHttpMethods.html b/juneau-doc/docs/Topics/07.juneau-rest-server/32.OverloadingHttpMethods.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/32.OverloadingHttpMethods.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/32.OverloadingHttpMethods.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/33.BuiltInParameters.html b/juneau-doc/docs/Topics/07.juneau-rest-server/33.BuiltInParameters.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/33.BuiltInParameters.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/33.BuiltInParameters.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/34.CustomSerializersAndParsers.html b/juneau-doc/docs/Topics/07.juneau-rest-server/34.CustomSerializersAndParsers.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/34.CustomSerializersAndParsers.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/34.CustomSerializersAndParsers.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/35.UsingWithOsgi.html b/juneau-doc/docs/Topics/07.juneau-rest-server/35.UsingWithOsgi.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/35.UsingWithOsgi.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/35.UsingWithOsgi.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/36.UnitTesting.html b/juneau-doc/docs/Topics/07.juneau-rest-server/36.UnitTesting.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/36.UnitTesting.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/36.UnitTesting.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/37.Injection.html b/juneau-doc/docs/Topics/07.juneau-rest-server/37.Injection.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/37.Injection.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/37.Injection.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/38.HTTP2.html b/juneau-doc/docs/Topics/07.juneau-rest-server/38.HTTP2.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/38.HTTP2.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/38.HTTP2.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/39.OtherNotes.html b/juneau-doc/docs/Topics/07.juneau-rest-server/39.OtherNotes.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/39.OtherNotes.html
rename to juneau-doc/docs/Topics/07.juneau-rest-server/39.OtherNotes.html
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.HelloWorldExample.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.HelloWorldExample.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.HelloWorldExample.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.HelloWorldExample.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.OptionsPages.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.OptionsPages.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.OptionsPages.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.OptionsPages.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.4.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.4.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.4.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.PredefinedLabelBeans.4.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.RouterPages.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.RouterPages.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.RouterPages.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.RouterPages.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.0.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.0.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.0.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.0.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Stylesheets.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.4.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.4.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.4.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.4.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.5.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.5.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.5.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.Swagger.5.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.UiCustomization.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.1.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.1.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.1.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.2.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.2.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.2.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.3.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.3.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.3.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.4.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.4.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.4.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.4.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.5.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.5.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.5.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.5.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.6.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.6.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.6.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.6.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.7.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.7.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.7.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.7.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.8.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.8.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.8.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.8.png
diff --git a/juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.9.png b/juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.9.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.9.png
rename to juneau-doc/docs/Topics/07.juneau-rest-server/doc-files/juneau-rest-server.restRPC.9.png
diff --git a/juneau-doc/src/main/resources/Topics/08.juneau-rest-server-jaxrs.html b/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/08.juneau-rest-server-jaxrs.html
rename to juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs.html
diff --git a/juneau-doc/src/main/resources/Topics/08.juneau-rest-server-jaxrs/01.BaseProvider.html b/juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.BaseProvider.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/08.juneau-rest-server-jaxrs/01.BaseProvider.html
rename to juneau-doc/docs/Topics/08.juneau-rest-server-jaxrs/01.BaseProvider.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client.html b/juneau-doc/docs/Topics/09.juneau-rest-client.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/01.RemoteResource.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/01.RemoteResource.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/01.RemoteResource.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/01.RemoteResource.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/02.RemoteMethod.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/02.RemoteMethod.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/02.RemoteMethod.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/02.RemoteMethod.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/03.Body.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/03.Body.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/03.Body.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/03.Body.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/04.FormData.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/04.FormData.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/04.FormData.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/04.FormData.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/05.Query.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/05.Query.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/05.Query.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/05.Query.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/06.Header.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/06.Header.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/06.Header.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/06.Header.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/07.Path.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/07.Path.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/07.Path.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/07.Path.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/08.Request.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/08.Request.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/08.Request.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/08.Request.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/09.Response.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/09.Response.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/09.Response.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/09.Response.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/10.DualPurposeInterfaces.html b/juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/10.DualPurposeInterfaces.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/01.RestProxies/10.DualPurposeInterfaces.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/01.RestProxies/10.DualPurposeInterfaces.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/02.SSL.html b/juneau-doc/docs/Topics/09.juneau-rest-client/02.SSL.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/02.SSL.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/02.SSL.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/03.Authentication.html b/juneau-doc/docs/Topics/09.juneau-rest-client/03.Authentication.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/03.Authentication.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/03.Authentication.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/03.Authentication/01.BASIC.html b/juneau-doc/docs/Topics/09.juneau-rest-client/03.Authentication/01.BASIC.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/03.Authentication/01.BASIC.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/03.Authentication/01.BASIC.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/03.Authentication/02.FORM.html b/juneau-doc/docs/Topics/09.juneau-rest-client/03.Authentication/02.FORM.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/03.Authentication/02.FORM.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/03.Authentication/02.FORM.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/03.Authentication/03.OIDC.html b/juneau-doc/docs/Topics/09.juneau-rest-client/03.Authentication/03.OIDC.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/03.Authentication/03.OIDC.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/03.Authentication/03.OIDC.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/04.ResponsePatterns.html b/juneau-doc/docs/Topics/09.juneau-rest-client/04.ResponsePatterns.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/04.ResponsePatterns.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/04.ResponsePatterns.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/05.PipingOutput.html b/juneau-doc/docs/Topics/09.juneau-rest-client/05.PipingOutput.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/05.PipingOutput.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/05.PipingOutput.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/06.Debugging.html b/juneau-doc/docs/Topics/09.juneau-rest-client/06.Debugging.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/06.Debugging.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/06.Debugging.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/07.Logging.html b/juneau-doc/docs/Topics/09.juneau-rest-client/07.Logging.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/07.Logging.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/07.Logging.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/08.Interceptors.html b/juneau-doc/docs/Topics/09.juneau-rest-client/08.Interceptors.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/08.Interceptors.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/08.Interceptors.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/09.UnitTesting.html b/juneau-doc/docs/Topics/09.juneau-rest-client/09.UnitTesting.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/09.UnitTesting.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/09.UnitTesting.html
diff --git a/juneau-doc/src/main/resources/Topics/09.juneau-rest-client/10.Other.html b/juneau-doc/docs/Topics/09.juneau-rest-client/10.Other.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/09.juneau-rest-client/10.Other.html
rename to juneau-doc/docs/Topics/09.juneau-rest-client/10.Other.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server.html b/juneau-doc/docs/Topics/10.juneau-microservice-server.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/01.Introduction.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/01.Introduction.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/01.Introduction.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/01.Introduction.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/02.GettingStarted.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/02.GettingStarted.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/02.GettingStarted.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/02.GettingStarted.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/02.GettingStarted/01.Installing.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/02.GettingStarted/01.Installing.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/02.GettingStarted/01.Installing.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/02.GettingStarted/01.Installing.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/02.GettingStarted/02.Running.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/02.GettingStarted/02.Running.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/02.GettingStarted/02.Running.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/02.GettingStarted/02.Running.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/02.GettingStarted/03.Building.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/02.GettingStarted/03.Building.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/02.GettingStarted/03.Building.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/02.GettingStarted/03.Building.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/03.Manifest.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/03.Manifest.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/03.Manifest.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/03.Manifest.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/03.Manifest/01.ManifestApi.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/03.Manifest/01.ManifestApi.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/03.Manifest/01.ManifestApi.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/03.Manifest/01.ManifestApi.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/04.Config.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/04.Config.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/04.Config.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/04.Config.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/04.Config/01.ConfigApi.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/04.Config/01.ConfigApi.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/04.Config/01.ConfigApi.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/04.Config/01.ConfigApi.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/05.ResourceClasses.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/05.ResourceClasses.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/05.ResourceClasses.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/05.ResourceClasses.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/06.PredefinedResourceClasses.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/06.PredefinedResourceClasses.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/06.PredefinedResourceClasses.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/06.PredefinedResourceClasses.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/07.RestMicroservice.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/07.RestMicroservice.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/07.RestMicroservice.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/07.RestMicroservice.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/07.RestMicroservice/01.Extending.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/07.RestMicroservice/01.Extending.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/07.RestMicroservice/01.Extending.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/07.RestMicroservice/01.Extending.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/08.UiCustomization.html b/juneau-doc/docs/Topics/10.juneau-microservice-server/08.UiCustomization.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/08.UiCustomization.html
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/08.UiCustomization.html
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Installing.1.png b/juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Installing.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Installing.1.png
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Installing.1.png
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Installing.2.png b/juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Installing.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Installing.2.png
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Installing.2.png
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.ResourceClasses.1.png b/juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.ResourceClasses.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.ResourceClasses.1.png
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.ResourceClasses.1.png
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Running.1.png b/juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Running.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Running.1.png
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice-server.Running.1.png
diff --git a/juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice.UiCustomization.1.png b/juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice.UiCustomization.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/10.juneau-microservice-server/doc-files/juneau-microservice.UiCustomization.1.png
rename to juneau-doc/docs/Topics/10.juneau-microservice-server/doc-files/juneau-microservice.UiCustomization.1.png
diff --git a/juneau-doc/src/main/resources/Topics/11.juneau-examples-core.html b/juneau-doc/docs/Topics/11.juneau-examples-core.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/11.juneau-examples-core.html
rename to juneau-doc/docs/Topics/11.juneau-examples-core.html
diff --git a/juneau-doc/src/main/resources/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.1.png b/juneau-doc/docs/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.1.png
rename to juneau-doc/docs/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.1.png
diff --git a/juneau-doc/src/main/resources/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.2.png b/juneau-doc/docs/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.2.png
rename to juneau-doc/docs/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.2.png
diff --git a/juneau-doc/src/main/resources/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.3.png b/juneau-doc/docs/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.3.png
rename to juneau-doc/docs/Topics/11.juneau-examples-core/doc-files/juneau-examples-core.3.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html b/juneau-doc/docs/Topics/12.juneau-examples-rest.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest.html
rename to juneau-doc/docs/Topics/12.juneau-examples-rest.html
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html b/juneau-doc/docs/Topics/12.juneau-examples-rest/01.RootResources.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/01.RootResources.html
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/01.RootResources.html
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/02.HelloWorldResource.html b/juneau-doc/docs/Topics/12.juneau-examples-rest/02.HelloWorldResource.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/02.HelloWorldResource.html
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/02.HelloWorldResource.html
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html b/juneau-doc/docs/Topics/12.juneau-examples-rest/03.PetStoreResource.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/03.PetStoreResource.html
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/03.PetStoreResource.html
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/04.DtoExamples.html b/juneau-doc/docs/Topics/12.juneau-examples-rest/04.DtoExamples.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/04.DtoExamples.html
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/04.DtoExamples.html
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/05.ConfigResource.html b/juneau-doc/docs/Topics/12.juneau-examples-rest/05.ConfigResource.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/05.ConfigResource.html
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/05.ConfigResource.html
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/06.LogsResource.html b/juneau-doc/docs/Topics/12.juneau-examples-rest/06.LogsResource.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/06.LogsResource.html
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/06.LogsResource.html
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.3.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.3.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.4.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.4.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.3.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.3.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.AtomFeedResource.3.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.ConfigResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.DockerRegistryResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.DockerRegistryResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.DockerRegistryResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.DockerRegistryResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.HelloWorldResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.JsonSchemaResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.LogsResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.LogsResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.LogsResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.LogsResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.3.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.3.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.MethodExampleResource.3.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10c.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10c.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10c.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.10c.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.11b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2c.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2c.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2c.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2c.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2d.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2d.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2d.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.2d.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.3b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.4b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.5b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.6b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.7b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.8a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.8a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.8a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.8a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9a.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9a.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9a.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9a.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9b.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9b.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9b.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9b.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9c.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9c.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9c.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9c.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9d.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9d.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9d.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9d.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9e.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9e.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9e.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9e.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9f.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9f.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9f.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9f.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9g.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9g.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9g.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9g.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9h.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9h.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9h.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PetStoreResource.9h.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.PhotosResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RequestEchoResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RequestEchoResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RequestEchoResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RequestEchoResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.RootResources.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SqlQueryResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.SystemPropertiesResource.3.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.3.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.3.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.3.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TempDirResource.3.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TumblrParserResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TumblrParserResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TumblrParserResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.TumblrParserResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.1.png
diff --git a/juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png b/juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png
rename to juneau-doc/docs/Topics/12.juneau-examples-rest/doc-files/juneau-examples-rest.UrlEncodedFormResource.2.png
diff --git a/juneau-doc/src/main/resources/Topics/13.Security.html b/juneau-doc/docs/Topics/13.Security.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/13.Security.html
rename to juneau-doc/docs/Topics/13.Security.html
diff --git a/juneau-doc/src/main/resources/Topics/13.Security/01.juneau-marshall.html b/juneau-doc/docs/Topics/13.Security/01.juneau-marshall.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/13.Security/01.juneau-marshall.html
rename to juneau-doc/docs/Topics/13.Security/01.juneau-marshall.html
diff --git a/juneau-doc/src/main/resources/Topics/13.Security/02.juneau-svl.html b/juneau-doc/docs/Topics/13.Security/02.juneau-svl.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/13.Security/02.juneau-svl.html
rename to juneau-doc/docs/Topics/13.Security/02.juneau-svl.html
diff --git a/juneau-doc/src/main/resources/Topics/13.Security/03.juneau-rest-server.html b/juneau-doc/docs/Topics/13.Security/03.juneau-rest-server.html
similarity index 100%
rename from juneau-doc/src/main/resources/Topics/13.Security/03.juneau-rest-server.html
rename to juneau-doc/docs/Topics/13.Security/03.juneau-rest-server.html
diff --git a/juneau-doc/juneau-doc.jar b/juneau-doc/juneau-doc.jar
index f11ff1c..c4eaec6 100644
Binary files a/juneau-doc/juneau-doc.jar and b/juneau-doc/juneau-doc.jar differ
diff --git a/juneau-doc/src/.DS_Store b/juneau-doc/src/.DS_Store
deleted file mode 100644
index 2ba7174..0000000
Binary files a/juneau-doc/src/.DS_Store and /dev/null differ
diff --git a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
index ae4bb1f..94f075a 100644
--- a/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
+++ b/juneau-doc/src/main/java/org/apache/juneau/doc/internal/DocGenerator.java
@@ -60,7 +60,7 @@ public class DocGenerator {
 
 			DocStore ds = new DocStore(new File("docs/docs.txt"));
 
-			File top = new File("src/main/resources/Topics");
+			File top = new File("docs/Topics");
 
 			reorder(top);