You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2016/08/11 01:29:56 UTC

[1/2] incubator-juneau git commit: Fix HTML validation warnings.

Repository: incubator-juneau
Updated Branches:
  refs/heads/master baf2ba990 -> 18feb6740


Fix HTML validation warnings.

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/3a385346
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/3a385346
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/3a385346

Branch: refs/heads/master
Commit: 3a38534696c2c46d7360ef821e9e9c45fcd9fd09
Parents: 385a6a0
Author: jamesbognar <ja...@gmail.com>
Authored: Wed Aug 10 21:28:04 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Wed Aug 10 21:28:51 2016 -0400

----------------------------------------------------------------------
 .../.settings/org.eclipse.wst.html.core.prefs   | 43 +++++++++
 .../.settings/org.eclipse.wst.xml.core.prefs    | 18 ++++
 .../org/apache/juneau/dto/cognos/package.html   |  2 +-
 .../apache/juneau/dto/jsonschema/package.html   |  1 +
 .../java/org/apache/juneau/ini/package.html     | 36 +++----
 .../java/org/apache/juneau/jena/package.html    |  7 +-
 .../java/org/apache/juneau/json/package.html    |  3 +-
 .../java/org/apache/juneau/svl/package.html     |  1 +
 .../org/apache/juneau/transform/package.html    | 13 ++-
 .../org/apache/juneau/urlencoding/package.html  | 34 +++----
 .../java/org/apache/juneau/xml/package.html     |  8 +-
 juneau-core/src/main/java/overview.html         | 98 ++++++++++----------
 12 files changed, 163 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/.settings/org.eclipse.wst.html.core.prefs
----------------------------------------------------------------------
diff --git a/juneau-core/.settings/org.eclipse.wst.html.core.prefs b/juneau-core/.settings/org.eclipse.wst.html.core.prefs
new file mode 100644
index 0000000..ee1e1ce
--- /dev/null
+++ b/juneau-core/.settings/org.eclipse.wst.html.core.prefs
@@ -0,0 +1,43 @@
+attrDuplicate=2
+attrInvalidName=2
+attrInvalidValue=2
+attrNameMismatch=2
+attrNamesToIgnore=
+attrUndefName=2
+attrUndefValue=2
+attrValueEqualsMissing=2
+attrValueMismatch=1
+attrValueUnclosed=2
+cdataInvalidContent=2
+cdataUnclosed=1
+commentInvalidContent=2
+commentUnclosed=1
+docDoctypeUnclosed=1
+docDuplicateTag=1
+docInvalidChar=2
+docInvalidContent=2
+eclipse.preferences.version=1
+elemCoexistence=2
+elemDuplicate=2
+elemEndInvalidCase=1
+elemInvalidContent=2
+elemInvalidDirective=1
+elemInvalidEmptyTag=2
+elemInvalidName=1
+elemInvalidText=2
+elemMissingEnd=2
+elemMissingStart=2
+elemStartInvalidCase=2
+elemUnclosedEndTag=1
+elemUnclosedStartTag=1
+elemUnknownName=2
+elemUnnecessaryEnd=2
+elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,mk,mv,cc,cs,ck,ce,cv,l,properties
+ignoreAttrNames=false
+ignoreElementNames=true
+piInvalidContent=2
+piUnclosed=1
+piUndefined=2
+refInvalidContent=2
+resourceNotFound=2
+use-project-settings=true

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/.settings/org.eclipse.wst.xml.core.prefs
----------------------------------------------------------------------
diff --git a/juneau-core/.settings/org.eclipse.wst.xml.core.prefs b/juneau-core/.settings/org.eclipse.wst.xml.core.prefs
new file mode 100644
index 0000000..f4c656f
--- /dev/null
+++ b/juneau-core/.settings/org.eclipse.wst.xml.core.prefs
@@ -0,0 +1,18 @@
+attributeHasNoValue=2
+eclipse.preferences.version=1
+endTagWithAttributes=2
+honourAllSchemaLocations=true
+indicateNoGrammar=-1
+indiciateNoDocumentElement=-1
+markupValidation=false
+missingClosingBracket=2
+missingClosingQuote=2
+missingEndTag=2
+missingQuotes=2
+missingStartTag=2
+missingTagName=2
+namespaceInPITarget=2
+use-project-settings=true
+whitespaceAtStart=2
+whitespaceBeforeTagName=2
+xinclude=false

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html
index b0c9e83..354fe8d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html
@@ -108,7 +108,7 @@
 		<jk>new</jk> Column(<js>"age"</js>, <js>"xs:int"</js>),
 		<jk>new</jk> Column(<js>"numAddresses"</js>, <js>"xs:int"</js>)
 			.addTransform(
-				<jk>new</jk> PojoTransform&ltPerson,Integer&gt;() {
+				<jk>new</jk> PojoTransform&lt;Person,Integer&gt;() {
 					<ja>@Override</ja>
 					<jk>public</jk> Integer transform(Person p) {
 						<jk>return</jk> p.<jf>addresses</jf>.size();

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html
index 51977bf..7eebc86 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/package.html
@@ -495,6 +495,7 @@
 			<h6 class='figure'>Resource Options</h6>
 			<img class='bordered' src="doc-files/Example_Options.png">
 		</div>	
+	</div>
 		
 	<!-- ======================================================================================================== -->
 	<a id="Parse"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/ini/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/package.html b/juneau-core/src/main/java/org/apache/juneau/ini/package.html
index b8b3509..b475434 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ini/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/ini/package.html
@@ -224,11 +224,11 @@
 	</p>
 	<p>
 		Resolving config files can be retrieved through the following methods:
-		<ul class='spaced-list'>
-			<li>{@link org.apache.juneau.ini.ConfigFile#getResolving()} - Returns a config file that resolves a default set of variables.
-			<li>{@link org.apache.juneau.ini.ConfigFile#getResolving(VarResolver)} - Returns a config file that resolves a custom set of variables.
-		</ul>
 	</p>	
+	<ul class='spaced-list'>
+		<li>{@link org.apache.juneau.ini.ConfigFile#getResolving()} - Returns a config file that resolves a default set of variables.
+		<li>{@link org.apache.juneau.ini.ConfigFile#getResolving(VarResolver)} - Returns a config file that resolves a custom set of variables.
+	</ul>
 	<p>
 		The default {@link org.apache.juneau.ini.ConfigFile#getResolving()} method returns a config file that resolves the following
 		variables:
@@ -363,21 +363,21 @@
 	</p>
 	<p>
 		Arguments can be any of the following...
-		<ul class='spaced-list'>
-			<li>No arguments<br>
-				Prints usage message.
-			<li><code>createBatchEnvFile -configfile &lt;configFile&gt; -envfile &lt;batchFile&gt; [-verbose]</code><br>
-				Creates a batch file that will set each config file entry as an environment variable.<br>
-				Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)
-				will be converted to underscores.
-			<li><code>createShellEnvFile -configFile &lt;configFile&gt; -envFile &lt;configFile&gt; [-verbose]</code>
-				Creates a shell script that will set each config file entry as an environment variable.<br>
-				Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)
-					will be converted to underscores.
-			<li><code>setVals -configFile &lt;configFile&gt; -vals [var1=val1 [var2=val2...]] [-verbose]</code>
-				Sets values in config files.
-		</ul>
 	</p>
+	<ul class='spaced-list'>
+		<li>No arguments<br>
+			Prints usage message.
+		<li><code>createBatchEnvFile -configfile &lt;configFile&gt; -envfile &lt;batchFile&gt; [-verbose]</code><br>
+			Creates a batch file that will set each config file entry as an environment variable.<br>
+			Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)
+			will be converted to underscores.
+		<li><code>createShellEnvFile -configFile &lt;configFile&gt; -envFile &lt;configFile&gt; [-verbose]</code>
+			Creates a shell script that will set each config file entry as an environment variable.<br>
+			Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)
+				will be converted to underscores.
+		<li><code>setVals -configFile &lt;configFile&gt; -vals [var1=val1 [var2=val2...]] [-verbose]</code>
+			Sets values in config files.
+	</ul>
 	<p>
 		For example, the following command will create the file <code>'MyConfig.bat'</code> from the contents of the file <code>'MyConfig.cfg'</code>.
 	</p>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/jena/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/package.html b/juneau-core/src/main/java/org/apache/juneau/jena/package.html
index 5561b47..5cf96e4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/jena/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/jena/package.html
@@ -135,6 +135,7 @@
 	<p>
 		Since Juneau is 100% pure IBM code, the Jena libraries must be provided on the classpath separately if you plan on making use of the RDF support.
 	</p>
+	<p>
 		The minimum list of required jars are:
 	</p>
 	<ul>
@@ -161,7 +162,7 @@
 		</p>
 		<img class='bordered' src="doc-files/Example_HTML.png">
 		<p>
-			By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various RDF supported formats.
+			By appending <code>?Accept=<i>mediaType</i>&amp;plainText=true</code> to the URL, you can view the data in the various RDF supported formats.
 		</p>
 		
 		<h6 class='figure'>RDF/XML</h6>
@@ -404,7 +405,7 @@
 	    <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/"</xs>
 	    <xa>xmlns:per</xa>=<xs>"http://www.ibm.com/person/"</xs><xt>&gt;</xt>
 	   <xt>&lt;rdf:Description <b><xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1"</xs></b>&gt;</xt>
-	      <xt><b>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</b></xt>
+	      <xt>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</xt>
 	      <xt>&lt;per:id&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
 	      <xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
 	   <xt>&lt;/rdf:Description&gt;</xt>
@@ -508,7 +509,7 @@
 	      <xt>&lt;per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook"</xs><xt>/&gt;</xt>
 	      <xt>&lt;per:id&gt;</xt>1<xt>&lt;/per:id&gt;</xt>
 	      <xt>&lt;per:name&gt;</xt>John Smith<xt>&lt;/per:name&gt;</xt>
-	      <xt><b>&lt;per:birthDate&gt;</xt>1946-08-12T00:00:00Z<xt>&lt;/per:birthDate&gt;</b></xt>
+	      <xt>&lt;per:birthDate&gt;</xt>1946-08-12T00:00:00Z<xt>&lt;/per:birthDate&gt;</xt>
 	   <xt>&lt;/rdf:Description&gt;</xt>
 	<xt>&lt;/rdf:RDF&gt;</xt>
 		</p>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/json/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/package.html b/juneau-core/src/main/java/org/apache/juneau/json/package.html
index c34a5c1..1c947cb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/json/package.html
@@ -132,7 +132,7 @@
 		</p>
 		<img class='bordered' src="doc-files/Example_HTML.png">
 		<p>
-			By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various supported JSON formats:
+			By appending <code>?Accept=<i>mediaType</i>&amp;plainText=true</code> to the URL, you can view the data in the various supported JSON formats:
 		</p>
 		
 		<h6 class='figure'>Normal JSON</h6>
@@ -691,7 +691,6 @@
 			<li>{@link org.apache.juneau.BeanContext} - Bean context properties.
 			<li>{@link org.apache.juneau.json.JsonSerializerContext} - Serializer context properties.
 		</ul>
-		</table>	
 	</div>		
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/svl/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/package.html b/juneau-core/src/main/java/org/apache/juneau/svl/package.html
index df73ef0..809f251 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/package.html
@@ -242,5 +242,6 @@
 				will simply be a no-op and return the same string.
 		</ul>
 	</div>	
+</div>
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/transform/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/package.html b/juneau-core/src/main/java/org/apache/juneau/transform/package.html
index c9a953e..a94e213 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/package.html
@@ -128,7 +128,7 @@
 		<h6 class='topic'>Explicitly specify which properties are visible on a bean class</h6>
 		<p class='bcode'>
 	<jc>// Define transform that orders properties by "age" then "name"</jc>
-	<jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform&ltPerson&gt; {
+	<jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform&lt;Person&gt; {
 		<jk>public</jk> MyTransform() {
 			setProperties(<js>"age"</js>,<js>"name"</js>);
 		}
@@ -151,7 +151,7 @@
 		<h6 class='topic'>Exclude which properties are visible on a bean class</h6>
 		<p class='bcode'>
 	<jc>// Define transform that excludes "name"</jc>
-	<jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform&ltPerson&gt; {
+	<jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform&lt;Person&gt; {
 		<jk>public</jk> MyTransform() {
 			setExcludeProperties(<js>"name"</js>);
 		}
@@ -174,7 +174,7 @@
 		<h6 class='topic'>Define specialized property namers</h6>
 		<p class='bcode'>
 	<jc>// Define transform with our own property namer.</jc>
-	<jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform&ltPerson&gt; {
+	<jk>public class</jk> MyTransform <jk>extends</jk> BeanTransform&lt;Person&gt; {
 		<jk>public</jk> MyTransform() {
 			setPropertyNamer(UpperCasePropertyNamer.<jk>class</jk>);
 		}
@@ -238,7 +238,7 @@
 		</p>		
 		<p class='bcode'>
 	<jc>// Define transform with our own property namer.</jc>
-	<jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform&ltMyClass&gt; {
+	<jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform&lt;MyClass&gt; {
 		<jk>public</jk> MyClassTransform() {
 			setSubTypeProperty(<js>"subType"</js>);
 			addSubType(MyClassBar.<jk>class</jk>, <js>"BAR"</js>);
@@ -312,7 +312,7 @@
 		</p>
 		<p class='bcode'>
 	<jc>// Define transform that limits properties to only those defined on MyClass</jc>
-	<jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform&ltMyClass&gt; {
+	<jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform&lt;MyClass&gt; {
 		<jk>public</jk> MyClassTransform() {
 			setInterfaceClass(MyClass.<jk>class</jk>);
 		}
@@ -636,7 +636,7 @@
 		</p>
 		<p class='bcode'>
 	<jc>// Define transform that limits properties to only those defined on MyClass</jc>
-	<jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform&ltMyClass&gt; {
+	<jk>public class</jk> MyClassTransform <jk>extends</jk> BeanTransform&lt;MyClass&gt; {
 		<jk>public</jk> MyClassTransform() {
 			setInterfaceClass(MyClass.<jk>class</jk>);
 		}
@@ -740,7 +740,6 @@
 	<a id="ToObjectMaps"></a>
 	<h3 class='topic' onclick='toggle(this)'>1.6 - Serializing to ObjectMaps</h3>
 	<div class='topic'>
-	<div class='topic'>
 		<p>
 			A shortcut method for transforming is provided that can often be simpler than defining transforms.
 			In this case, we add methods to our class to serialize to {@link org.apache.juneau.ObjectMap ObjectMaps}

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html b/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html
index 612f177..932c418 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/package.html
@@ -135,7 +135,7 @@
 		</p>
 		<img class='bordered' src="doc-files/Example_HTML.png">
 		<p>
-			By appending <code>?Accept=application/x-www-form-urlencoded&plainText=true</code> to the URL, you can view the data as a URL-encoded string:
+			By appending <code>?Accept=application/x-www-form-urlencoded&amp;plainText=true</code> to the URL, you can view the data as a URL-encoded string:
 		</p>
 		<img class='bordered' src="doc-files/Example_UrlEncoding.png">
 		
@@ -143,17 +143,17 @@
 			Juneau supports two kinds of serialization:
 		</p>
 		<ul class='spaced-list'>
-			<li>Construction of full URL query parameter strings (e.g. <code>&key=value</code> pairs) from beans and maps.
-			<li>Construction of URL query parameter value strings (e.g. just the <code>value</code> portion of <code>&key=value</code> pairs) from any POJO.  
+			<li>Construction of full URL query parameter strings (e.g. <code>&amp;key=value</code> pairs) from beans and maps.
+			<li>Construction of URL query parameter value strings (e.g. just the <code>value</code> portion of <code>&amp;key=value</code> pairs) from any POJO.  
 		</ul>
 		<p>
 			Top-level beans and maps can serialized as key/value pairs as shown below:
 		</p>
 		<h6 class='figure'>Example:  A bean with 2 string properties, 'foo' and 'baz', serialized to a query string</h6>
-		<p class='bcode'>	http://localhost/sample?<xa>foo</xa>=<xs>bar</xs>&<xa>baz</xa>=<xs>bing</xs></p>
+		<p class='bcode'>	http://localhost/sample?<xa>foo</xa>=<xs>bar</xs>&amp;<xa>baz</xa>=<xs>bing</xs></p>
 		<p>
 			Lower-level beans and maps are also serialized as key/value pairs, but are surrounded with a <js>"$o(...)"</js> construct to denote an object mapping, 
-				and uses a comma as the parameter delimiter instead of <js>"&"</js>.<br>
+				and uses a comma as the parameter delimiter instead of <js>"&amp;"</js>.<br>
 		</p>
 		<h6 class='figure'>Example:  A bean serialized as a query parameter value.</h6>
 		<p class='bcode'>	http://localhost/sample?<xa>a1</xa>=$o(<xa>foo</xa>=<xs>bar</xs>,<xa>baz</xa>=<xs>bing</xs>)</p>
@@ -181,14 +181,14 @@
 			<tr>
 				<td>Booleans</td>
 				<td>BOOLEAN</td>
-				<td class='code'><xa>a1</xa>=$b(<xs>true</xs>)&<xa>a2</xa>=$b(<xs>false</xs>)</td>
-				<td class='code'><xa>a1</xa>=<xs>true</xs>&<xa>a2</xa>=<xs>false</xs></td>
+				<td class='code'><xa>a1</xa>=$b(<xs>true</xs>)&amp;<xa>a2</xa>=$b(<xs>false</xs>)</td>
+				<td class='code'><xa>a1</xa>=<xs>true</xs>&amp;<xa>a2</xa>=<xs>false</xs></td>
 			</tr>
 			<tr>
 				<td>int/float/double/...</td>
 				<td>NUMBER</td>
-				<td class='code'><xa>a1</xa>=$n(<xs>123</xs>)&<xa>a2</xa>=$n(<xs>1.23e1</xs>)</td>
-				<td class='code'><xa>a1</xa>=<xs>123</xs>&<xa>a2</xa>=<xs>1.23e1</xs></td>
+				<td class='code'><xa>a1</xa>=$n(<xs>123</xs>)&amp;<xa>a2</xa>=$n(<xs>1.23e1</xs>)</td>
+				<td class='code'><xa>a1</xa>=<xs>123</xs>&amp;<xa>a2</xa>=<xs>1.23e1</xs></td>
 			</tr>
 			<tr>
 				<td>null</td>
@@ -324,7 +324,7 @@
 		The code above produces the following output:
 	</p>
 	<p class='bcode'>
-	<xa>id</xa>=$n(<xs>1</xs>)&<xa>name</xa>=<xs>John+Smith</xs>
+	<xa>id</xa>=$n(<xs>1</xs>)&amp;<xa>name</xa>=<xs>John+Smith</xs>
 	</p>
 	<p>
 		The general method guidelines are as follows:
@@ -402,7 +402,7 @@
 			Using <code>UrlEncodingSerializer</code> instead would create the following:
 		</p>
 		<p class='bcode'>
-	<xa>id</xa>=$n(<xs>1</xs>)&<xa>name</xa>=<xs>John+Smith</xs>&<xa>uri</xa>=<xs>http://sample/addressBook/person/1</xs>&<xa>addressBookUri</xa>=<xs>http://sample/addressBook</xs>&<xa>birthDate</xa>=<xs>1946-08-12T00:00:00Z</xs>
+	<xa>id</xa>=$n(<xs>1</xs>)&amp;<xa>name</xa>=<xs>John+Smith</xs>&amp;<xa>uri</xa>=<xs>http://sample/addressBook/person/1</xs>&amp;<xa>addressBookUri</xa>=<xs>http://sample/addressBook</xs>&amp;<xa>birthDate</xa>=<xs>1946-08-12T00:00:00Z</xs>
 		</p>
 		<p>
 			Another useful feature is the {@link org.apache.juneau.annotation.Bean#propertyNamer()} annotation that allows you to plug in your own
@@ -529,11 +529,11 @@
 			If we were to use <code>UrlEncodingSerializer</code> instead, we would get the following:
 		</p>
 		<p class='bcode'>
-	<xa>id</xa>=$n(<xs>1</xs>)& 
-	<xa>name</xa>=<xs>John+Smith</xs>& 
-	<xa>uri</xa>=<xs>http://sample/addressBook/person/1</xs>& 
-	<xa>addressBookUri</xa>=<xs>http://sample/addressBook</xs>&
-	<xa>birthDate</xa>=<xs>1946-08-12T00:00:00Z</xs>&
+	<xa>id</xa>=$n(<xs>1</xs>)&amp; 
+	<xa>name</xa>=<xs>John+Smith</xs>&amp; 
+	<xa>uri</xa>=<xs>http://sample/addressBook/person/1</xs>&amp; 
+	<xa>addressBookUri</xa>=<xs>http://sample/addressBook</xs>&amp;
+	<xa>birthDate</xa>=<xs>1946-08-12T00:00:00Z</xs>&amp;
 	<xa>addresses</xa>=$a(
 		$o(
 			<xa>uri</xa>=<xs>http://sample/addressBook/address/1</xs>, 
@@ -549,7 +549,7 @@
 		</p>
 	</div>
 	<p>
-		Note how the top level <code>Person</code> bean is serialized using the standard <js>'&'</js> delimiter, whereas the lower-level <code>Address</code>
+		Note how the top level <code>Person</code> bean is serialized using the standard <js>'&amp;'</js> delimiter, whereas the lower-level <code>Address</code>
 			bean is serialized using the <js>','</js> character to prevent the <code>addresses</code> field from being incompletely parsed.
 	</p>
 	

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/org/apache/juneau/xml/package.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/package.html b/juneau-core/src/main/java/org/apache/juneau/xml/package.html
index 16ea21d..bb0534f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/package.html
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/package.html
@@ -157,7 +157,7 @@
 		</p>
 		<img class='bordered' src="doc-files/Example_HTML.png">
 		<p>
-			By appending <code>?Accept=<i>mediaType</i>&plainText=true</code> to the URL, you can view the data in the various supported XML formats:
+			By appending <code>?Accept=<i>mediaType</i>&amp;plainText=true</code> to the URL, you can view the data in the various supported XML formats:
 		</p>
 		
 		<h6 class='figure'>Normal XML</h6>
@@ -507,12 +507,12 @@
 		}
 
 		<jc>// Converts the text to and from the appropriate media type.</jc>
-		<jk>public class</jk> TextContentHandler <jk>implements</jk> XmlContentHandler&ltText&gt; {
+		<jk>public class</jk> TextContentHandler <jk>implements</jk> XmlContentHandler&lt;Text&gt; {
 	
 			<ja>@Override</ja>
 			<jk>public void</jk> parse(XMLStreamReader r, Text text) <jk>throws</jk> Exception {
 				String type = text.<jf>type</jf>;
-				<jk>if</jk> (type != <jk>null</jk> && type.equals(<js>"xhtml"</js>))
+				<jk>if</jk> (type != <jk>null</jk> &amp;&amp; type.equals(<js>"xhtml"</js>))
 					text.<jf>text</jf> = <jsm>decode</jsm>(readXmlContents(r).trim());
 				<jk>else</jk>
 					text.<jf>text</jf> = <jsm>decode</jsm>(r.getElementText().trim());
@@ -522,7 +522,7 @@
 			<jk>public void</jk> serialize(XmlSerializerWriter w, Text text) <jk>throws</jk> Exception {
 				String type = text.<jf>type</jf>;
 				String content = text.<jf>text</jf>;
-				<jk>if</jk> (type != <jk>null</jk> && type.equals(<js>"xhtml"</js>))
+				<jk>if</jk> (type != <jk>null</jk> &amp;&amp; type.equals(<js>"xhtml"</js>))
 					w.encodeTextInvalidChars(content);
 				<jk>else</jk>
 					w.encodeText(content);

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3a385346/juneau-core/src/main/java/overview.html
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/overview.html b/juneau-core/src/main/java/overview.html
index cc4d42b..b11e25d 100644
--- a/juneau-core/src/main/java/overview.html
+++ b/juneau-core/src/main/java/overview.html
@@ -362,8 +362,8 @@
 				</td>
 				<td>
 					<ul class='normal'>
-						<li>{@code HashSet<String,Integer>}
-						<li>{@code TreeMap<Integer,Bean>}
+						<li>{@code HashSet&lt;String,Integer&gt;}
+						<li>{@code TreeMap&lt;Integer,Bean&gt;}
 						<li><code>List&lt;<jk>int</jk>[][]&gt;</code>
 						<li>{@code Bean[]}
 					</ul>
@@ -380,8 +380,8 @@
 				</td>
 				<td>
 					<ul class='normal'>
-						<li>{@code HashSet<Bean,Integer>}
-						<li>{@code TreeMap<Integer,Reader>}
+						<li>{@code HashSet&lt;Bean,Integer&gt;}
+						<li>{@code TreeMap&lt;Integer,Reader&gt;}
 					</ul>
 				</td>
 				<td style='background-color:lightgreen;text-align:center'><b>yes</b></td>
@@ -1263,7 +1263,7 @@
 	</p>
 	<p>
 		The framework allows you to override header values through GET parameters, so that you can specify the <l>ACCEPT</l> header to see each type. 
-		Adding <l>&plainText=true</l> forces the response <l>Content-Type</l> to be <l>text/plain.</l>
+		Adding <l>&amp;plainText=true</l> forces the response <l>Content-Type</l> to be <l>text/plain.</l>
 	<h6 class='figure'>HTML</h6>
 	<img class='bordered' src="doc-files/Server.Html.png">
 	<h6 class='figure'>JSON</h6>
@@ -1385,11 +1385,11 @@
 	</p>
 	<p>
 		The requirements for a method to be callable through a remoteable service are:
-		<ul class='spaced-list'>
-			<li>The method must be public.
-			<li>The parameter and return types must be <a href='#Core.PojoCategories'><u>serializable and parsable</u></a>.
-		</ul>
 	</p>
+	<ul class='spaced-list'>
+		<li>The method must be public.
+		<li>The parameter and return types must be <a href='#Core.PojoCategories'>serializable and parsable</a>.
+	</ul>
 	<p>
 		One significant feature is that the remoteable services servlet is a full-blown REST interface.  
 		Therefore, in cases where the interface classes are not available on the client side,
@@ -1571,7 +1571,7 @@
 	</div>
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.RestResource"></a>
+	<a id="Samples.RestResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.4 - MANIFEST.MF</h3>
 	<div class='topic'>
 		<p>
@@ -1622,7 +1622,7 @@
 	</div>	
 
 	<!-- ======================================================================================================== -->
-	<a name="Samples.RootResources"></a>
+	<a id="Samples.RootResources"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.5 - RootResources</h3>
 	<div class='topic'>
 		<p>
@@ -1761,7 +1761,7 @@
 	</div>	
 
 	<!-- ======================================================================================================== -->
-	<a name="Samples.HelloWorldResource"></a>
+	<a id="Samples.HelloWorldResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.6 - HelloWorldResource</h3>
 	<div class='topic'>
 		<p>
@@ -1833,7 +1833,7 @@
 	</div>	
 
 	<!-- ======================================================================================================== -->
-	<a name="Samples.MethodExampleResource"></a>
+	<a id="Samples.MethodExampleResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.7 - MethodExampleResource</h3>
 	<div class='topic'>
 		<p>
@@ -2046,7 +2046,7 @@
 	</div>	
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.UrlEncodedFormResource"></a>
+	<a id="Samples.UrlEncodedFormResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.8 - UrlEncodedFormResource</h3>
 	<div class='topic'>
 		<p>
@@ -2182,7 +2182,7 @@
 	</div>	
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.RequestEchoResource"></a>
+	<a id="Samples.RequestEchoResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.9 - RequestEchoResource</h3>
 	<div class='topic'>
 		<p>
@@ -2291,7 +2291,7 @@
 	</div>	
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.AddressBookResource"></a>
+	<a id="Samples.AddressBookResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.10 - AddressBookResource</h3>
 	<div class='topic'>
 		<p>
@@ -2329,7 +2329,7 @@
 		<img class='bordered' src='doc-files/Samples.AddressBookResource.2.png'>
 		
 		<!-- ======================================================================================================== -->
-		<a name="Samples.AddressBookResource.Classes"></a>
+		<a id="Samples.AddressBookResource.Classes"></a>
 		<h4 class='topic' onclick='toggle(this)'>7.10.1 - Classes</h4>
 		<div class='topic'>
 			<p>
@@ -2523,7 +2523,7 @@
 		<jk>public</jk> String <jf>id</jf>;
 		<jk>public</jk> String <jf>name</jf>;
 		<ja>@BeanProperty</ja>(transform=CalendarTransform.Medium.<jk>class</jk>) <jk>public</jk> Calendar <jf>birthDate</jf>;
-		<jk>public</jk> LinkedList&lt;Address&gt; <jf>addresses</jf> = new LinkedList&ltAddress&gt;();
+		<jk>public</jk> LinkedList&lt;Address&gt; <jf>addresses</jf> = new LinkedList&lt;Address&gt;();
 		
 		<jd>/** Bean constructor - Needed for instantiating on server side */</jd> 
 		<jk>public</jk> Person() {} 
@@ -3037,12 +3037,12 @@
 	<ck>getCognosData</ck> = <cv>Get data in Cognos/XML format</cv>
 	<ck>getCognosData.res.200.content</ck> = <cv>DataSet</cv>
 	
-	<ck>otherNotes</ck> = <cv>GZip support enabled.  Public methods can be invoked by using the &Method URL parameter.  'text/cognos+xml' support available under root resource only</cv>
+	<ck>otherNotes</ck> = <cv>GZip support enabled.  Public methods can be invoked by using the &amp;Method URL parameter.  'text/cognos+xml' support available under root resource only</cv>
 			</p>
 		</div>
 		
 		<!-- ======================================================================================================== -->
-		<a name="Samples.AddressBookResource.Demo"></a>
+		<a id="Samples.AddressBookResource.Demo"></a>
 		<h4 class='topic' onclick='toggle(this)'>7.10.2 - Demo</h4>
 		<div class='topic'>
 			<p>
@@ -3105,7 +3105,7 @@
 		</div>
 		
 		<!-- ======================================================================================================== -->
-		<a name="Samples.AddressBookResource.Traversable"></a>
+		<a id="Samples.AddressBookResource.Traversable"></a>
 		<h4 class='topic' onclick='toggle(this)'>7.10.3 - Traversable</h4>
 		<div class='topic'>
 			<p>
@@ -3118,7 +3118,7 @@
 		</div>
 
 		<!-- ======================================================================================================== -->
-		<a name="Samples.AddressBookResource.Queryable"></a>
+		<a id="Samples.AddressBookResource.Queryable"></a>
 		<h4 class='topic' onclick='toggle(this)'>7.10.4 - Queryable</h4>
 		<div class='topic'>
 			<p>
@@ -3134,7 +3134,7 @@
 		</div>
 		
 		<!-- ======================================================================================================== -->
-		<a name="Samples.AddressBookResource.Introspectable"></a>
+		<a id="Samples.AddressBookResource.Introspectable"></a>
 		<h4 class='topic' onclick='toggle(this)'>7.10.5 - Introspectable</h4>
 		<div class='topic'>
 			<p>
@@ -3144,7 +3144,7 @@
 		</div>
 		
 		<!-- ======================================================================================================== -->
-		<a name="Samples.AddressBookResource.RestClient"></a>
+		<a id="Samples.AddressBookResource.RestClient"></a>
 		<h4 class='topic' onclick='toggle(this)'>7.10.6 - ClientTest</h4>
 		<div class='topic'>
 			<p>
@@ -3257,7 +3257,7 @@
 		</div>
 	
 		<!-- ======================================================================================================== -->
-		<a name="Samples.AddressBookResource.Browser"></a>
+		<a id="Samples.AddressBookResource.Browser"></a>
 		<h4 class='topic' onclick='toggle(this)'>7.10.7 - Browser Tips</h4>
 		<div class='topic'>
 			<p>
@@ -3288,7 +3288,7 @@
 	</div>	
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.SampleRemoteableServlet"></a>
+	<a id="Samples.SampleRemoteableServlet"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.11 - SampleRemoteableServlet</h3>
 	<div class='topic'>
 		<p>	
@@ -3387,7 +3387,7 @@
 	</div>	
 
 	<!-- ======================================================================================================== -->
-	<a name="Samples.TempDirResource"></a>
+	<a id="Samples.TempDirResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.12 - TempDirResource</h3>
 	<div class='topic'>
 		<p>	
@@ -3504,7 +3504,7 @@
 	</div>	
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.AtomFeedResource"></a>
+	<a id="Samples.AtomFeedResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.13 - AtomFeedResource</h3>
 	<div class='topic'>
 		<p>	
@@ -3614,7 +3614,7 @@
 	</div>	
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.DockerRegistryResource"></a>
+	<a id="Samples.DockerRegistryResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.14 - DockerRegistryResource</h3>
 	<div class='topic'>
 		<p>	
@@ -3701,7 +3701,7 @@
 	</div>	
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.TumblrParserResource"></a>
+	<a id="Samples.TumblrParserResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.15 - TumblrParserResource</h3>
 	<div class='topic'>
 		<p>	
@@ -3780,7 +3780,7 @@
 	</div>	
 	
 	<!-- ======================================================================================================== -->
-	<a name="Samples.PhotosResource"></a>
+	<a id="Samples.PhotosResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.16 - PhotosResource</h3>
 	<div class='topic'>
 		<p>	
@@ -3922,7 +3922,7 @@
 	</div>	
 
 	<!-- ======================================================================================================== -->
-	<a name="Samples.JsonSchemaResource"></a>
+	<a id="Samples.JsonSchemaResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.17 - JsonSchemaResource</h3>
 	<div class='topic'>
 		<p>	
@@ -4000,7 +4000,7 @@
 	</div>	
 
 	<!-- ======================================================================================================== -->
-	<a name="Samples.SqlQueryResource"></a>
+	<a id="Samples.SqlQueryResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.18 - SqlQueryResource</h3>
 	<div class='topic'>
 		<p>	
@@ -4192,7 +4192,7 @@
 
 
 	<!-- ======================================================================================================== -->
-	<a name="Samples.ConfigResource"></a>
+	<a id="Samples.ConfigResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.19 - ConfigResource</h3>
 	<div class='topic'>
 		<p>
@@ -4385,7 +4385,7 @@
 	<xt>&lt;head&gt;</xt> 
 		<xt>&lt;meta</xt> <xa>http-equiv</xa>=<xs>'Content-Type'</xs> <xa>content</xa>=<xs>'text/html; <xa>charset</xa>=UTF-8'</xs><xt>&gt;</xt> 
 		<xt>&lt;style</xt> <xa>type</xa>=<xs>'text/css'</xs><xt>&gt;</xt> 
-			<xt>@import</xt> <xs>'$R{servletURI}/style.css'</; 
+			<xt>@import</xt> <xs>'$R{servletURI}/style.css'</xs>; 
 		<xt>&lt;/style&gt;</xt> 
 	<xt>&lt;/head&gt;</xt> 
 	<xt>&lt;body&gt;</xt> 
@@ -4407,7 +4407,7 @@
 	</div>
 
 	<!-- ======================================================================================================== -->
-	<a name="Samples.LogsResource"></a>
+	<a id="Samples.LogsResource"></a>
 	<h3 class='topic' onclick='toggle(this)'>7.20 - LogsResource</h3>
 	<div class='topic'>
 		<p>
@@ -4765,7 +4765,7 @@
 			<li>New properties on {@link org.apache.juneau.html.HtmlSerializer}:
 				<ul>
 					<li>{@link org.apache.juneau.html.HtmlSerializerContext#HTML_detectLinksInStrings} - Automatically detect hyperlinks in strings.
-					<li>{@link org.apache.juneau.html.HtmlSerializerContext#HTML_lookForLabelParameters} - Specify anchor text by appending <code>&label=MyLabel</code> to URL.
+					<li>{@link org.apache.juneau.html.HtmlSerializerContext#HTML_lookForLabelParameters} - Specify anchor text by appending <code>&amp;label=MyLabel</code> to URL.
 					<li>{@link org.apache.juneau.html.HtmlSerializerContext#HTML_labelParameter} - Specify what URL parameter to use as the anchor text label.
 					<li>New {@link org.apache.juneau.html.HtmlSerializerContext#URI_ANCHOR} option for {@link org.apache.juneau.html.HtmlSerializerContext#HTML_uriAnchorText}.				
 				</ul>
@@ -5034,7 +5034,7 @@
 			<li>{@link org.apache.juneau.html.HtmlDocSerializer} wraps output in two div tags instead of one (e.g. <code>&lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;</code>).
 				Needed for supporting the new devops look-and-feel.
 			<li>Fixed indentation inconsistencies in {@link org.apache.juneau.html.HtmlDocSerializer}.
-			<li>Renamed <code><s>HtmlSchemaSerializer</s></code> to {@link org.apache.juneau.html.HtmlSchemaDocSerializer}.
+			<li>Renamed <del>HtmlSchemaSerializer</del> to {@link org.apache.juneau.html.HtmlSchemaDocSerializer}.
 			<li>RDF serializers and parsers now support <code>RdfProperties.RDF_looseCollection</code> loose collections.
 			<li>RDF parser handles case where resources point to themselves (an unfortunate behavior in JFS RDF documents).
 			<li>JSON parser with throw an exception in strict mode if it encounters numbers that are valid in Java but invalid in JSON (e.g. octal, hexadecimal numbers).
@@ -5059,7 +5059,7 @@
 			<li>{@link org.apache.juneau.utils.MessageBundle} and <code>SafeResourceMultiBundle</code> moved from server component.
 			<li>Several bug fixes and performance improvements in <del><code>StringVarResolver</code></del>.
 			<li>Various enhancements to {@link org.apache.juneau.internal.TeeWriter} and {@link org.apache.juneau.internal.TeeOutputStream}.
-			<li>Renamed <code><s>CharSet</s></code> to {@link org.apache.juneau.internal.AsciiSet}.
+			<li>Renamed <del>CharSet</del> to {@link org.apache.juneau.internal.AsciiSet}.
 			<li>{@link org.apache.juneau.serializer.SerializerGroup} and {@link org.apache.juneau.parser.ParserGroup} now ignores <code>NoClassDefFoundErrors</code>
 				so that resources that include Jena support can continue to operate even if the Jena libraries are not present.
 			<li>New {@link org.apache.juneau.internal.FileUtils#createTempFile(String)} method.
@@ -5326,7 +5326,7 @@
 			<li>Fixed bug in {@link org.apache.juneau.html.HtmlStrippedDocSerializer} where exception was thrown when trying to serialize primitive arrays.
 			<li>{@link org.apache.juneau.json.JsonParser} now handles parsing JSON boolean/numeric values as strings to bean properties of type boolean or number. 
 			<li>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer} and {@link org.apache.juneau.urlencoding.UrlEncodingParser} now 
-				represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&1=bar"</js>).
+				represent arrays and collections as key-value pairs where the keys are numbers (e.g. <js>"?0=foo&amp;1=bar"</js>).
 			<li>Various internal improvements to {@link org.apache.juneau.utils.IOPipe}.
 			<li>New {@link org.apache.juneau.internal.ReflectionUtils#getResource(Class,String)} method.
 			<li>{@link org.apache.juneau.internal.StringUtils#parseNumber(String,Class)} now returns zero for empty strings. 
@@ -5697,7 +5697,7 @@
 		<ul class='spaced-list'>
 			<li>Added a default OPTIONS page to {@link org.apache.juneau.server.RestServletDefault} and {@link org.apache.juneau.server.jena.RestServletJenaDefault}.
 			<li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to
-				explicitely specify which HTTP methods can be used in the <code>&method</code> parameter.
+				explicitely specify which HTTP methods can be used in the <code>&amp;method</code> parameter.
 			<li>New methods added to {@link org.apache.juneau.server.RestRequest}:
 			<ul>
 				<li>{@link org.apache.juneau.server.RestRequest#getParser()}
@@ -5792,7 +5792,7 @@
 					<li>New {@link org.apache.juneau.urlencoding.UrlEncodingContext#URLENC_expandedParams} property for controlling whether arrays/Collections 
 						should be serialized/parsed as multi-part parameters.
 					<li>New {@link org.apache.juneau.urlencoding.annotation.UrlEncoding#expandedParams() @UrlEncoding.expandedParams()}
-						annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <code>&key=val1&key=val2</code>).
+						annotation that specifies that bean properties of type array/Collection be serialized as multi-part parameters (e.g. <code>&amp;key=val1&amp;key=val2</code>).
 				</ul>
 			</li>
 			<li>New {@link org.apache.juneau.json.JsonSerializerContext#JSON_escapeSolidus} property for controlling whether slash characters should be escaped.
@@ -5814,11 +5814,11 @@
 			<li>GET parameters are now CASE-SENSITIVE per W3C standards.
 				<ul>
 					<li>
-					<li><code>&Content</code> must now be specified as <code>&content</code>.
-					<li><code>&Method</code> must now be specified as <code>&method</code>.
-					<li><code>&debug</code> must now be specified as <code>&debug=true</code>.
-					<li><code>&plainText</code> must now be specified as <code>&plainText=true</code>.
-					<li><code>&notrace</code> must now be specified as <code>&noTrace=true</code>.
+					<li><code>&amp;Content</code> must now be specified as <code>&amp;content</code>.
+					<li><code>&amp;Method</code> must now be specified as <code>&amp;method</code>.
+					<li><code>&amp;debug</code> must now be specified as <code>&amp;debug=true</code>.
+					<li><code>&amp;plainText</code> must now be specified as <code>&amp;plainText=true</code>.
+					<li><code>&amp;notrace</code> must now be specified as <code>&amp;noTrace=true</code>.
 				</ul>
 			</li>
 			<li>Performance improvements around query parameters.
@@ -5830,7 +5830,7 @@
 			</li>
 			<li>Fixed Jetty issue in {@link org.apache.juneau.server.RestResponse#setHeader(String,String)} where setting 
 				the <code>Content-Type</code> through this method was inconsistent with the behavior in WAS/Tomcat.
-			<li><code>&noTrace=true</code> now prevents any errors from being logged in log file.
+			<li><code>&amp;noTrace=true</code> now prevents any errors from being logged in log file.
 			<li>Workaround for Jetty issue where <code>ServletContext.getContextPath()</code> always ends with <js>"null"</js>.
 			<li><code>RestServletProperties.REST_allowMethodParam</code> is now <jk>true</jk> by default on all subclasses 
 				of {@link org.apache.juneau.server.RestServletDefault} and {@link org.apache.juneau.server.jena.RestServletJenaDefault}.
@@ -5944,7 +5944,7 @@
 			<li>Changed configuration names for consistency with Jazz Framework.
 			<li>New {@link org.apache.juneau.client.RestClient#execute(HttpUriRequest)} method that allows subclasses to handle their own HTTP request execution.
 			<li>Changes in <code>JazzRestClient</code> to handle introduction of SSO support in v6.
-			<li><code>&plainText</code> debug feature was broken.
+			<li><code>&amp;plainText</code> debug feature was broken.
 			<li>Removed double-buffering in <code>RestRequest</code>.
 			<li>Metadata cleanup, Find Bug fixes.
 		</ul>



[2/2] incubator-juneau git commit: Fix HTML validation warnings.

Posted by ja...@apache.org.
Fix HTML validation warnings.

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/18feb674
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/18feb674
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/18feb674

Branch: refs/heads/master
Commit: 18feb6740d05e5ac3f790b13587b5d5d9ce82ced
Parents: 3a38534 baf2ba9
Author: jamesbognar <ja...@gmail.com>
Authored: Wed Aug 10 21:29:12 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Wed Aug 10 21:29:45 2016 -0400

----------------------------------------------------------------------
 .../.settings/org.eclipse.wst.html.core.prefs   | 43 ++++++++++
 .../java/org/apache/juneau/client/package.html  | 20 ++---
 .../.settings/org.eclipse.wst.html.core.prefs   | 43 ++++++++++
 .../.settings/org.eclipse.wst.xml.core.prefs    | 18 ++++
 .../.settings/org.eclipse.wst.html.core.prefs   | 43 ++++++++++
 .../.settings/org.eclipse.wst.html.core.prefs   | 43 ++++++++++
 .../.settings/org.eclipse.wst.html.core.prefs   | 43 ++++++++++
 .../.settings/org.eclipse.wst.html.core.prefs   | 43 ++++++++++
 .../org/apache/juneau/server/jaxrs/package.html | 11 ++-
 .../java/org/apache/juneau/server/package.html  | 90 ++++++++++----------
 .../juneau/server/remoteable/package.html       | 22 ++---
 11 files changed, 348 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-client/.settings/org.eclipse.wst.html.core.prefs
----------------------------------------------------------------------
diff --cc juneau-client/.settings/org.eclipse.wst.html.core.prefs
index 0000000,0000000..ee1e1ce
new file mode 100644
--- /dev/null
+++ b/juneau-client/.settings/org.eclipse.wst.html.core.prefs
@@@ -1,0 -1,0 +1,43 @@@
++attrDuplicate=2
++attrInvalidName=2
++attrInvalidValue=2
++attrNameMismatch=2
++attrNamesToIgnore=
++attrUndefName=2
++attrUndefValue=2
++attrValueEqualsMissing=2
++attrValueMismatch=1
++attrValueUnclosed=2
++cdataInvalidContent=2
++cdataUnclosed=1
++commentInvalidContent=2
++commentUnclosed=1
++docDoctypeUnclosed=1
++docDuplicateTag=1
++docInvalidChar=2
++docInvalidContent=2
++eclipse.preferences.version=1
++elemCoexistence=2
++elemDuplicate=2
++elemEndInvalidCase=1
++elemInvalidContent=2
++elemInvalidDirective=1
++elemInvalidEmptyTag=2
++elemInvalidName=1
++elemInvalidText=2
++elemMissingEnd=2
++elemMissingStart=2
++elemStartInvalidCase=2
++elemUnclosedEndTag=1
++elemUnclosedStartTag=1
++elemUnknownName=2
++elemUnnecessaryEnd=2
++elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,mk,mv,cc,cs,ck,ce,cv,l,properties
++ignoreAttrNames=false
++ignoreElementNames=true
++piInvalidContent=2
++piUnclosed=1
++piUndefined=2
++refInvalidContent=2
++resourceNotFound=2
++use-project-settings=true

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-client/src/main/java/org/apache/juneau/client/package.html
----------------------------------------------------------------------
diff --cc juneau-client/src/main/java/org/apache/juneau/client/package.html
index 7f1ef7f,7f1ef7f..c5d2478
--- a/juneau-client/src/main/java/org/apache/juneau/client/package.html
+++ b/juneau-client/src/main/java/org/apache/juneau/client/package.html
@@@ -215,11 -215,11 +215,11 @@@
  		<p>
  			The simplest way to enable SSL support in the client is to use the {@link org.apache.juneau.client.RestClient#enableSSL(SSLOpts)} method
  			and one of the predefined {@link org.apache.juneau.client.SSLOpts} instances:
--			<ul>
--				<li>{@link org.apache.juneau.client.SSLOpts#DEFAULT} - Normal certificate and hostname validation.
--				<li>{@link org.apache.juneau.client.SSLOpts#LAX} - Allows for self-signed certificates.
--			</ul>
  		</p>
++		<ul>
++			<li>{@link org.apache.juneau.client.SSLOpts#DEFAULT} - Normal certificate and hostname validation.
++			<li>{@link org.apache.juneau.client.SSLOpts#LAX} - Allows for self-signed certificates.
++		</ul>
  		<h6 class='topic'>Example:</h6>
  		<p class='bcode'>
  	<jc>// Create a client that ignores self-signed or otherwise invalid certificates.</jc>
@@@ -451,7 -451,7 +451,7 @@@
  				<jk>throw new</jk> RestCallException(<js>"Expected a redirect URI during OIDC authentication: "</js> + response.getStatusLine());
  
  			<jc>// Handle Bearer Challenge</jc>
--			HttpGet method = <jk>new</jk> HttpGet(redirectUri + <js>"&prompt=none"</js>);
++			HttpGet method = <jk>new</jk> HttpGet(redirectUri + <js>"&amp;prompt=none"</js>);
  			addDefaultOidcHeaders(method);
  
  			response = client.execute(method);
@@@ -466,7 -466,7 +466,7 @@@
  			<jk>if</jk> (! <js>"true"</js>.equals(loginRequired))
  				<jk>throw new</jk> RestCallException(<js>"X-JSA-LOGIN-REQUIRED header not found on response during OIDC authentication phase 2: "</js> + response.getStatusLine());
  
--			method = <jk>new</jk> HttpGet(redirectUri + <js>"&prompt=none"</js>);
++			method = <jk>new</jk> HttpGet(redirectUri + <js>"&amp;prompt=none"</js>);
  
  			addDefaultOidcHeaders(method);
  			response = client.execute(method);
@@@ -796,11 -796,11 +796,11 @@@
  		</p>
  		<p>
  			The requirements for a method to be callable through a remoteable service are:
--			<ul class='spaced-list'>
--				<li>The method must be public.
--				<li>The parameter and return types must be <a href='../../../../org/apache/juneau/package-summary.html#PojoCategories'><u>serializable and parsable</u></a>.
--			</ul>
  		</p>
++		<ul class='spaced-list'>
++			<li>The method must be public.
++			<li>The parameter and return types must be <a href='../../../../org/apache/juneau/package-summary.html#PojoCategories'>serializable and parsable</a>.
++		</ul>
  		<p>
  			One significant feature is that the remoteable services servlet is a full-blown REST interface.  
  			Therefore, in cases where the interface classes are not available on the client side,

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-microservice-template/.settings/org.eclipse.wst.html.core.prefs
----------------------------------------------------------------------
diff --cc juneau-microservice-template/.settings/org.eclipse.wst.html.core.prefs
index 0000000,0000000..ee1e1ce
new file mode 100644
--- /dev/null
+++ b/juneau-microservice-template/.settings/org.eclipse.wst.html.core.prefs
@@@ -1,0 -1,0 +1,43 @@@
++attrDuplicate=2
++attrInvalidName=2
++attrInvalidValue=2
++attrNameMismatch=2
++attrNamesToIgnore=
++attrUndefName=2
++attrUndefValue=2
++attrValueEqualsMissing=2
++attrValueMismatch=1
++attrValueUnclosed=2
++cdataInvalidContent=2
++cdataUnclosed=1
++commentInvalidContent=2
++commentUnclosed=1
++docDoctypeUnclosed=1
++docDuplicateTag=1
++docInvalidChar=2
++docInvalidContent=2
++eclipse.preferences.version=1
++elemCoexistence=2
++elemDuplicate=2
++elemEndInvalidCase=1
++elemInvalidContent=2
++elemInvalidDirective=1
++elemInvalidEmptyTag=2
++elemInvalidName=1
++elemInvalidText=2
++elemMissingEnd=2
++elemMissingStart=2
++elemStartInvalidCase=2
++elemUnclosedEndTag=1
++elemUnclosedStartTag=1
++elemUnknownName=2
++elemUnnecessaryEnd=2
++elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,mk,mv,cc,cs,ck,ce,cv,l,properties
++ignoreAttrNames=false
++ignoreElementNames=true
++piInvalidContent=2
++piUnclosed=1
++piUndefined=2
++refInvalidContent=2
++resourceNotFound=2
++use-project-settings=true

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-microservice-template/.settings/org.eclipse.wst.xml.core.prefs
----------------------------------------------------------------------
diff --cc juneau-microservice-template/.settings/org.eclipse.wst.xml.core.prefs
index 0000000,0000000..f4c656f
new file mode 100644
--- /dev/null
+++ b/juneau-microservice-template/.settings/org.eclipse.wst.xml.core.prefs
@@@ -1,0 -1,0 +1,18 @@@
++attributeHasNoValue=2
++eclipse.preferences.version=1
++endTagWithAttributes=2
++honourAllSchemaLocations=true
++indicateNoGrammar=-1
++indiciateNoDocumentElement=-1
++markupValidation=false
++missingClosingBracket=2
++missingClosingQuote=2
++missingEndTag=2
++missingQuotes=2
++missingStartTag=2
++missingTagName=2
++namespaceInPITarget=2
++use-project-settings=true
++whitespaceAtStart=2
++whitespaceBeforeTagName=2
++xinclude=false

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-microservice/.settings/org.eclipse.wst.html.core.prefs
----------------------------------------------------------------------
diff --cc juneau-microservice/.settings/org.eclipse.wst.html.core.prefs
index 0000000,0000000..ee1e1ce
new file mode 100644
--- /dev/null
+++ b/juneau-microservice/.settings/org.eclipse.wst.html.core.prefs
@@@ -1,0 -1,0 +1,43 @@@
++attrDuplicate=2
++attrInvalidName=2
++attrInvalidValue=2
++attrNameMismatch=2
++attrNamesToIgnore=
++attrUndefName=2
++attrUndefValue=2
++attrValueEqualsMissing=2
++attrValueMismatch=1
++attrValueUnclosed=2
++cdataInvalidContent=2
++cdataUnclosed=1
++commentInvalidContent=2
++commentUnclosed=1
++docDoctypeUnclosed=1
++docDuplicateTag=1
++docInvalidChar=2
++docInvalidContent=2
++eclipse.preferences.version=1
++elemCoexistence=2
++elemDuplicate=2
++elemEndInvalidCase=1
++elemInvalidContent=2
++elemInvalidDirective=1
++elemInvalidEmptyTag=2
++elemInvalidName=1
++elemInvalidText=2
++elemMissingEnd=2
++elemMissingStart=2
++elemStartInvalidCase=2
++elemUnclosedEndTag=1
++elemUnclosedStartTag=1
++elemUnknownName=2
++elemUnnecessaryEnd=2
++elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,mk,mv,cc,cs,ck,ce,cv,l,properties
++ignoreAttrNames=false
++ignoreElementNames=true
++piInvalidContent=2
++piUnclosed=1
++piUndefined=2
++refInvalidContent=2
++resourceNotFound=2
++use-project-settings=true

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-samples/.settings/org.eclipse.wst.html.core.prefs
----------------------------------------------------------------------
diff --cc juneau-samples/.settings/org.eclipse.wst.html.core.prefs
index 0000000,0000000..ee1e1ce
new file mode 100644
--- /dev/null
+++ b/juneau-samples/.settings/org.eclipse.wst.html.core.prefs
@@@ -1,0 -1,0 +1,43 @@@
++attrDuplicate=2
++attrInvalidName=2
++attrInvalidValue=2
++attrNameMismatch=2
++attrNamesToIgnore=
++attrUndefName=2
++attrUndefValue=2
++attrValueEqualsMissing=2
++attrValueMismatch=1
++attrValueUnclosed=2
++cdataInvalidContent=2
++cdataUnclosed=1
++commentInvalidContent=2
++commentUnclosed=1
++docDoctypeUnclosed=1
++docDuplicateTag=1
++docInvalidChar=2
++docInvalidContent=2
++eclipse.preferences.version=1
++elemCoexistence=2
++elemDuplicate=2
++elemEndInvalidCase=1
++elemInvalidContent=2
++elemInvalidDirective=1
++elemInvalidEmptyTag=2
++elemInvalidName=1
++elemInvalidText=2
++elemMissingEnd=2
++elemMissingStart=2
++elemStartInvalidCase=2
++elemUnclosedEndTag=1
++elemUnclosedStartTag=1
++elemUnknownName=2
++elemUnnecessaryEnd=2
++elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,mk,mv,cc,cs,ck,ce,cv,l,properties
++ignoreAttrNames=false
++ignoreElementNames=true
++piInvalidContent=2
++piUnclosed=1
++piUndefined=2
++refInvalidContent=2
++resourceNotFound=2
++use-project-settings=true

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-server-test/.settings/org.eclipse.wst.html.core.prefs
----------------------------------------------------------------------
diff --cc juneau-server-test/.settings/org.eclipse.wst.html.core.prefs
index 0000000,0000000..ee1e1ce
new file mode 100644
--- /dev/null
+++ b/juneau-server-test/.settings/org.eclipse.wst.html.core.prefs
@@@ -1,0 -1,0 +1,43 @@@
++attrDuplicate=2
++attrInvalidName=2
++attrInvalidValue=2
++attrNameMismatch=2
++attrNamesToIgnore=
++attrUndefName=2
++attrUndefValue=2
++attrValueEqualsMissing=2
++attrValueMismatch=1
++attrValueUnclosed=2
++cdataInvalidContent=2
++cdataUnclosed=1
++commentInvalidContent=2
++commentUnclosed=1
++docDoctypeUnclosed=1
++docDuplicateTag=1
++docInvalidChar=2
++docInvalidContent=2
++eclipse.preferences.version=1
++elemCoexistence=2
++elemDuplicate=2
++elemEndInvalidCase=1
++elemInvalidContent=2
++elemInvalidDirective=1
++elemInvalidEmptyTag=2
++elemInvalidName=1
++elemInvalidText=2
++elemMissingEnd=2
++elemMissingStart=2
++elemStartInvalidCase=2
++elemUnclosedEndTag=1
++elemUnclosedStartTag=1
++elemUnknownName=2
++elemUnnecessaryEnd=2
++elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,mk,mv,cc,cs,ck,ce,cv,l,properties
++ignoreAttrNames=false
++ignoreElementNames=true
++piInvalidContent=2
++piUnclosed=1
++piUndefined=2
++refInvalidContent=2
++resourceNotFound=2
++use-project-settings=true

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-server/.settings/org.eclipse.wst.html.core.prefs
----------------------------------------------------------------------
diff --cc juneau-server/.settings/org.eclipse.wst.html.core.prefs
index 0000000,0000000..ee1e1ce
new file mode 100644
--- /dev/null
+++ b/juneau-server/.settings/org.eclipse.wst.html.core.prefs
@@@ -1,0 -1,0 +1,43 @@@
++attrDuplicate=2
++attrInvalidName=2
++attrInvalidValue=2
++attrNameMismatch=2
++attrNamesToIgnore=
++attrUndefName=2
++attrUndefValue=2
++attrValueEqualsMissing=2
++attrValueMismatch=1
++attrValueUnclosed=2
++cdataInvalidContent=2
++cdataUnclosed=1
++commentInvalidContent=2
++commentUnclosed=1
++docDoctypeUnclosed=1
++docDuplicateTag=1
++docInvalidChar=2
++docInvalidContent=2
++eclipse.preferences.version=1
++elemCoexistence=2
++elemDuplicate=2
++elemEndInvalidCase=1
++elemInvalidContent=2
++elemInvalidDirective=1
++elemInvalidEmptyTag=2
++elemInvalidName=1
++elemInvalidText=2
++elemMissingEnd=2
++elemMissingStart=2
++elemStartInvalidCase=2
++elemUnclosedEndTag=1
++elemUnclosedStartTag=1
++elemUnknownName=2
++elemUnnecessaryEnd=2
++elementNamesToIgnore=jc,jd,jt,jk,js,jf,jsf,jsm,ja,xt,xa,xc,xs,mk,mv,cc,cs,ck,ce,cv,l,properties
++ignoreAttrNames=false
++ignoreElementNames=true
++piInvalidContent=2
++piUnclosed=1
++piUndefined=2
++refInvalidContent=2
++resourceNotFound=2
++use-project-settings=true

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html
----------------------------------------------------------------------
diff --cc juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html
index 5fc4d22,5fc4d22..1cfada1
--- a/juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html
+++ b/juneau-server/src/main/java/org/apache/juneau/server/jaxrs/package.html
@@@ -60,13 -60,13 +60,13 @@@
  	Defines an API and default provides for using Juneau serializers and parsers as JAX-RS providers.
  </p>
  
--<a name='TOC'></a><h5 class='toc'>Table of Contents</h5>
++<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
  <ol class='toc'>
  	<li><p><a class='doclink' href='#BaseProvider'>Juneau JAX-RS Provider</a></p>
  </ol>
  
  <!-- ======================================================================================================== -->
--<a name="BaseProvider"></a>
++<a id="BaseProvider"></a>
  <h2 class='topic' onclick='toggle(this)'>1 - Juneau JAX-RS Provider</h2>
  <div class='topic'>
  	<p>
@@@ -254,7 -254,7 +254,6 @@@
  		In these examples, note that the <jsf>SERIALIZER_useIndentation</jsf> and <jsf>LAX_MODE</jsf> settings
  			cause the output to be readable instead of condensed.
  	</p>
--	</p>
  	<p class='bcode'>
  	C:\>curl.exe -H "Accept: text/json" -X GET http://localhost:9080/sample/wink/helloworld
  	<ja>{
@@@ -307,7 -307,7 +306,7 @@@
  	</p>
  	<p class='bcode'>
  	C:\>curl.exe -H "Accept: application/x-www-form-urlencoded" -X GET http://localhost:9080/sample/wink/helloworld
--	<ja>text='Hello+world'&author='John+Smith'</ja>
++	<ja>text='Hello+world'&amp;author='John+Smith'</ja>
  	</p>
  	<p class='bcode'>
  	C:\&gt;curl.exe -H "Accept: text/xml+schema" -X GET http://localhost:9080/sample/wink/helloworld
@@@ -330,8 -330,8 +329,8 @@@
  	stackTracet \u25b2[Ljava/lang/StackTraceElement;xpq t /com.ibm.sample.jaxrs.HelloWorldResource$Messageur \u25b2[Ljava.lang.Sta
  	lineNumberL \u266bdeclaringClassq ~ \u2660LfileNameq ~ \u2660L
  	methodNameq ~ \u2660xp  \u2666�t \u2192java.io.ObjectOutputStreamt \u21a8ObjectOutputStream.javat \u2640writeObject0sq ~ \u2640  \u263a[t \u2192java.io.Obje
--	 3org.apache.juneau.serializer.OutputStreamSerializert \u2190OutputStreamSerializer.javat    serializesq ~ \u2640   ^t &com.ib
--	 &t /org.apache.wink.server.handlers.AbstractHandlert �AbstractHandler.javat \u266bhandleResponsesq ~ \u2640   \u2192t 5org.apache.
++	 3org.apache.juneau.serializer.OutputStreamSerializert \u2190OutputStreamSerializer.javat    serializesq ~ \u2640   ^t &amp;com.ib
++	 &amp;t /org.apache.wink.server.handlers.AbstractHandlert �AbstractHandler.javat \u266bhandleResponsesq ~ \u2640   \u2192t 5org.apache.
  	sq ~ \u2640   Ct 5org.apache.wink.server.handlers.AbstractHandlersChaint \u2192AbstractHandlersChain.javat doChainsq ~ \u2640   't
  	 \u2660handlesq ~ \u2640   \u25act 5org.apache.wink.server.handlers.ResponseHandlersChaint \u2192ResponseHandlersChain.javat \u2660handlesq ~
  	 \u266bhandleResponsesq ~ \u2640   \u2192t 5org.apache.wink.server.handlers.ResponseHandlersChaint \u2192ResponseHandlersChain.javat \u2660ha

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-server/src/main/java/org/apache/juneau/server/package.html
----------------------------------------------------------------------
diff --cc juneau-server/src/main/java/org/apache/juneau/server/package.html
index a498e78,a498e78..8eb9783
--- a/juneau-server/src/main/java/org/apache/juneau/server/package.html
+++ b/juneau-server/src/main/java/org/apache/juneau/server/package.html
@@@ -60,7 -60,7 +60,7 @@@
  	Defines an API for defining REST resources as servlets.
  </p>
  
--<a name='TOC'></a><h5 class='toc'>Table of Contents</h5>
++<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
  <ol class='toc'>
  	<li><p><a class='doclink' href='#Intro'>Introduction</a></p>
  	<li><p><a class='doclink' href='#HelloWorldResource'>Hello World Example</a></p>
@@@ -109,7 -109,7 +109,7 @@@
  </ol>
  
  <!-- ======================================================================================================== -->
--<a name="Intro"></a>
++<a id="Intro"></a>
  <h2 class='topic' onclick='toggle(this)'>1 - Introduction</h2>
  <div class='topic'>
  	<p>
@@@ -171,7 -171,7 +171,7 @@@
  				<li>Ability to pass HTTP header values as URL GET parameters (e.g. <l>&amp;Accept=text/xml</l>).
  				<li>Ability to pass HTTP content on PUT/POST requests as a URL GET parameter (e.g. <l>&amp;content={foo:"bar"}</l>).
  				<li>Ability to simulate non-GET requests using a <l>&amp;method</l> GET parameter (e.g. <l>&amp;method=POST</l>).
--				<li>Ability to force <ss>"text/plain"</ss> on response using GET parameter <l>&amp;plainText=true</l>.
++				<li>Ability to force <js>"text/plain"</js> on response using GET parameter <l>&amp;plainText=true</l>.
  			</ul>
  			<br>
  		<li>Ability to implement overloaded HTTP methods through the use of the <l>&amp;method</l> attribute (e.g. <l>&amp;method=FOO</l>).
@@@ -190,7 -190,7 +190,7 @@@
  </div>
  	
  <!-- ======================================================================================================== -->
--<a name="HelloWorldResource"></a>
++<a id="HelloWorldResource"></a>
  <h2 class='topic' onclick='toggle(this)'>2 - Hello World Example</h2>
  <div class='topic'>
  	<p>
@@@ -315,7 -315,7 +315,7 @@@
  </div>
  	
  <!-- ======================================================================================================== -->
--<a name="ClassHierarchy"></a>
++<a id="ClassHierarchy"></a>
  <h2 class='topic' onclick='toggle(this)'>3 - Class Hierarchy</h2>
  <div class='topic'>
  	<p>
@@@ -381,7 -381,7 +381,7 @@@
  </div>
  
  	<!-- ======================================================================================================== -->
--<a name="RestResources"></a>
++<a id="RestResources"></a>
  <h2 class='topic' onclick='toggle(this)'>4 - REST Servlets</h2>
  	<div class='topic'>
  		<p>
@@@ -420,6 -420,6 +420,7 @@@
  			<td class='code'>application/json</td>
  			<td>{@link org.apache.juneau.json.JsonSerializer.Simple}</td>
  		</tr>
++		<tr>
  			<td class='code'>application/json+schema<br>text/json+schema</td>
  			<td class='code'>application/json</td>
  			<td>{@link org.apache.juneau.json.JsonSchemaSerializer}</td>
@@@ -525,7 -525,7 +526,7 @@@
  	</ul>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.MethodSignature"></a>
++	<a id="RestResources.MethodSignature"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.1 - REST Java Method Signature</h3>
  	<div class='topic'>
  		<p>
@@@ -679,7 -679,7 +680,7 @@@
  		</ul>
  		
  		<!-- ======================================================================================================== -->
--		<a name="RestResources.MethodSignature.Path"></a>
++		<a id="RestResources.MethodSignature.Path"></a>
  		<h4 class='topic' onclick='toggle(this)'>4.1.1 - Path</h4>
  		<div class='topic'>
  			<p>
@@@ -780,7 -780,7 +781,7 @@@
  		</div>
  		
  		<!-- ======================================================================================================== -->
--		<a name="RestResources.MethodSignature.Matchers"></a>
++		<a id="RestResources.MethodSignature.Matchers"></a>
  		<h4 class='topic' onclick='toggle(this)'>4.1.2 - Matchers</h4>
  		<div class='topic'>
  		<p>
@@@ -824,7 -824,7 +825,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.RequestContent"></a>
++	<a id="RestResources.RequestContent"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.2 - Request Content</h3>
  	<div class='topic'>
  		<p>
@@@ -864,7 -864,7 +865,7 @@@
  		</p>
  		
  	<!-- ======================================================================================================== -->
--		<a name="RestResources.RequestContent.FormPosts"></a>
++		<a id="RestResources.RequestContent.FormPosts"></a>
  		<h4 class='topic' onclick='toggle(this)'>4.2.1 - Form Posts</h4>
  	<div class='topic'>	
  		<p>
@@@ -873,7 -873,7 +874,7 @@@
  			<p>
  				The best way to handle a form post is by using an input bean.
  				The samples include a <l>UrlEncodedFormResource</l> class that takes in URL-Encoded
--					form post of the form <l>"aString=foo&aNumber=123&aDate=2001-07-04T15:30:45Z"</l>.
++					form post of the form <l>"aString=foo&amp;aNumber=123&amp;aDate=2001-07-04T15:30:45Z"</l>.
  				The code is shown here:
  		</p>
  		<p class='bcode'>				
@@@ -922,7 -922,7 +923,7 @@@
  		</div>
  
  		<!-- ======================================================================================================== -->
--		<a name="RestResources.RequestContent"></a>
++		<a id="RestResources.RequestContent"></a>
  		<h4 class='topic' onclick='toggle(this)'>4.2.2 - Multipart Form Posts</h4>
  		<div class='topic'>
  		<p>
@@@ -962,7 -962,7 +963,7 @@@
  			<ja>@Override</ja> <jc>/* RestMatcher */</jc>
  			<jk>public boolean</jk> matches(RestRequest req) {
  				String contentType = req.getContentType();
--				<jk>return</jk> contentType != <jk>null</jk> && contentType.startsWith(<js>"multipart/form-data"</js>); 
++				<jk>return</jk> contentType != <jk>null</jk> &amp;&amp; contentType.startsWith(<js>"multipart/form-data"</js>); 
  			}
  		}
  		</p>
@@@ -970,7 -970,7 +971,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.ResponseContent"></a>
++	<a id="RestResources.ResponseContent"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.3 - Response Content</h3>
  	<div class='topic'>
  		<p>
@@@ -1012,7 -1012,7 +1013,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.OptionsPages"></a>
++	<a id="RestResources.OptionsPages"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.4 - OPTIONS Pages</h3>
  	<div class='topic'>
  		<p>
@@@ -1316,7 -1316,7 +1317,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Serializers"></a>
++	<a id="RestResources.Serializers"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.5 - Serializers</h3>
  	<div class='topic'>
  		<p>
@@@ -1377,7 -1377,7 +1378,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Parsers"></a>
++	<a id="RestResources.Parsers"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.6 - Parsers</h3>
  	<div class='topic'>
  		<p>
@@@ -1434,7 -1434,7 +1435,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Properties"></a>
++	<a id="RestResources.Properties"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.7 - Properties</h3>
  	<div class='topic'>
  		<p>
@@@ -1529,7 -1529,7 +1530,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Transforms"></a>
++	<a id="RestResources.Transforms"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.8 - Transforms</h3>
  	<div class='topic'>
  		<p>
@@@ -1584,7 -1584,7 +1585,7 @@@
  	</div>	
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Guards"></a>
++	<a id="RestResources.Guards"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.9 - Guards</h3>
  	<div class='topic'>
  		<p>
@@@ -1647,7 -1647,7 +1648,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Converters"></a>
++	<a id="RestResources.Converters"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.10 - Converters</h3>
  	<div class='topic'>
  		<p>
@@@ -1744,7 -1744,7 +1745,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Children"></a>
++	<a id="RestResources.Children"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.11 - Child Resources</h3>
  	<div class='topic'>		
  		<p>
@@@ -1869,8 -1869,8 +1870,9 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Labels"></a>
++	<a id="RestResources.Labels"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.12 - Localized Messages</h3>
++	<div class='topic'>
  		<p>
  			The {@link org.apache.juneau.server.annotation.RestResource#messages @RestResource.messages()} annotation can be used to associate a resource bundle with a servlet class.
  		</p>
@@@ -1912,7 -1912,7 +1914,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Encoders"></a>
++	<a id="RestResources.Encoders"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.13- Encoders</h3>
  	<div class='topic'>
  		<p>
@@@ -1941,7 -1941,7 +1943,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.SvlVars"></a>
++	<a id="RestResources.SvlVars"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.14 - SVL Vars</h3>
  	<div class='topic'>
  		<p>	
@@@ -2242,7 -2242,7 +2244,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.StaticFiles"></a>
++	<a id="RestResources.StaticFiles"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.15 - Static Files</h3>
  	<div class='topic'>
  		<p>
@@@ -2284,7 -2284,7 +2286,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Listeners"></a>
++	<a id="RestResources.Listeners"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.16 - Listener Methods</h3>	
  	<div class='topic'>
  		<p>
@@@ -2307,7 -2307,7 +2309,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Stylesheet"></a>
++	<a id="RestResources.Stylesheet"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.17 - Stylesheet</h3>	
  	<div class='topic'>
  		<p>
@@@ -2362,7 -2362,7 +2364,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Headers"></a>
++	<a id="RestResources.Headers"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.18 - Default Headers</h3>
  	<div class='topic'>
  		<p>
@@@ -2402,7 -2402,7 +2404,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Errors"></a>
++	<a id="RestResources.Errors"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.19 - Handling Errors / Logging</h3>
  	<div class='topic'>
  		<p>
@@@ -2467,7 -2467,7 +2469,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.ConfigFile"></a>
++	<a id="RestResources.ConfigFile"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.20 - Configuration Files</h3>
  	<div class='topic'>
  		<p>
@@@ -2638,7 -2638,7 +2640,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.Inheritence"></a>
++	<a id="RestResources.Inheritence"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.21 - Annotation Inheritence</h3>
  	<div class='topic'>
  		<p>
@@@ -2777,7 -2777,7 +2779,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.HttpStatusCodes"></a>
++	<a id="RestResources.HttpStatusCodes"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.22 - HTTP Status Codes</h3>
  	<div class='topic'>
  		<p>
@@@ -2835,7 -2835,7 +2837,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.OverloadedHttpMethods"></a>
++	<a id="RestResources.OverloadedHttpMethods"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.23 - Overloaded HTTP Methods</h3>
  	<div class='topic'>
  		<p>
@@@ -2857,7 -2857,7 +2859,7 @@@
  		<p class='bcode'>
  	<ja>@RestResource</ja>(
  		properties={
--			<jc>// Allow &method parameter on BAR requests</jc>
++			<jc>// Allow &amp;method parameter on BAR requests</jc>
  			<ja>@Property</ja>(name=<jsf>REST_allowMethodParam</jsf>, value=<js>"BAR"</js>)
  		},
  	)
@@@ -2865,7 -2865,7 +2867,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.BuildInParams"></a>
++	<a id="RestResources.BuildInParams"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.24 - Built-In Parameters</h3>
  	<div class='topic'>
  		<p>
@@@ -2925,7 -2925,7 +2927,7 @@@
  	</div>
  	
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.CustomSerializersParsers"></a>
++	<a id="RestResources.CustomSerializersParsers"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.25 - Defining your own serializers/parsers</h3>
  	<div class='topic'>
  		<p>
@@@ -3046,7 -3046,7 +3048,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.ResponseHandlers"></a>
++	<a id="RestResources.ResponseHandlers"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.26 - Response Handlers</h3>
  	<div class='topic'>
  		<p>
@@@ -3089,7 -3089,7 +3091,7 @@@
  	</div>
  
  	<!-- ======================================================================================================== -->
--	<a name="RestResources.OtherNotes"></a>
++	<a id="RestResources.OtherNotes"></a>
  	<h3 class='topic' onclick='toggle(this)'>4.27 - Other Notes</h3>
  	<div class='topic'>
  		<ul class='spaced-list'>
@@@ -3114,7 -3114,7 +3116,7 @@@
  </div>
  
  <!-- ======================================================================================================== -->
--<a name="Osgi"></a>
++<a id="Osgi"></a>
  <h2 class='topic' onclick='toggle(this)'>5 - Using with OSGi</h2>
  <div class='topic'>
  		<p>
@@@ -3181,7 -3181,7 +3183,7 @@@
  </div>
  
  <!-- ======================================================================================================== -->
--<a name="PojosConvertableFromString"></a>
++<a id="PojosConvertableFromString"></a>
  <h2 class='topic' onclick='toggle(this)'>6 - POJOs Convertable From Strings</h2>
  <div class='topic'>
  		<p>
@@@ -3210,7 -3210,7 +3212,7 @@@
  </div>
  
  <!-- ======================================================================================================== -->
--<a name="AddressBookResource"></a>
++<a id="AddressBookResource"></a>
  <h2 class='topic' onclick='toggle(this)'>7 - Address Book Resource</h2>
  <div class='topic'>
  		<p>
@@@ -3591,7 -3591,7 +3593,7 @@@
  	<ck>getCognosData</ck> = <cv>Get data in Cognos/XML format</cv>
  	<ck>getCognosData.res.200.content</ck> = <cv>DataSet</cv>
  	
--	<ck>otherNotes</ck> = <cv>GZip support enabled.  Public methods can be invoked by using the &Method URL parameter.  'text/cognos+xml' support available under root resource only</cv>
++	<ck>otherNotes</ck> = <cv>GZip support enabled.  Public methods can be invoked by using the &amp;Method URL parameter.  'text/cognos+xml' support available under root resource only</cv>
  	</p>
  
  </div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/18feb674/juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
----------------------------------------------------------------------
diff --cc juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
index 1f7ab39,1f7ab39..6a1305b
--- a/juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
+++ b/juneau-server/src/main/java/org/apache/juneau/server/remoteable/package.html
@@@ -60,7 -60,7 +60,7 @@@
  	Defines an API for remote proxy interfaces (e.g. Remoteable Services).
  </p>
  
--<a name='TOC'></a><h5 class='toc'>Table of Contents</h5>
++<a id='TOC'></a><h5 class='toc'>Table of Contents</h5>
  <ol class='toc'>
  	<li><p><a class='doclink' href='#Intro'>Remoteable Services</a></p>
  	<li><p><a class='doclink' href='#Client'>Client Side</a></p> 
@@@ -69,7 -69,7 +69,7 @@@
  </ol>
  
  <!-- ======================================================================================================== -->
--<a name="Intro"></a>
++<a id="Intro"></a>
  <h2 class='topic' onclick='toggle(this)'>1 - Remoteable Services</h2>
  <div class='topic'>
  	<p>
@@@ -114,15 -114,15 +114,15 @@@
  	</p>
  	<p>
  		The requirements for a method to be callable through the remoteable service are:
--		<ul class='spaced-list'>
--			<li>The method must be public.
--			<li>The parameter and return types must be <a href='../../core/package-summary.html#PojoCategories'><u>serializable and parsable</u></a>.
--		</ul>
  	</p>
++	<ul class='spaced-list'>
++		<li>The method must be public.
++		<li>The parameter and return types must be <a href='../../core/package-summary.html#PojoCategories'>serializable and parsable</a>.
++	</ul>
  </div>
  
  <!-- ======================================================================================================== -->
--<a name="Client"></a>
++<a id="Client"></a>
  <h2 class='topic' onclick='toggle(this)'>2 - Client Side</h2>
  <div class='topic'>
  	<p>
@@@ -162,7 -162,7 +162,7 @@@
  </div>
  
  <!-- ======================================================================================================== -->
--<a name="Server"></a>
++<a id="Server"></a>
  <h2 class='topic' onclick='toggle(this)'>3 - Server Side</h2>
  <div class='topic'>
  	<p>
@@@ -299,15 -299,15 +299,15 @@@
  	</p>
  	<img class='bordered' src="doc-files/6.png">
  	<p>
--		When specifying the POST body as a <code>&content</code> parameter, the method arguments should be in UON notation.
++		When specifying the POST body as a <code>&amp;content</code> parameter, the method arguments should be in UON notation.
  		See {@link org.apache.juneau.urlencoding.UonSerializer} for more information about this encoding.
--		Usually you can also pass in JSON if you specify <code>&Content-Type=text/json</code> in the URL parameters
++		Usually you can also pass in JSON if you specify <code>&amp;Content-Type=text/json</code> in the URL parameters
  			but passing in unencoded JSON in a URL may not work in all browsers.  Therefore, UON is preferred.
  	</p>
  </div>
  
  <!-- ======================================================================================================== -->
--<a name="RemoteableAnnotation"></a>
++<a id="RemoteableAnnotation"></a>
  <h2 class='topic' onclick='toggle(this)'>4 - @Remoteable Annotation</h2>
  <div class='topic'>
  	<p>