juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Javadoc updates.
Date Mon, 29 Jan 2018 17:07:28 GMT
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 2134b00  Javadoc updates.
2134b00 is described below

commit 2134b00db1ca12d2ece15aafd8f0621413ce2a79
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Mon Jan 29 12:07:23 2018 -0500

    Javadoc updates.
---
 .../main/javadoc/doc-files/HelloWorldResource.png  | Bin 0 -> 87910 bytes
 .../javadoc/doc-files/Samples_RootResources.png    | Bin 0 -> 244077 bytes
 juneau-doc/src/main/javadoc/overview.html          | 235 ++++++++++++++++-----
 .../juneau/examples/rest/HelloWorldResource.java   |   3 +-
 .../org/apache/juneau/rest/jaxrs/BaseProvider.java |   6 +
 .../apache/juneau/rest/jaxrs/DefaultProvider.java  |   6 +
 .../apache/juneau/rest/jaxrs/JuneauProvider.java   |   6 +
 .../apache/juneau/rest/ClientVersionMatcher.java   |   7 +-
 .../org/apache/juneau/rest/HtmlDocBuilder.java     |   6 +
 .../apache/juneau/rest/MessageBundleLocation.java  |   6 +
 .../org/apache/juneau/rest/ReaderResource.java     |   6 +
 .../main/java/org/apache/juneau/rest/Redirect.java |   6 +
 .../java/org/apache/juneau/rest/RequestBody.java   |   6 +
 .../org/apache/juneau/rest/RequestFormData.java    |   6 +
 .../org/apache/juneau/rest/RequestHeaders.java     |   6 +
 .../org/apache/juneau/rest/RequestPathMatch.java   |   6 +
 .../org/apache/juneau/rest/RequestProperties.java  |   6 +
 .../java/org/apache/juneau/rest/RequestQuery.java  |   6 +
 .../org/apache/juneau/rest/ResponseHandler.java    |   6 +
 .../org/apache/juneau/rest/RestCallHandler.java    |   1 +
 .../java/org/apache/juneau/rest/RestChild.java     |   6 +
 .../java/org/apache/juneau/rest/RestContext.java   |  26 ++-
 .../org/apache/juneau/rest/RestContextBuilder.java |  32 +--
 .../apache/juneau/rest/RestContextProperties.java  |   6 +
 .../java/org/apache/juneau/rest/RestConverter.java |   6 +-
 .../java/org/apache/juneau/rest/RestGuard.java     |   6 +
 .../org/apache/juneau/rest/RestInfoProvider.java   |   7 +
 .../juneau/rest/RestInfoProviderDefault.java       |   7 +
 .../java/org/apache/juneau/rest/RestLogger.java    |   6 +
 .../org/apache/juneau/rest/RestLoggerDefault.java  |   4 +-
 .../org/apache/juneau/rest/RestLoggerNoOp.java     |   4 +-
 .../java/org/apache/juneau/rest/RestMatcher.java   |   6 +
 .../apache/juneau/rest/RestMethodProperties.java   |   6 +
 .../java/org/apache/juneau/rest/RestParam.java     |   7 +
 .../org/apache/juneau/rest/RestParamDefaults.java  |   6 +
 .../java/org/apache/juneau/rest/RestParamType.java |   6 +
 .../java/org/apache/juneau/rest/RestRequest.java   |   8 +-
 .../apache/juneau/rest/RestResourceResolver.java   |   6 +
 .../juneau/rest/RestResourceResolverDefault.java   |   6 +
 .../java/org/apache/juneau/rest/RestResponse.java  |   8 +-
 .../java/org/apache/juneau/rest/RestServlet.java   |   8 +-
 .../org/apache/juneau/rest/RestServletDefault.java |   7 +
 .../juneau/rest/RestServletGroupDefault.java       |   6 +
 .../org/apache/juneau/rest/StaticFileMapping.java  |   6 +
 .../org/apache/juneau/rest/StreamResource.java     |   6 +
 .../org/apache/juneau/rest/annotation/Body.java    |   6 +
 .../apache/juneau/rest/annotation/FormData.java    |   7 +
 .../apache/juneau/rest/annotation/HasFormData.java |   7 +
 .../apache/juneau/rest/annotation/HasQuery.java    |   6 +
 .../org/apache/juneau/rest/annotation/Header.java  |   6 +
 .../apache/juneau/rest/annotation/HookEvent.java   |   6 +
 .../org/apache/juneau/rest/annotation/HtmlDoc.java |   6 +
 .../org/apache/juneau/rest/annotation/Method.java  |   6 +
 .../juneau/rest/annotation/MethodSwagger.java      |   6 +
 .../apache/juneau/rest/annotation/Parameter.java   |   7 +
 .../org/apache/juneau/rest/annotation/Path.java    |   7 +
 .../juneau/rest/annotation/PathRemainder.java      |   7 +
 .../apache/juneau/rest/annotation/Property.java    |   7 +-
 .../org/apache/juneau/rest/annotation/Query.java   |   6 +
 .../juneau/rest/annotation/ResourceSwagger.java    |   6 +
 .../apache/juneau/rest/annotation/Response.java    |   6 +
 .../apache/juneau/rest/annotation/RestHook.java    |   7 +-
 .../apache/juneau/rest/annotation/RestMethod.java  |   8 +-
 .../juneau/rest/annotation/RestResource.java       |   7 +-
 .../juneau/rest/converters/Introspectable.java     |   4 +-
 .../apache/juneau/rest/converters/Queryable.java   |   4 +-
 .../apache/juneau/rest/converters/Traversable.java |   4 +-
 .../apache/juneau/rest/labels/BeanDescription.java |   6 +
 .../rest/labels/ChildResourceDescriptions.java     |   6 +
 .../apache/juneau/rest/labels/NameDescription.java |   6 +
 .../juneau/rest/labels/ResourceDescription.java    |   6 +
 .../rest/matchers/MultipartFormDataMatcher.java    |   6 +
 .../rest/matchers/UrlEncodedFormMatcher.java       |   6 +
 .../remoteable/RemoteableServiceProperties.java    |   6 +
 .../juneau/rest/remoteable/RemoteableServlet.java  |   6 +-
 .../juneau/rest/response/DefaultHandler.java       |   6 +
 .../juneau/rest/response/InputStreamHandler.java   |   6 +
 .../apache/juneau/rest/response/ReaderHandler.java |   6 +
 .../juneau/rest/response/RedirectHandler.java      |   6 +
 .../juneau/rest/response/StreamableHandler.java    |   6 +
 .../juneau/rest/response/WritableHandler.java      |   6 +
 .../rest/response/ZipFileListResponseHandler.java  |   6 +
 .../java/org/apache/juneau/rest/vars/FileVar.java  |   6 +-
 .../apache/juneau/rest/vars/LocalizationVar.java   |   6 +-
 .../juneau/rest/vars/RequestAttributeVar.java      |   9 +-
 .../juneau/rest/vars/RequestFormDataVar.java       |   6 +-
 .../apache/juneau/rest/vars/RequestHeaderVar.java  |   6 +-
 .../apache/juneau/rest/vars/RequestPathVar.java    |   6 +-
 .../apache/juneau/rest/vars/RequestQueryVar.java   |   6 +-
 .../org/apache/juneau/rest/vars/RequestVar.java    |   6 +-
 .../org/apache/juneau/rest/vars/RestInfoVar.java   |   6 +-
 .../juneau/rest/vars/SerializedRequestAttrVar.java |   6 +-
 .../juneau/rest/vars/ServletInitParamVar.java      |   6 +-
 .../org/apache/juneau/rest/vars/UrlEncodeVar.java  |   6 +-
 .../java/org/apache/juneau/rest/vars/UrlVar.java   |   6 +-
 .../org/apache/juneau/rest/vars/WidgetVar.java     |   6 +-
 .../juneau/rest/widget/ContentTypeMenuItem.java    |   6 +
 .../apache/juneau/rest/widget/MenuItemWidget.java  |   6 +
 .../apache/juneau/rest/widget/PoweredByApache.java |   6 +
 .../apache/juneau/rest/widget/PoweredByJuneau.java |   6 +
 .../apache/juneau/rest/widget/QueryMenuItem.java   |   6 +
 .../apache/juneau/rest/widget/StyleMenuItem.java   |   6 +
 .../org/apache/juneau/rest/widget/Tooltip.java     |   6 +
 .../java/org/apache/juneau/rest/widget/Widget.java |   6 +
 104 files changed, 761 insertions(+), 132 deletions(-)

diff --git a/juneau-doc/src/main/javadoc/doc-files/HelloWorldResource.png b/juneau-doc/src/main/javadoc/doc-files/HelloWorldResource.png
new file mode 100644
index 0000000..4db4eaf
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/HelloWorldResource.png differ
diff --git a/juneau-doc/src/main/javadoc/doc-files/Samples_RootResources.png b/juneau-doc/src/main/javadoc/doc-files/Samples_RootResources.png
new file mode 100644
index 0000000..bf7bfc6
Binary files /dev/null and b/juneau-doc/src/main/javadoc/doc-files/Samples_RootResources.png differ
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index b2edee3..95b3393 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -148,17 +148,32 @@
 			<li><p><a class='doclink' href='#juneau-rest-server.ClassHierarchy'><i>Class Hierarchy</i></a></p>
 			<li><p><a class='doclink' href='#juneau-rest-server.Instantiation'><i>Instantiation</i></a></p>
 			<ol>
+				<li><p><a class='doclink' href='#juneau-rest-server.RestServlet'><i>RestServlet</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.RestServletDefault'><i>RestServletDefault</i></a></p>
 				<li><p><a class='doclink' href='#juneau-rest-server.Children'><i>Children</i></a></p>
 				<li><p><a class='doclink' href='#juneau-rest-server.RouterPages'><i>Router Pages</i></a></p>
 				<li><p><a class='doclink' href='#juneau-rest-server.ResourceResolvers'><i>Resource Resolvers</i></a></p>
 				<li><p><a class='doclink' href='#juneau-rest-server.LifecycleHooks'><i>Lifecycle Hooks</i></a></p>
+			</ol>
+			<li><p><a class='doclink' href='#juneau-rest-server.RestResource'><i>@RestResource</i></a></p>
+			<ol>
 				<li><p><a class='doclink' href='#juneau-rest-server.AnnotationInheritance'><i>Annotation Inheritance</i></a></p>
 			</ol>
-			<li><p><a class='doclink' href='#juneau-rest-server.RestMethod'><i>@RestMethod Annotation</i></a></p>
+			<li><p><a class='doclink' href='#juneau-rest-server.RestContext'><i>RestContext</i></a></p>
+			<li><p><a class='doclink' href='#juneau-rest-server.RestMethod'><i>@RestMethod</i></a></p>
 			<ol>
 				<li><p><a class='doclink' href='#juneau-rest-server.MethodParameters'><i>Java Method Parameters</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.RestRequest'><i>RestRequest</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.RestResponse'><i>RestResponse</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.RequestBody'><i>RequestBody</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.RequestHeaders'><i>RequestHeaders</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.RequestQuery'><i>RequestQuery</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.RequestFormData'><i>RequestFormData</i></a></p>
 				<li><p><a class='doclink' href='#juneau-rest-server.MethodReturnTypes'><i>Method Return Types</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.ReaderResource'><i>ReaderResource</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.StreamResource'><i>StreamResource</i></a></p>
 				<li><p><a class='doclink' href='#juneau-rest-server.RestMethodPath'><i>@RestMethod.path()</i></a></p>
+				<li><p><a class='doclink' href='#juneau-rest-server.RequestPathMatch'><i>RequestPathMatch</i></a></p>
 				<li><p><a class='doclink' href='#juneau-rest-server.RestMethodMatchers'><i>@RestMethod.matchers()</i></a></p>
 			</ol>
 			<li><p><a class='doclink' href='#juneau-rest-server.Body'><i>@Body</i></a></p>
@@ -204,8 +219,9 @@
 				<li><p><a class='doclink' href='#juneau-rest-server.RemoteableProxiesServerSide'><i>Remoteable Proxies - Server Side</i></a></p>
 				<li><p><a class='doclink' href='#juneau-rest-server.RemoteableProxiesRemoteableAnnotation'><i>Remoteable Proxies - @Remoteable Annotation</i></a></p>
 			</ol>
-			<li><p><a class='doclink' href='#juneau-rest-server.Injection'><i>Using with Spring or other Injection frameworks</i></a></p>
+			<li><p><a class='doclink' href='#juneau-rest-server.Injection'><i>Using with Spring and Injection frameworks</i></a></p>
 			<li><p><a class='doclink' href='#juneau-rest-server.HTTP2'><i>Using HTTP/2 features</i></a></p>
+			<li><p><a class='doclink' href='#juneau-rest-server.PredefinedLabelBeans'><i>Predefined Label Beans</i></a></p>
 			<li><p><a class='doclink' href='#juneau-rest-server.OtherNotes'><i>Other Notes</i></a></p>
 		</ol>
 		<li><p><a class='doclink' href='#juneau-rest-server-jaxrs'><i>3.2 - juneau-rest-server-jaxrs</i></a></p>
@@ -4937,7 +4953,7 @@
 			</p>
 			<ul>
 				<li>Deployed in a J2EE container as a servlet.
-				<li>Deployed as a child of another REST resources.
+				<li>Deployed as a child of another REST resource.
 			</ul>
 			<p>
 				When deployed in a J2EE container, you MUST extend from one of the servlet classes.
@@ -4947,10 +4963,24 @@
 
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.Children"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.3.1 - Children</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.3.1 - RestServlet</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.Children"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.3.2 - RestServletDefault</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.Children"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.3.3 - Children</h4>
 			<div class='topic'>
 				<p>
-					Child Resources are REST servlets that are linked to parent servlets through the 
+					Child Resources are REST servlets or objects that are linked to parent resources through the 
 					{@link org.apache.juneau.rest.annotation.RestResource#children() @RestResource.children()} annotation.
 				</p>
 				<h6 class='figure'>Example:</h6>
@@ -4958,7 +4988,7 @@
 	<jd>/** Parent Resource */</jd>
 	<ja>@RestResource</ja>(
 		path=<js>"/parent"</js>,
-		children={Foo.<jk>class</jk>}
+		children={FooResource.<jk>class</jk>}
 	)
 	<jk>public</jk> MyResource <jk>extends</jk> RestServletDefault {...}
 				</p>
@@ -4967,7 +4997,7 @@
  	<ja>@RestResource</ja>(
 		path=<js>"/foo"</js>  <jc>// Path relative to parent resource.</jc>
 	)
-	<jk>public</jk> FooResource {...}
+	<jk>public</jk> FooResource {...} <jc>// Note that we don't need to extend from RestServlet.</jc>
 				</p>
 				<p>
 					The path of the child resource gets appended to the path of the parent resource. 
@@ -4987,7 +5017,7 @@
 
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.RouterPages"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.3.2 - Router Pages</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.3.4 - Router Pages</h4>
 			<div class='topic'>
 				<p>
 					The {@link org.apache.juneau.rest.RestServletGroupDefault} class provides a default "router" page for 
@@ -5002,6 +5032,8 @@
 	 */</jd>
 	<ja>@RestResource</ja>(
 		path=<js>"/"</js>,
+		title=<js>"Root resources"</js>,
+		description=<js>"Example of a router resource page."</js>,
 		children={
 			HelloWorldResource.<jk>class</jk>,
 			MethodExampleResource.<jk>class</jk>,
@@ -5031,7 +5063,7 @@
 					When you bring up this resource in a browser, you see the following that provides a list
 					of navigable links to your child resources:
 				</p>
-				<img class='bordered' src="doc-files/Samples_RootResources.png"/>
+				<img class='bordered' src="doc-files/Samples_RootResources.png" style='width:800px;'/>
 				<p> 
 					The {@link org.apache.juneau.rest.RestServletGroupDefault} class is nothing more than a subclass of 
 					{@link org.apache.juneau.rest.RestServletDefault} with a <l>getChildren()</l> method mapped to the servlet 
@@ -5050,7 +5082,7 @@
 			</div>
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.ResourceResolvers"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.3.3 - Resource Resolvers</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.3.5 - Resource Resolvers</h4>
 			<div class='topic'>
 				<p>
 					By default, you can add the {@link org.apache.juneau.rest.annotation.RestResource @RestResource}
@@ -5085,7 +5117,7 @@
 			
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.LifecycleHooks"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.3.4 - Lifecycle Hooks</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.3.6 - Lifecycle Hooks</h4>
 			<div class='topic'>
 				<p>
 					Lifecycle hooks allow you to hook into lifecycle events of the servlet/resource creation and REST calls.
@@ -5146,9 +5178,17 @@
 				</ul>
 			</div>
 
+		</div>
+		
+		<!-- ======================================================================================================== -->
+		<a id="juneau-rest-server.RestResource"></a>
+		<h4 class='topic' onclick='toggle(this)'>3.1.4 - @RestResource</h4>
+		<div class='topic'>
+			TODO
+
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.AnnotationInheritance"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.3.5 - Annotation Inheritance</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.4.1 - Annotation Inheritance</h4>
 			<div class='topic'>
 				<p>
 					The {@link org.apache.juneau.rest.annotation.RestResource @RestResource} annotation can also be used on parents and interfaces of resource classes.
@@ -5282,10 +5322,17 @@
 				</table>
 			</div>
 		</div>
-
+		
+		<!-- ======================================================================================================== -->
+		<a id="juneau-rest-server.RestContext"></a>
+		<h4 class='topic' onclick='toggle(this)'>3.1.5 - RestContext</h4>
+		<div class='topic'>
+			TODO
+		</div>
+		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.RestMethod"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.4 - @RestMethod Annotation</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.6 - @RestMethod</h4>
 		<div class='topic'>
 			<p>
 				REST Java methods are identified on REST servlets using the 
@@ -5306,7 +5353,7 @@
 		
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.MethodParameters"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.4.1 - Java Method Parameters</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.1 - Java Method Parameters</h4>
 			<div class='topic'>
 				<p>
 					Java methods can contain any of the following parameters in any order:
@@ -5436,8 +5483,50 @@
 			</div>
 
 			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.RestRequest"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.2 - RestRequest</h4>
+			<div class='topic'>
+				TODO
+			</div>
+			
+			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.RestResponse"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.3 - RestResponse</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.RequestBody"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.4 - RequestBody</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.RequestHeaders"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.5 - RequestHeaders</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.RequestQuery"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.6 - RequestQuery</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.RequestFormData"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.7 - RequestFormData</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.MethodReturnTypes"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.4.2 - Method Return Types</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.8 - Method Return Types</h4>
 			<div class='topic'>
 				<p>
 					The return type can be any serializable POJO as defined in <a class='doclink' href='#juneau-marshall.PojoCategories'>POJO Categories</a>.
@@ -5536,10 +5625,23 @@
 				</ul>
 			</div>
 		
+			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.ReaderResource"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.9 - ReaderResource</h4>
+			<div class='topic'>
+				TODO
+			</div>
 		
 			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.ReaderResource"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.10 - StreamResource</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.RestMethodPath"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.4.3 - @RestMethod.path()</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.11 - @RestMethod.path()</h4>
 			<div class='topic'>
 				<p>
 					The {@link org.apache.juneau.rest.annotation.RestMethod#path() @RestMethod.path()} annotation allows 
@@ -5649,8 +5751,15 @@
 			</div>	
 	
 			<!-- ======================================================================================================== -->
+			<a id="juneau-rest-server.RequestFormData"></a>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.12 - RequestPathMatch</h4>
+			<div class='topic'>
+				TODO
+			</div>
+
+			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.RestMethodMatchers"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.4.4 - @RestMethod.matchers()</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.6.13 - @RestMethod.matchers()</h4>
 			<div class='topic'>
 				<p>
 					{@link org.apache.juneau.rest.RestMatcher RestMatchers} are used to allow multiple Java methods to be 
@@ -5703,13 +5812,15 @@
 				<h6 class='section'>See Also:</h6>
 				<ul>
 					<li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#matchers}
+					<li class='jc'>{@link org.apache.juneau.rest.matchers.MultipartFormDataMatcher}
+					<li class='jc'>{@link org.apache.juneau.rest.matchers.UrlEncodedFormMatcher}
 				</ul>
 			</div>
 		</div>
 
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Body"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.5 - @Body</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.7 - @Body</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.Body @Body} annotation provides easy access to the HTTP body content as any parsable POJO type
@@ -5755,7 +5866,7 @@
 
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.HandlingFormPosts"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.5.1 - Handling Form Posts</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.7.1 - Handling Form Posts</h4>
 			<div class='topic'>
 				<p>
 					The best way to handle a form post is by using an input bean.
@@ -5811,7 +5922,7 @@
 			</div>
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.HandlingMultiPartFormPosts"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.5.2 - Handling Multi-Part Form Posts</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.7.2 - Handling Multi-Part Form Posts</h4>
 			<div class='topic'>
 				<p>
 					The Juneau framework does not natively support multipart form posts.  
@@ -5860,7 +5971,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.FormData"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.6 - @FormData</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.8 - @FormData</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.FormData @FormData} annotation is used to retrieve request form post entries.
@@ -5907,7 +6018,7 @@
 		</div>
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Query"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.7 - @Query</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.9 - @Query</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.Query @Query} annotation is used to retrieve request URL query parameters.
@@ -5954,7 +6065,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Header"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.8 - @Header</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.10 - @Header</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.Header @Header} is used to retrieve request headers.
@@ -5988,7 +6099,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Serializers"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.9 - Serializers</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.11 - Serializers</h4>
 		<div class='topic'>
 			<p>
 				REST resources use the {@link org.apache.juneau.serializer.Serializer} API for defining serializers for 
@@ -6056,7 +6167,7 @@
 
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Parsers"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.10 - Parsers</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.12 - Parsers</h4>
 		<div class='topic'>
 			<p>
 				REST resources use the {@link org.apache.juneau.parser.Parser} API for defining parsers for parsing request
@@ -6122,7 +6233,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Properties"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.11 - Properties</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.13 - Properties</h4>
 		<div class='topic'>
 			<p>
 				As shown in previous sections, Juneau serializers and parsers are highly-configurable through properties.
@@ -6231,12 +6342,15 @@
 			<ul>
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.RestResource#flags()} - Shorthand for boolean properties.
 				<li class='ja'>{@link org.apache.juneau.rest.annotation.RestMethod#flags()} - Shorthand for boolean properties.
+				<li class='jc'>{@link org.apache.juneau.rest.RestContextProperties} 
+				<li class='jc'>{@link org.apache.juneau.rest.RestMethodProperties} 
+				<li class='jc'>{@link org.apache.juneau.rest.RequestProperties} 
 			</ul>
 		</div>
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Transforms"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.12 - Transforms</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.14 - Transforms</h4>
 		<div class='topic'>
 			<p>
 				The Juneau serializers and parsers can be configured on how to handle POJOs through the use of Transforms.
@@ -6293,7 +6407,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Guards"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.13 - Guards</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.15 - Guards</h4>
 		<div class='topic'>
 			<p>
 				Guards are classes that control access to REST classes and methods.
@@ -6370,7 +6484,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Converters"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.14 - Converters</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.16 - Converters</h4>
 		<div class='topic'>
 			<p>
 				Converters can be thought of as "post-processors" for POJOs before they get passed to the serializers.
@@ -6475,7 +6589,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Messages"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.15 - Messages</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.17 - Messages</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.RestResource#messages @RestResource.messages()} annotation is used to associate a resource bundle with a servlet class.
@@ -6525,7 +6639,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.Encoders"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.16 - Encoders</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.18 - Encoders</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.RestResource#encoders @RestResource.encoders()} annotation can 
@@ -6563,7 +6677,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.SvlVariables"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.17 - SVL Variables</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.19 - SVL Variables</h4>
 		<div class='topic'>
 			<p>	
 				In the previous examples, there were several cases where embedded variables were contained within
@@ -6708,7 +6822,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.ConfigurationFiles"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.18 - Configuration Files</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.20 - Configuration Files</h4>
 		<div class='topic'>
 			<p>
 				The Server API provides methods for associating configuration files with REST servlets so that 
@@ -6874,7 +6988,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.StaticFiles"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.19 - Static files</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.21 - Static files</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.RestResource#staticFiles @RestResource.staticFiles()} 
@@ -6926,7 +7040,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.ClientVersioning"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.20 - Client Versioning</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.22 - Client Versioning</h4>
 		<div class='topic'>
 			<p>
 				Client version headers are used to support backwards compatibility for breaking REST interface changes.
@@ -6973,7 +7087,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.OptionsPages"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.21 - OPTIONS pages</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.23 - OPTIONS pages</h4>
 		<div class='topic'>
 			<p>
 				One of the most useful features of Juneau is the ability to generate Swagger-based OPTIONS pages for self-documenting designs 
@@ -7274,7 +7388,7 @@
 
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.InfoProviders"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.21.1 - Info Providers</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.23.1 - Info Providers</h4>
 			<div class='topic'>
 				<p>
 					The {@link org.apache.juneau.rest.RestInfoProvider} class is used to find the title
@@ -7334,7 +7448,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.HtmlDocAnnotation"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.22 - @HtmlDoc</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.24 - @HtmlDoc</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.annotation.HtmlDoc @HtmlDoc} annotation is used to customize the HTML 
@@ -7453,7 +7567,7 @@
 
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.Widgets"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.22.1 - Widgets</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.24.1 - Widgets</h4>
 			<div class='topic'>
 				<p>
 					The {@link org.apache.juneau.rest.widget.Widget} class allows you to add arbitrary HTML, CSS, and Javascript
@@ -7567,14 +7681,14 @@
 
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.UiCustomization"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.22.2 - UI Customization</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.24.2 - UI Customization</h4>
 			<div class='topic'>
 				TODO
 			</div>
 
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.Stylesheets"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.22.3 - Stylesheets</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.24.3 - Stylesheets</h4>
 			<div class='topic'>
 				TODO
 			</div>
@@ -7582,7 +7696,7 @@
 
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.DefaultHeaders"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.23 - Default Headers</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.25 - Default Headers</h4>
 		<div class='topic'>
 			<p>
 				The following annotations are provided for specifying default header values for requests and responses:
@@ -7629,7 +7743,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.LoggingAndErrorHandling"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.24 - Logging and Error Handling</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.26 - Logging and Error Handling</h4>
 		<div class='topic'>
 			<p>
 				The {@link org.apache.juneau.rest.RestContext#REST_logger} property allows you to configure 
@@ -7692,7 +7806,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.HttpStatusCodes"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.25 - HTTP Status Codes</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.27 - HTTP Status Codes</h4>
 		<div class='topic'>
 			<p>
 				By default, a 200 (OK) status is automatically set as the HTTP status when a Java method executes 
@@ -7760,7 +7874,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.OverloadingHttpMethods"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.26 - Overloading HTTP Methods</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.28 - Overloading HTTP Methods</h4>
 		<div class='topic'>
 			<p>
 				Through the use of the built-in <l>"method"</l> GET parameter, you can implement requests beyond the basic 
@@ -7789,7 +7903,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.BuiltInParameters"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.27 - Built-in Parameters</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.29 - Built-in Parameters</h4>
 		<div class='topic'>
 			<p>
 				The following URL parameters have special meaning and can be passed in through the URL of the request:
@@ -7854,7 +7968,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.CustomSerializersAndParsers"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.28 - Custom Serializers and Parsers</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.30 - Custom Serializers and Parsers</h4>
 		<div class='topic'>
 			<p>
 				A very easy-to-use API is provided for defining your own serializers and parsers at both the servlet and 
@@ -7978,7 +8092,7 @@
 		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.UsingWithOsgi"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.29 - Using with OSGi</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.31 - Using with OSGi</h4>
 		<div class='topic'>
 			<p>
 				Since REST servlets are basically just <l>HttpServlets</l>, incorporating them into an OSGi environment
@@ -8045,7 +8159,7 @@
 
 		<!-- ======================================================================================================= -->
 		<a id="juneau-rest-server.RemoteableProxies"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.30 - Remoteable Proxies</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.32 - Remoteable Proxies</h4>
 		<div class='topic'>
 			<p>
 				The Remoteable Service API allows for client side code to use interface proxies for calling methods on POJOs on 
@@ -8253,7 +8367,7 @@
 			
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.RemoteableProxiesClientSide"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.30.1 - Remoteable Proxies - Client Side</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.32.1 - Remoteable Proxies - Client Side</h4>
 			<div class='topic'>
 				<p>
 					Remoteable interface proxies are retrieved through the existing {@link org.apache.juneau.rest.client.RestClient} 
@@ -8293,7 +8407,7 @@
 
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.RemoteableProxiesServerSide"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.30.2 - Remoteable Proxies - Server Side</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.32.2 - Remoteable Proxies - Server Side</h4>
 			<div class='topic'>
 				<p>
 					The server side is only slightly more complex, but boasts useful debugging and discovery capabilities.  
@@ -8443,7 +8557,7 @@
 			<!-- ======================================================================================================== -->
 			<a id="juneau-rest-server.RemoteableProxiesRemoteableAnnotation"></a>
 			<a id="RemoteableAnnotation"></a>
-			<h4 class='topic' onclick='toggle(this)'>3.1.30.3 - Remoteable Proxies - @Remoteable Annotation</h4>
+			<h4 class='topic' onclick='toggle(this)'>3.1.32.3 - Remoteable Proxies - @Remoteable Annotation</h4>
 			<div class='topic'>
 				<p>
 					What if you want fine-tuned control over which methods are exposed in an interface instead of just all public 
@@ -8493,7 +8607,7 @@
 	
 		<!-- ======================================================================================================= -->
 		<a id="juneau-rest-server.Injection"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.31 - Using with Spring or other Injection frameworks</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.33 - Using with Spring and Injection frameworks</h4>
 		<div class='topic'>
 			<p>
 				The Juneau REST server API is compatible with dependency injection frameworks such as Spring.
@@ -8600,7 +8714,7 @@
 
 		<!-- ======================================================================================================= -->
 		<a id="juneau-rest-server.HTTP2"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.32 - Using HTTP/2 features</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.34 - Using HTTP/2 features</h4>
 		<div class='topic'>
 			<p>
 				Juneau is built as a veneer on top of the Servlet API, allowing you to use low-level Servlet APIs
@@ -8613,9 +8727,16 @@
 			</p>
 		</div>
 		
+		<!-- ======================================================================================================= -->
+		<a id="juneau-rest-server.PredefinedLabelBeans"></a>
+		<h4 class='topic' onclick='toggle(this)'>3.1.35 - Predefined Label Beans</h4>
+		<div class='topic'>
+			TODO
+		</div>
+		
 		<!-- ======================================================================================================== -->
 		<a id="juneau-rest-server.OtherNotes"></a>
-		<h4 class='topic' onclick='toggle(this)'>3.1.33 - Other Notes</h4>
+		<h4 class='topic' onclick='toggle(this)'>3.1.36 - Other Notes</h4>
 		<div class='topic'>
 			<ul class='spaced-list'>
 				<li>
@@ -8662,7 +8783,7 @@
 
 		<h6 class='toc'>Additional Information - org.apache.juneau.rest.jaxrs</h6>
 		<ol class='toc'>
-			<li><p><a class='doclink' href='org/apache/juneau/rest/jaxrs/package-summary.html##BaseProvider'>Juneau JAX-RS Provider</a></p>
+			<li><p><a class='doclink' href='org/apache/juneau/rest/jaxrs/package-summary.html#BaseProvider'>Juneau JAX-RS Provider</a></p>
 		</ol>
 	</div>
 
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
index 53b6e00..b34e505 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
@@ -28,8 +28,7 @@ import org.apache.juneau.rest.annotation.*;
 	htmldoc=@HtmlDoc(
 		navlinks={
 			"up: request:/..",
-			"options: servlet:/?method=OPTIONS",
-			"source: $C{Source/gitHub}/org/apache/juneau/examples/rest/$R{servletClassSimple}.java"
+			"options: servlet:/?method=OPTIONS"
 		},
 		aside={
 			"<div style='max-width:400px' class='text'>",
diff --git a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
index 1a9d20d..72d633d 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
+++ b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/BaseProvider.java
@@ -33,6 +33,12 @@ import org.apache.juneau.serializer.*;
 
 /**
  * Base class for defining JAX-RS providers based on Juneau serializers and parsers.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server-jaxrs">Overview &gt; juneau-rest-server-jaxrs</a>
+ * </ul>
  */
 public class BaseProvider implements MessageBodyReader<Object>, MessageBodyWriter<Object> {
 
diff --git a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/DefaultProvider.java b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/DefaultProvider.java
index 1407508..3f824af 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/DefaultProvider.java
+++ b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/DefaultProvider.java
@@ -25,6 +25,12 @@ import org.apache.juneau.xml.*;
 
 /**
  * JAX-RS provider for the same serialize/parse support provided by the {@link RestServletDefault} class.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server-jaxrs">Overview &gt; juneau-rest-server-jaxrs</a>
+ * </ul>
  */
 @Provider
 @Produces({
diff --git a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
index fdd69d2..950ed3a 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
+++ b/juneau-rest/juneau-rest-server-jaxrs/src/main/java/org/apache/juneau/rest/jaxrs/JuneauProvider.java
@@ -33,6 +33,12 @@ import org.apache.juneau.xml.*;
  * <h5 class='topic'>Description</h5>
  * 
  * Used to associate serializers, parsers, filters, and properties with instances of {@link BaseProvider}.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server-jaxrs">Overview &gt; juneau-rest-server-jaxrs</a>
+ * </ul>
  */
 @Documented
 @Target(TYPE)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ClientVersionMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ClientVersionMatcher.java
index e323a0f..f67a67e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ClientVersionMatcher.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ClientVersionMatcher.java
@@ -20,8 +20,11 @@ import org.apache.juneau.rest.annotation.*;
 /**
  * Specialized matcher for matching client versions.
  * 
- * <p>
- * See {@link RestResource#clientVersionHeader} and {@link RestMethod#clientVersion} for more info.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.ClientVersioning">Overview &gt; Client Versioning</a>
+ * </ul>
  */
 public class ClientVersionMatcher extends RestMatcher {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java
index ce1731e..22f8e6d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/HtmlDocBuilder.java
@@ -36,6 +36,12 @@ import org.apache.juneau.utils.*;
  * 	<li class='jm'>{@link RestContextBuilder#getHtmlDocBuilder()} - Set values programmatically during servlet initialization.
  * 	<li class='jm'>{@link RestResponse#getHtmlDocBuilder()} - Set values programmatically during a REST request.
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.HtmlDoc">Overview &gt; @HtmlDoc</a>
+ * </ul>
  */
 public class HtmlDocBuilder {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/MessageBundleLocation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/MessageBundleLocation.java
index c10f7ac..b697114 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/MessageBundleLocation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/MessageBundleLocation.java
@@ -17,6 +17,12 @@ package org.apache.juneau.rest;
  * 
  * <p>
  * Identifies a message bundle by a base class and bundle path.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Messages">Overview &gt; Messages</a>
+ * </ul>
  */
 public class MessageBundleLocation {
 	
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ReaderResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ReaderResource.java
index d9762f9..2bc7aa3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ReaderResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ReaderResource.java
@@ -30,6 +30,12 @@ import org.apache.juneau.svl.*;
  * 
  * <p>
  * This class is handled special by the {@link WritableHandler} class.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.ReaderResource">Overview &gt; ReaderResource</a>
+ * </ul>
  */
 public class ReaderResource implements Writable {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java
index 6f50c27..41e9cb6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/Redirect.java
@@ -69,6 +69,12 @@ import org.apache.juneau.urlencoding.*;
  * <p>
  * This class is handled by {@link org.apache.juneau.rest.response.RedirectHandler}, a built-in default response
  * handler created in {@link RestContextBuilder}.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public final class Redirect {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
index 7047109..9139d65 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
@@ -30,6 +30,12 @@ import org.apache.juneau.parser.*;
 
 /**
  * Contains the body of the HTTP request.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestBody">Overview &gt; RequestBody</a>
+ * </ul>
  */
 @SuppressWarnings("unchecked")
 public class RequestBody {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
index 0fda7cb..46811dd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
@@ -25,6 +25,12 @@ import org.apache.juneau.parser.*;
 
 /**
  * Represents the parsed form data parameters in an HTTP request.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestFormData">Overview &gt; RequestFormData</a>
+ * </ul>
  */
 @SuppressWarnings("unchecked")
 public class RequestFormData extends LinkedHashMap<String,String[]> {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
index a79a384..438b055 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
@@ -31,6 +31,12 @@ import org.apache.juneau.parser.*;
  * 
  * <p>
  * Entries are stored in a case-insensitive map.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Header">Overview &gt; @Header</a>
+ * </ul>
  */
 public class RequestHeaders extends TreeMap<String,String[]> {
 	private static final long serialVersionUID = 1L;
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java
index 49e4eda..7709592 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestPathMatch.java
@@ -26,6 +26,12 @@ import org.apache.juneau.parser.*;
  * 
  * <p>
  * Provides access to the matched path variables and path match remainder.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestPathMatch">Overview &gt; RequestPathMatch</a>
+ * </ul>
  */
 @SuppressWarnings("unchecked")
 public class RequestPathMatch extends TreeMap<String,String> {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestProperties.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestProperties.java
index b432cef..eb2b17b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestProperties.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestProperties.java
@@ -26,6 +26,12 @@ import org.apache.juneau.svl.*;
  * 	<li class='jm'>{@link RestResponse#getProperties()}
  * 	<li class='jm'>{@link RestResponse#prop(String, Object)}
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Properties">Overview &gt; Properties</a>
+ * </ul>
  */
 @SuppressWarnings("serial")
 public class RequestProperties extends ResolvingObjectMap {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
index aff7e5e..5596489 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
@@ -29,6 +29,12 @@ import org.apache.juneau.xml.*;
 
 /**
  * Represents the query parameters in an HTTP request.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RequestQuery">Overview &gt; RequestQuery</a>
+ * </ul>
  */
 @SuppressWarnings("unchecked")
 public final class RequestQuery extends LinkedHashMap<String,String[]> {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
index 475d4f4..b0fdf6f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponseHandler.java
@@ -90,6 +90,12 @@ import org.apache.juneau.rest.response.*;
  * 		}
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public interface ResponseHandler {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandler.java
index c7dabc9..a24d8f0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCallHandler.java
@@ -22,6 +22,7 @@ import javax.servlet.http.*;
 /**
  * Class that handles the basic lifecycle of an HTTP REST call.
  * 
+ * 
  * <h5 class='topic'>Additional Information</h5>
  * <ul>
  * 	<li class='jf'>{@link RestContext#REST_callHandler}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java
index 59f3119..714ddff 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestChild.java
@@ -29,6 +29,12 @@ package org.apache.juneau.rest;
  * 		}
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Children">Overview &gt; Children</a>
+ * </ul>
  */
 public class RestChild {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index b7da267..de0da8b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -59,8 +59,11 @@ import org.apache.juneau.xml.*;
 /**
  * Contains all the configuration on a REST resource and the entry points for handling REST calls.
  * 
- * <p>
- * See {@link PropertyStore} for more information about context properties.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestContext">Overview &gt; RestContext</a>
+ * </ul>
  */
 public final class RestContext extends BeanContext {
 	
@@ -454,7 +457,7 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="package-summary.html#RestResources.Children">org.apache.juneau.rest &gt; Children</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Children">Overview &gt; Children</a>
 	 * </ul>
 	 */
 	public static final String REST_children = PREFIX + "children.lo";
@@ -773,7 +776,7 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="package-summary.html#RestResources.Converters">org.apache.juneau.rest &gt; Converters</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Converters">Overview &gt; Converters</a>
 	 * </ul>
 	 * 
 	 * <h5 class='section'>Notes:</h5>
@@ -1035,7 +1038,7 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="package-summary.html#RestResources.Encoders">org.apache.juneau.rest &gt; Encoders</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Encoders">Overview &gt; Encoders</a>
 	 * </ul>
 	 */
 	public static final String REST_encoders = PREFIX + "encoders.lo";
@@ -1118,7 +1121,7 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="package-summary.html#RestResources.Guards">org.apache.juneau.rest &gt; Guards</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Guards">Overview &gt; Guards</a>
 	 * </ul>
 	 */
 	public static final String REST_guards = PREFIX + "guards.lo";
@@ -1283,7 +1286,7 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="package-summary.html#RestResources.Errors">org.apache.juneau.rest &gt; Handling Errors and Logging</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.LoggingAndErrorHandling">Overview &gt; Logging and Error Handling</a>
 	 * </ul>
 	 */
 	public static final String REST_logger = PREFIX + "logger.o";
@@ -1432,7 +1435,7 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="package-summary.html#RestResources.Labels">org.apache.juneau.rest &gt; Localized Messages</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Messages">Overview &gt; Messages</a>
 	 * </ul>
 	 */
 	public static final String REST_messages = PREFIX + "messages.lo";
@@ -1678,7 +1681,7 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="package-summary.html#RestResources.Parsers">org.apache.juneau.rest &gt; Parsers</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Parsers">Overview &gt; Parsers</a>
 	 * </ul>
 	 */
 	public static final String REST_parsers = PREFIX + "parsers.lo";
@@ -2034,7 +2037,8 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Injection">Overview &gt; Using with Spring or other Injection frameworks</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.ResourceResolvers">Overview &gt; Resource Resolvers</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Injection">Overview &gt; Using with Spring and Injection frameworks</a>
 	 * </ul>
 	 */
 	public static final String REST_resourceResolver = PREFIX + "resourceResolver.o";
@@ -2228,7 +2232,7 @@ public final class RestContext extends BeanContext {
 	 * 
 	 * <h5 class='section'>Documentation:</h5>
 	 * <ul>
-	 * 	<li><a class="doclink" href="package-summary.html#RestResources.Serializers">org.apache.juneau.rest &gt; Serializers</a>
+	 * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Serializers">Overview &gt; Serializers</a>
 	 * </ul>
 	 * <p>
 	 */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index b0e14d5..538897a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -24,7 +24,6 @@ import java.nio.charset.*;
 import java.util.*;
 
 import javax.servlet.*;
-import javax.servlet.http.*;
 
 import org.apache.juneau.*;
 import org.apache.juneau.encoders.*;
@@ -62,24 +61,29 @@ import org.apache.juneau.utils.*;
  * through calls on this object.
  * 
  * <p>
- * To interact with this object, simply implement the following init method in your resource class:
+ * To interact with this object, simply pass it in as a constructor argument or in an INIT hook.
  * <p class='bcode'>
- * 	<jk>public synchronized void</jk> init(RestContextBuilder builder) <jk>throws</jk> Exception {
- * 		builder
- * 			.pojoSwaps(CalendarSwap.<jsf>RFC2822DTZ</jsf>.<jk>class</jk>)
- * 			.set(<jsf>PARSER_debug</jsf>, <jk>true</jk>);
- * 		<jk>super</jk>.init(builder); <jc>// Make sure this is the last line! (or just leave it out entirely)</jc>
+ * 	<jc>// Option #1 - Pass in through constructor.</jc>
+ * 	<jk>public</jk> MyResource(RestContextBuilder builder) {
+ * 			builder
+ * 				.pojoSwaps(CalendarSwap.<jsf>RFC2822DTZ</jsf>.<jk>class</jk>)
+ * 				.set(<jsf>PARSER_debug</jsf>, <jk>true</jk>);
+ * 	}
+ * 
+ * 	<jc>// Option #2 - Use an INIT hook.</jc>
+ * 	<ja>@RestHook</ja>(<jsf>INIT</jsf>)
+ * 	<jk>public void</jk> init(RestContextBuilder builder) <jk>throws</jk> Exception {
+ * 			builder
+ * 				.pojoSwaps(CalendarSwap.<jsf>RFC2822DTZ</jsf>.<jk>class</jk>)
+ * 				.set(<jsf>PARSER_debug</jsf>, <jk>true</jk>);
  * 	}
  * </p>
  * 
- * <p>
- * Note that this method is identical to {@link HttpServlet#init(ServletConfig)} except you get access to
- * this object instead.  Also, this method can throw any exception, not just a {@link ServletException}.
  * 
- * <p>
- * The parent <code>init(RestServletConfig)</code> method will construct a read-only {@link RestContext} object
- * that contains a snapshot of these settings.  If you call <code><jk>super</jk>.init(RestServletConfig)</code> before
- * you modify this config object, you won't see the changes!
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestContext">Overview &gt; RestContext</a>
+ * </ul>
  */
 public class RestContextBuilder extends BeanContextBuilder implements ServletConfig {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextProperties.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextProperties.java
index e7a64e4..1dd5ba9 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextProperties.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextProperties.java
@@ -27,6 +27,12 @@ import org.apache.juneau.rest.annotation.*;
  * 	<li class='jm'>{@link RestContextBuilder#set(String, Object)}
  * 	<li class='jm'>{@link RestContextBuilder#set(Map)}
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Properties">Overview &gt; Properties</a>
+ * </ul>
  */
 @SuppressWarnings("serial")
 public class RestContextProperties extends ObjectMap {}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
index 8c67bf8..1b30bdc 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestConverter.java
@@ -50,6 +50,7 @@ import org.apache.juneau.serializer.*;
  * Converters can also be associated at the servlet level using the {@link RestResource#converters() @RestResource.converters()} annotation.
  * <br>Applying converters at the resource level is equivalent to applying converters to each resource method individually.
  * 
+ * 
  * <h6 class='topic'>How to implement</h6>
  * 
  * Implementers should simply implement the {@link #convert(RestRequest, Object)} and return back a 'converted' object.
@@ -65,6 +66,7 @@ import org.apache.juneau.serializer.*;
  * <p>
  * Subclasses can also be defined as inner classes of the resource class.
  * 
+ * 
  * <h5 class='topic'>Predefined converters</h5>
  * <ul>
  * 	<li class='jc'>{@link Traversable} - Allows URL additional path info to address individual elements in a POJO tree.
@@ -79,9 +81,9 @@ import org.apache.juneau.serializer.*;
  * </ul>
  * 
  * 
- * <h5 class='topic'>Documentation</h5>
+ * <h5 class='section'>Documentation:</h5>
  * <ul>
- * 	<li><a class="doclink" href="package-summary.html#RestResources.Converters">org.apache.juneau.rest &gt; Converters</a>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Converters">Overview &gt; Converters</a>
  * </ul>
  */
 public interface RestConverter {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
index e762d8d..1e63a67 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestGuard.java
@@ -66,6 +66,12 @@ import org.apache.juneau.rest.annotation.*;
  * 		}
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Guards">Overview &gt; Guards</a>
+ * </ul>
  */
 public abstract class RestGuard {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
index 188540e..cf11570 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProvider.java
@@ -25,10 +25,17 @@ import org.apache.juneau.rest.annotation.*;
  * <p>
  * Provides localized Swagger documentation and other related information about a REST resource.
  * 
+ * 
  * <h5 class='topic'>Additional Information</h5>
  * <ul>
  * 	<li class='jf'>{@link RestContext#REST_infoProvider}
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; OPTIONS Pages</a>
+ * </ul>
  */
 public interface RestInfoProvider {
 	
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProviderDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProviderDefault.java
index 983856a..2f6c273 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProviderDefault.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestInfoProviderDefault.java
@@ -34,10 +34,17 @@ import org.apache.juneau.svl.*;
  * <p>
  * Subclasses can override these methods to tailor how HTTP REST resources are documented.
  * 
+ * 
  * <h5 class='topic'>Additional Information</h5>
  * <ul>
  * 	<li class='jf'>{@link RestContext#REST_infoProvider}
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; OPTIONS Pages</a>
+ * </ul>
  */
 public class RestInfoProviderDefault implements RestInfoProvider {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
index 12e0b5d..a557ee3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLogger.java
@@ -27,6 +27,12 @@ import org.apache.juneau.json.*;
  * <ul>
  * 	<li class='jf'>{@link RestContext#REST_logger}
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.LoggingAndErrorHandling">Overview &gt; Logging and Error Handling</a>
+ * </ul>
  */
 public interface RestLogger {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerDefault.java
index ed4d6a0..690a23d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerDefault.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerDefault.java
@@ -31,9 +31,9 @@ import org.apache.juneau.json.*;
  * <br>Subclasses MUST implement a no-arg public constructor.
  * 
  * 
- * <h5 class='topic'>Additional Information</h5>
+ * <h5 class='section'>Documentation:</h5>
  * <ul>
- * 	<li class='jf'>{@link RestContext#REST_callHandler}
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.LoggingAndErrorHandling">Overview &gt; Logging and Error Handling</a>
  * </ul>
  */
 public class RestLoggerDefault implements RestLogger {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerNoOp.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerNoOp.java
index 49e1821..ced4d07 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerNoOp.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestLoggerNoOp.java
@@ -23,9 +23,9 @@ import java.util.logging.*;
  * Disables logging entirely.
  * 
  * 
- * <h5 class='topic'>Additional Information</h5>
+ * <h5 class='section'>Documentation:</h5>
  * <ul>
- * 	<li class='jf'>{@link RestContext#REST_callHandler}
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.LoggingAndErrorHandling">Overview &gt; Logging and Error Handling</a>
  * </ul>
  */
 public class RestLoggerNoOp extends RestLoggerDefault {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
index 5bf108d..1d242e6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMatcher.java
@@ -62,6 +62,12 @@ import org.apache.juneau.rest.annotation.*;
  * 	<li>The following args: <code>Object resource, Method javaMethod</code>.
  * 		<br>This gives access to the servlet/resource and Java method it's applied to.
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestMethodMatchers">Overview &gt; @RestMethod.matchers()</a>
+ * </ul>
  */
 public abstract class RestMatcher {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodProperties.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodProperties.java
index 8658508..c4c27be 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodProperties.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodProperties.java
@@ -25,6 +25,12 @@ import org.apache.juneau.rest.annotation.*;
  * 	<li class='ja'>{@link RestMethod#properties()}
  * 	<li class='ja'>{@link HtmlDoc}
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.Properties">Overview &gt; Properties</a>
+ * </ul>
  */
 @SuppressWarnings("serial")
 public class RestMethodProperties extends ObjectMap {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java
index 256b36e..4c53802 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParam.java
@@ -105,10 +105,17 @@ import org.apache.juneau.utils.*;
  *  	</ul>
  * </ul>
  * 
+ * 
  * <h5 class='topic'>Additional Information</h5>
  * <ul>
  * 	<li class='jf'>{@link RestContext#REST_paramResolvers}
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.MethodParameters">Overview &gt; Java Method Parameters</a>
+ * </ul>
  */
 public abstract class RestParam {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
index 20f7888..1eaea31 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
@@ -37,8 +37,14 @@ import org.apache.juneau.utils.*;
 /**
  * Default REST method parameter resolvers.
  * 
+ * <p>
  * Contains the default set of parameter resolvers for REST resource methods (i.e methods annotated with {@link RestResource @RestResource}).
  * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.MethodParameters">Overview &gt; Java Method Parameters</a>
+ * </ul>
  */
 class RestParamDefaults {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamType.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamType.java
index 70fe2eb..2e23cf1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamType.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamType.java
@@ -14,6 +14,12 @@ package org.apache.juneau.rest;
 
 /**
  * Represents the possible parameter types as defined by the Swagger 2.0 specification.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; OPTIONS pages</a>
+ * </ul>
  */
 public enum RestParamType {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index cc8b4a3..15d56d0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -61,9 +61,11 @@ import org.apache.juneau.utils.*;
  * 	<tr><td>{@code getServletPath()}</td><td>{@code /servletPath}</td></tr>
  * </table>
  * 
- * <p>
- * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this
- * class.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestRequest">Overview &gt; RestRequest</a>
+ * </ul>
  */
 @SuppressWarnings({ "unchecked", "unused" })
 public final class RestRequest extends HttpServletRequestWrapper {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
index 5041552..fbc7a30 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolver.java
@@ -34,6 +34,12 @@ import org.apache.juneau.rest.annotation.*;
  * 	<li>RestResourceResolver()
  * 	<li>RestResourceResolver(RestContext)
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.ResourceResolvers">Overview &gt; Resource Resolvers</a>
+ * </ul>
  */
 public interface RestResourceResolver {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverDefault.java
index 467fd93..a096415 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverDefault.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResourceResolverDefault.java
@@ -30,6 +30,12 @@ import org.apache.juneau.internal.*;
  * 
  * <p>
  * Child classes can also be defined as inner-classes of the parent resource class.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.ResourceResolvers">Overview &gt; Resource Resolvers</a>
+ * </ul>
  */
 public class RestResourceResolverDefault implements RestResourceResolver {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index 9a42d42..220dd58 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -46,9 +46,11 @@ import org.apache.juneau.serializer.*;
  * 	}
  * </p>
  * 
- * <p>
- * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this
- * class.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestResponse">Overview &gt; RestResponse</a>
+ * </ul>
  */
 public final class RestResponse extends HttpServletResponseWrapper {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
index d53ddd9..be9b30c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -29,9 +29,11 @@ import org.apache.juneau.utils.*;
 /**
  * Servlet implementation of a REST resource.
  * 
- * <p>
- * Refer to <a class="doclink" href="package-summary.html#TOC">REST Servlet API</a> for information about using this
- * class.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestServlet">Overview &gt; RestServlet</a>
+ * </ul>
  */
 public abstract class RestServlet extends HttpServlet {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
index f0afb45..9d971bc 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletDefault.java
@@ -146,6 +146,7 @@ import org.apache.juneau.xml.*;
  * <p>
  * The OPTIONS page can be modified or augmented by overriding this method and providing your own data.
  * 
+ * 
  * <h6 class='topic'>Other Notes</h6>
  * <ul class='spaced-list'>
  * 	<li>
@@ -157,6 +158,12 @@ import org.apache.juneau.xml.*;
  * 		This allows files inside the <code>[servletPackage].htdocs</code> package to be served up under the URL
  * 		<code>/servletPath/htdocs</code>.
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RestServletDefault">Overview &gt; RestServletDefault</a>
+ * </ul>
  */
 @RestResource(
 	serializers={
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
index 8f4e639..4a2abfe 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServletGroupDefault.java
@@ -26,6 +26,12 @@ import org.apache.juneau.rest.labels.*;
  * 
  * <p>
  * Child resources are specified using the {@link RestResource#children() @RestResource.children()} annotation.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.RouterPages">Overview &gt; Router Pages</a>
+ * </ul>
  */
 @RestResource()
 public abstract class RestServletGroupDefault extends RestServletDefault {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
index e769d1f..f735e06 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFileMapping.java
@@ -58,6 +58,12 @@ import org.apache.juneau.utils.*;
  * 	<li>
  * 		The media type on the response is determined by the {@link org.apache.juneau.rest.RestContext#getMediaTypeForName(String)} method.
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.StaticFiles">Overview &gt; Static Files</a>
+ * </ul>
  */
 public class StaticFileMapping {
 	
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java
index bbe29c7..b8668c4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StreamResource.java
@@ -33,6 +33,12 @@ import org.apache.juneau.rest.response.*;
  * <p>
  * This class is handled special by the {@link StreamableHandler} class.
  * This allows these objects to be returned as responses by REST methods.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../overview-summary.html#juneau-rest-server.StreamResource">Overview &gt; StreamResource</a>
+ * </ul>
  */
 public class StreamResource implements Streamable {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java
index 33f3c61..85efad6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Body.java
@@ -49,6 +49,12 @@ import java.lang.annotation.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Body">Overview &gt; @Body</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java
index dadbf85..3cac89a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/FormData.java
@@ -45,6 +45,7 @@ import org.apache.juneau.rest.*;
  * 	}
  * </p>
  * 
+ * 
  * <h6 class='topic'>Important note concerning FORM posts</h6>
  * 
  * This annotation should not be combined with the {@link Body @Body} annotation or {@link RestRequest#getBody()} method
@@ -54,6 +55,12 @@ import org.apache.juneau.rest.*;
  * <p>
  * The {@link Query @Query} annotation can be used to retrieve a URL parameter in the URL string without triggering the
  * servlet to drain the body content.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.FormData">Overview &gt; @FormData</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
index 021d189..b0aa38d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasFormData.java
@@ -74,6 +74,7 @@ import org.apache.juneau.rest.*;
  * 	</tr>
  * </table>
  * 
+ * 
  * <h6 class='topic'>Important note concerning FORM posts</h6>
  * 
  * This annotation should not be combined with the {@link Body @Body} annotation or {@link RestRequest#getBody()} method
@@ -83,6 +84,12 @@ import org.apache.juneau.rest.*;
  * <p>
  * The {@link HasQuery @HasQuery} annotation can be used to check for the existing of a URL parameter in the URL string
  * without triggering the servlet to drain the body content.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.FormData">Overview &gt; @FormData</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
index 98b724e..2126353 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HasQuery.java
@@ -46,6 +46,12 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Query">Overview &gt; @Query</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java
index 936fd1a..7b56ab0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Header.java
@@ -40,6 +40,12 @@ import org.apache.juneau.httppart.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Header">Overview &gt; @Header</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
index 7051963..7c6bca8 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
@@ -30,6 +30,12 @@ import org.apache.juneau.utils.*;
 /**
  * Identifies servlet and REST call lifecycle events which cause {@link RestHook @RestHook}-annotated Java methods
  * to be called.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.LifecycleHooks">Overview &gt; Lifecycle Hooks</a>
+ * </ul>
  */
 public enum HookEvent {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
index 016b69c..8af55eb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HtmlDoc.java
@@ -73,6 +73,12 @@ import org.apache.juneau.rest.widget.*;
  * 		&lt;/body&gt;
  * 	&lt;/html&gt;</xt>
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.HtmlDoc">Overview &gt; @HtmlDoc</a>
+ * </ul>
  */
 public @interface HtmlDoc {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
index 75b4702..185395a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Method.java
@@ -41,6 +41,12 @@ import java.lang.annotation.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodParameters">Overview &gt; Method Parameters</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
index 1512cb0..ea9c5cd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/MethodSwagger.java
@@ -18,6 +18,12 @@ import org.apache.juneau.svl.vars.*;
 
 /**
  * Extended annotation for {@link RestMethod#swagger() RestMethod.swagger()}.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; OPTIONS Pages</a>
+ * </ul>
  */
 public @interface MethodSwagger {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
index ed8cdb0..bb7bfcb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Parameter.java
@@ -21,6 +21,7 @@ import java.lang.annotation.*;
  * Annotation used in conjunction with {@link MethodSwagger#parameters() @MethodSwagger.parameters()} to identify 
  * content and header descriptions on specific method requests.
  * 
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(
@@ -35,6 +36,12 @@ import java.lang.annotation.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; OPTIONS Pages</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.java
index da72d23..cdb5b1c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Path.java
@@ -23,6 +23,7 @@ import org.apache.juneau.httppart.*;
  * Annotation that can be applied to a parameter of a {@link RestMethod @RestMethod} annotated method to identify it as a variable
  * in a URL path pattern converted to a POJO.
  * 
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/myurl/{foo}/{bar}/{baz}/*"</js>)
@@ -67,6 +68,12 @@ import org.apache.juneau.httppart.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodParameters">Overview &gt; Method Parameters</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
index 375cb75..e3dceeb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/PathRemainder.java
@@ -21,6 +21,7 @@ import java.lang.annotation.*;
  * Annotation that can be applied to a parameter of a {@link RestMethod @RestMethod} annotated method to identify it as the URL
  * parameter remainder after a path pattern match.
  * 
+ * 
  * <h5 class='section'>Example:</h5>
  * <p class='bcode'>
  * 	<ja>@RestMethod</ja>(name=<jsf>GET</jsf>, path=<js>"/foo/*"</js>)
@@ -38,6 +39,12 @@ import java.lang.annotation.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodParameters">Overview &gt; Method Parameters</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
index 7f49fbc..64ff59a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Property.java
@@ -27,8 +27,11 @@ import java.lang.annotation.*;
  * Property values types that are not <code>Strings</code> will automatically be converted to the correct type
  * (e.g. <code>Boolean</code>, etc...).
  * 
- * <p>
- * See {@link RestResource#properties} for more information.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Properties">Overview &gt; Properties</a>
+ * </ul>
  */
 @Documented
 @Target(ANNOTATION_TYPE)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java
index a210030..eb8b9e7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Query.java
@@ -50,6 +50,12 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Query">Overview &gt; @Query</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
index 058a4b2..0c67183 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/ResourceSwagger.java
@@ -19,6 +19,12 @@ import org.apache.juneau.svl.vars.*;
 
 /**
  * Extended annotation for {@link RestResource#swagger() @RestResource.swagger()}.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; OPTIONS pages</a>
+ * </ul>
  */
 public @interface ResourceSwagger {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java
index e9dd934..38e0161 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Response.java
@@ -38,6 +38,12 @@ import org.apache.juneau.rest.*;
  * 		...
  * 	}
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.OptionsPages">Overview &gt; OPTIONS pages</a>
+ * </ul>
  */
 @Documented
 @Target(PARAMETER)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
index b1556cd..c2eee6f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestHook.java
@@ -70,8 +70,11 @@ import java.lang.annotation.*;
  * 		</ul>
  * </ul>
  * 
- * <p>
- * See the {@link HookEvent} class for information about individual event types.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.LifecycleHooks">Overview &gt; Lifecycle Hooks</a>
+ * </ul>
  */
 @Documented
 @Target(METHOD)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
index 6b79b84..871bceb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
@@ -29,8 +29,12 @@ import org.apache.juneau.svl.vars.*;
 
 /**
  * Identifies a REST Java method on a {@link RestServlet} implementation class.
- * <p>
- * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on using this class.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.RestMethod">Overview &gt; @RestMethod</a>
+ * </ul>
  */
 @Documented
 @Target(METHOD)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
index bec697e..e274a6f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestResource.java
@@ -35,8 +35,11 @@ import org.apache.juneau.utils.*;
  * Usually used on a subclass of {@link RestServlet}, but can be used to annotate any class that you want to expose as
  * a REST resource.
  * 
- * Refer to <a class='doclink' href='../package-summary.html#TOC'>org.apache.juneau.rest</a> doc for information on
- * using this class.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.RestResource">Overview &gt; @RestResource</a>
+ * </ul>
  */
 @Documented
 @Target(TYPE)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Introspectable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
index 128f89c..f6bedfb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Introspectable.java
@@ -50,9 +50,9 @@ import org.apache.juneau.utils.*;
  * </ul>
  * 
  * 
- * <h5 class='topic'>Documentation</h5>
+ * <h5 class='section'>Documentation:</h5>
  * <ul>
- * 	<li><a class="doclink" href="../package-summary.html#RestResources.Converters">org.apache.juneau.rest &gt; Converters</a>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Converters">Overview &gt; Converters</a>
  * </ul>
  */
 public final class Introspectable implements RestConverter {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Queryable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Queryable.java
index 1b99155..29bbd02 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Queryable.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Queryable.java
@@ -69,9 +69,9 @@ import org.apache.juneau.utils.*;
  * </ul>
  * 
  * 
- * <h5 class='topic'>Documentation</h5>
+ * <h5 class='section'>Documentation:</h5>
  * <ul>
- * 	<li><a class="doclink" href="../package-summary.html#RestResources.Converters">org.apache.juneau.rest &gt; Converters</a>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Converters">Overview &gt; Converters</a>
  * </ul>
  */
 public final class Queryable implements RestConverter {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
index 0e359c2..6fcb0eb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converters/Traversable.java
@@ -49,9 +49,9 @@ import org.apache.juneau.utils.*;
  * </ul>
  * 
  * 
- * <h5 class='topic'>Documentation</h5>
+ * <h5 class='section'>Documentation:</h5>
  * <ul>
- * 	<li><a class="doclink" href="../package-summary.html#RestResources.Converters">org.apache.juneau.rest &gt; Converters</a>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Converters">Overview &gt; Converters</a>
  * </ul>
  */
 public final class Traversable implements RestConverter {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java
index 8e8f05a..312a546 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/BeanDescription.java
@@ -24,6 +24,12 @@ import org.apache.juneau.annotation.*;
  * 
  * <p>
  * Useful for rendering simple information about a bean during REST OPTIONS requests.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.PredefinedLabelBeans">Overview &gt; Predefined Label Beans</a>
+ * </ul>
  */
 @Bean(properties="type,properties")
 public final class BeanDescription {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java
index 228e570..587401c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/ChildResourceDescriptions.java
@@ -21,6 +21,12 @@ import org.apache.juneau.rest.*;
  * 
  * <p>
  * Typically used in top-level GET methods of router resources to render a list of available child resources.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.PredefinedLabelBeans">Overview &gt; Predefined Label Beans</a>
+ * </ul>
  */
 public class ChildResourceDescriptions extends LinkedList<ResourceDescription> {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/NameDescription.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/NameDescription.java
index 7417769..03bc8b5 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/NameDescription.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/NameDescription.java
@@ -19,6 +19,12 @@ import org.apache.juneau.annotation.*;
  * 
  * <p>
  * Primarily used for constructing tables with name/description columns on REST OPTIONS requests.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.PredefinedLabelBeans">Overview &gt; Predefined Label Beans</a>
+ * </ul>
  */
 @Bean(properties="name,description")
 public class NameDescription {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java
index 30f296c..47acfd5 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/labels/ResourceDescription.java
@@ -21,6 +21,12 @@ import org.apache.juneau.html.annotation.*;
  * <p class='bcode'>
  * 	<jk>new</jk> ResourceLink(<js>"httpTool"</js>, <js>"HTTP request test client"</js>);
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.PredefinedLabelBeans">Overview &gt; Predefined Label Beans</a>
+ * </ul>
  */
 public final class ResourceDescription extends NameDescription implements Comparable<ResourceDescription> {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.java
index 0d5be4c..93f142d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/MultipartFormDataMatcher.java
@@ -16,6 +16,12 @@ import org.apache.juneau.rest.*;
 
 /**
  * Predefined matcher for matching requests with content type <js>"multipart/form-data"</js>.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.RestMethodMatchers">Overview &gt; @RestMethod.matchers()</a>
+ * </ul>
  */
 public class MultipartFormDataMatcher extends RestMatcher {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.java
index e8c0815..3a75cd2 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matchers/UrlEncodedFormMatcher.java
@@ -16,6 +16,12 @@ import org.apache.juneau.rest.*;
 
 /**
  * Predefined matcher for matching requests with content type <js>"application/x-www-form-urlencoded"</js>.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.RestMethodMatchers">Overview &gt; @RestMethod.matchers()</a>
+ * </ul>
  */
 public class UrlEncodedFormMatcher extends RestMatcher {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServiceProperties.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServiceProperties.java
index 447f277..8d61ea3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServiceProperties.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServiceProperties.java
@@ -29,6 +29,12 @@ import org.apache.juneau.rest.annotation.*;
  * <p>
  * These properties are only valid at the class level, not the method level.
  * <br>Setting them on {@link RestMethod#properties() @RestMethod.properties()} has no effect.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.RemoteableProxies">Overview &gt; Remoteable Proxies</a>
+ * </ul>
  */
 public final class RemoteableServiceProperties {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
index c02d99e..0fefcba 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remoteable/RemoteableServlet.java
@@ -34,7 +34,11 @@ import org.apache.juneau.rest.annotation.*;
  * To implement a remoteable service, developers must simply subclass from this class and implement the
  * {@link #getServiceMap()} method that maps java interfaces to POJO instances.
  * 
- * See <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.rest.remoteable</a> for details.
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.RemoteableProxies">Overview &gt; Remoteable Proxies</a>
+ * </ul>
  */
 @SuppressWarnings("serial")
 public abstract class RemoteableServlet extends RestServletDefault {
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java
index 69a4aa6..ca5bc7d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/DefaultHandler.java
@@ -34,6 +34,12 @@ import org.apache.juneau.serializer.*;
  * <p>
  * The <code>Content-Type</code> header is set to the mime-type defined on the selected serializer based on the
  * <code>produces</code> value passed in through the constructor.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public class DefaultHandler implements ResponseHandler {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/InputStreamHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/InputStreamHandler.java
index 31a5ad1..868dfa6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/InputStreamHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/InputStreamHandler.java
@@ -25,6 +25,12 @@ import org.apache.juneau.utils.*;
  * 
  * <p>
  * Sets the <code>Content-Type</code> response header to whatever was set via {@link RestResponse#setContentType(String)}.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public final class InputStreamHandler implements ResponseHandler {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ReaderHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ReaderHandler.java
index 5d6eda1..c72fdeb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ReaderHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ReaderHandler.java
@@ -22,6 +22,12 @@ import org.apache.juneau.utils.*;
  * 
  * <p>
  * Simply pipes the contents of the {@link Reader} to {@link RestResponse#getNegotiatedWriter()}.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public final class ReaderHandler implements ResponseHandler {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/RedirectHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/RedirectHandler.java
index 7a22761..9a273b9 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/RedirectHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/RedirectHandler.java
@@ -18,6 +18,12 @@ import org.apache.juneau.rest.*;
 
 /**
  * Response handler for {@link Redirect} objects.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public final class RedirectHandler implements ResponseHandler {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/StreamableHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/StreamableHandler.java
index c02e197..ca71ac1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/StreamableHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/StreamableHandler.java
@@ -25,6 +25,12 @@ import org.apache.juneau.rest.*;
  * <p>
  * Uses the {@link Writable#writeTo(Writer)} method to send the contents to the
  * {@link RestResponse#getNegotiatedWriter()} writer.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public final class StreamableHandler implements ResponseHandler {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/WritableHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/WritableHandler.java
index 9a50ff9..a0ae81f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/WritableHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/WritableHandler.java
@@ -24,6 +24,12 @@ import org.apache.juneau.rest.*;
  * 
  * <p>
  * Uses the {@link Writable#writeTo(Writer)} method to send the contents to the {@link RestResponse#getNegotiatedWriter()} writer.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public final class WritableHandler implements ResponseHandler {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ZipFileListResponseHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ZipFileListResponseHandler.java
index f1cd64e..bef925b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ZipFileListResponseHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/response/ZipFileListResponseHandler.java
@@ -35,6 +35,12 @@ import org.apache.juneau.utils.ZipFileList.*;
  * 		<code>Content-Disposition=attachment;filename=X</code> - Sets X to the file name passed in through the
  * 		constructor {@link ZipFileList#ZipFileList(String)}.
  * </ul>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.MethodReturnTypes">Overview &gt; Method Return Types</a>
+ * </ul>
  */
 public class ZipFileListResponseHandler implements ResponseHandler {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/FileVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/FileVar.java
index 27b5a58..123d1c3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/FileVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/FileVar.java
@@ -59,7 +59,11 @@ import org.apache.juneau.utils.*;
  * Files of type HTML, XHTML, XML, JSON, Javascript, and CSS will be stripped of comments.
  * This allows you to place license headers in files without them being serialized to the output.
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class FileVar extends DefaultingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
index 233d219..54dda5a 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/LocalizationVar.java
@@ -35,7 +35,11 @@ import org.apache.juneau.svl.*;
  * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.
  * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class LocalizationVar extends MultipartVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestAttributeVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestAttributeVar.java
index f3e928d..4e799e2 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestAttributeVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestAttributeVar.java
@@ -34,8 +34,7 @@ import org.apache.juneau.svl.*;
  * 	String fooOrBar = restRequest.resolveVars(<js>"$RA{foo,bar}"</js>); 
  * </p>
  * 
- * <h
- * 5 class='topic'>Notes</h5>
+ * <h5 class='topic'>Notes</h5>
  * <ul class='spaced-list'>
  * 	<li>
  * 		This variable resolver requires that a {@link RestRequest} object be set as a context object on the resolver 
@@ -44,7 +43,11 @@ import org.apache.juneau.svl.*;
  * 		For security reasons, nested and recursive variables are not resolved.
  * </ul>
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class RequestAttributeVar extends MultipartResolvingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestFormDataVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestFormDataVar.java
index 70ae2ec..f4135a3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestFormDataVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestFormDataVar.java
@@ -41,7 +41,11 @@ import org.apache.juneau.svl.*;
  * 		For security reasons, nested and recursive variables are not resolved.
  * </ul>
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class RequestFormDataVar extends MultipartResolvingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestHeaderVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestHeaderVar.java
index e01caf4..0f2cdbe 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestHeaderVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestHeaderVar.java
@@ -41,7 +41,11 @@ import org.apache.juneau.svl.*;
  * 		For security reasons, nested and recursive variables are not resolved.
  * </ul>
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class RequestHeaderVar extends MultipartResolvingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestPathVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestPathVar.java
index 3b612fe..834749f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestPathVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestPathVar.java
@@ -42,7 +42,11 @@ import org.apache.juneau.svl.*;
  * 		For security reasons, nested and recursive variables are not resolved.
  * </ul>
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class RequestPathVar extends MultipartResolvingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestQueryVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestQueryVar.java
index 9479762..569f44d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestQueryVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestQueryVar.java
@@ -42,7 +42,11 @@ import org.apache.juneau.svl.*;
  * 		For security reasons, nested and recursive variables are not resolved.
  * </ul>
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class RequestQueryVar extends MultipartResolvingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestVar.java
index 0c1a509..1030a34 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestVar.java
@@ -59,7 +59,11 @@ import org.apache.juneau.svl.*;
  * 		For security reasons, nested and recursive variables are not resolved.
  * </ul>
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class RequestVar extends MultipartResolvingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RestInfoVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RestInfoVar.java
index 89b65a8..5d1aca7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RestInfoVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RestInfoVar.java
@@ -67,7 +67,11 @@ import org.apache.juneau.svl.*;
  * 		For security reasons, nested and recursive variables are not resolved.
  * </ul>
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class RestInfoVar extends MultipartResolvingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java
index 4b5e9e8..47a2f5f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/SerializedRequestAttrVar.java
@@ -34,7 +34,11 @@ import org.apache.juneau.svl.*;
  * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.
  * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class SerializedRequestAttrVar extends StreamedVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/ServletInitParamVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/ServletInitParamVar.java
index d6f2077..07b9dbd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/ServletInitParamVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/ServletInitParamVar.java
@@ -32,7 +32,11 @@ import org.apache.juneau.svl.*;
  * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.
  * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class ServletInitParamVar extends DefaultingVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlEncodeVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlEncodeVar.java
index 84d5d83..404da8b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlEncodeVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlEncodeVar.java
@@ -31,7 +31,11 @@ import org.apache.juneau.svl.*;
  * Since this is a {@link SimpleVar}, any variables contained in the result will be recursively resolved.
  * Likewise, if the arguments contain any variables, those will be resolved before they are passed to this var.
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class UrlEncodeVar extends SimpleVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java
index 74e4da1..372fa5d 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/UrlVar.java
@@ -37,7 +37,11 @@ import org.apache.juneau.svl.*;
  * Uses the URI resolver returned by {@link RestRequest#getUriResolver(UriResolution, UriRelativity)} with resolution
  * {@link UriResolution#ROOT_RELATIVE} and relativity {@link UriRelativity#RESOURCE}.
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class UrlVar extends SimpleVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java
index 4d359fc..df2e597 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java
@@ -32,7 +32,11 @@ import org.apache.juneau.svl.*;
  * 	<li>{@link HtmlDoc#widgets() @HtmlDoc.widgets()}
  * </ul>
  * 
- * @see org.apache.juneau.svl
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.SvlVariables">Overview &gt; SVL Variables</a>
+ * </ul>
  */
 public class WidgetVar extends SimpleVar {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
index 74ae47f..61c4292 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/ContentTypeMenuItem.java
@@ -56,6 +56,12 @@ import org.apache.juneau.utils.*;
  * <p>
  * It renders the following popup-box:
  * <br><img class='bordered' src='doc-files/ContentTypeMenuItem.png'>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Widgets">Overview &gt; Widgets</a>
+ * </ul>
  */
 public class ContentTypeMenuItem extends MenuItemWidget {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
index ff01cbd..bb56d35 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/MenuItemWidget.java
@@ -53,6 +53,12 @@ import org.apache.juneau.serializer.*;
  * <p>
  * The HTML content returned by the {@link #getHtml(RestRequest)} method is added where the <js>"$W{...}"</js> is
  * referenced in the page.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Widgets">Overview &gt; Widgets</a>
+ * </ul>
  */
 public abstract class MenuItemWidget extends Widget {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
index d070bbd..53e78b3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByApache.java
@@ -41,6 +41,12 @@ import org.apache.juneau.rest.*;
  * <p>
  * It renders the following image:
  * <img class='bordered' src='doc-files/PoweredByApacheWidget.png'>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Widgets">Overview &gt; Widgets</a>
+ * </ul>
  */
 public class PoweredByApache extends Widget {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByJuneau.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByJuneau.java
index f13a170..bc3fbf7 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByJuneau.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/PoweredByJuneau.java
@@ -39,6 +39,12 @@ import org.apache.juneau.rest.*;
  * <p>
  * It renders the following image:
  * <img class='bordered' src='doc-files/PoweredByJuneauWidget.png'>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Widgets">Overview &gt; Widgets</a>
+ * </ul>
  */
 public class PoweredByJuneau extends Widget {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/QueryMenuItem.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/QueryMenuItem.java
index 49576f5..323857e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/QueryMenuItem.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/QueryMenuItem.java
@@ -63,6 +63,12 @@ import org.apache.juneau.rest.converters.*;
  * When submitted, the form submits a GET request against the current URI with special GET search API query parameters.
  * <br>(e.g. <js>"?s=column1=Foo*&amp;v=column1,column2&amp;o=column1,column2-&amp;p=100&amp;l=100"</js>).
  * <br>The {@link Queryable} class knows how to perform these filters against collections of POJOs.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Widgets">Overview &gt; Widgets</a>
+ * </ul>
  */
 public class QueryMenuItem extends MenuItemWidget {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java
index 8770001..679c899 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java
@@ -47,6 +47,12 @@ import org.apache.juneau.utils.*;
  * 	)
  * 	<jk>public</jk> Collection&lt;Pet&gt; getPets() {
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Widgets">Overview &gt; Widgets</a>
+ * </ul>
  */
 public class StyleMenuItem extends MenuItemWidget {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
index dcfe949..7a9b604 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
@@ -58,6 +58,12 @@ import org.apache.juneau.dto.html5.*;
  * 	}
  * }
  * </p>
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Widgets">Overview &gt; Widgets</a>
+ * </ul>
  */
 public class Tooltip {
 
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java
index 80247d2..89404e4 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Widget.java
@@ -121,6 +121,12 @@ import org.apache.juneau.utils.*;
  * 
  * <p>
  * Widgets can be defined as inner classes of REST resource classes.
+ * 
+ * 
+ * <h5 class='section'>Documentation:</h5>
+ * <ul>
+ * 	<li><a class="doclink" href="../../../../../overview-summary.html#juneau-rest-server.Widgets">Overview &gt; Widgets</a>
+ * </ul>
  */
 public abstract class Widget {
 

-- 
To stop receiving notification emails like this one, please contact
jamesbognar@apache.org.

Mime
View raw message