http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/03d6af50/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html 
b/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
index 36a4d1d..bb5fd86 100644
--- a/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
+++ b/content/site/apidocs/org/apache/juneau/serializer/SerializerWriter.html
@@ -121,7 +121,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.32">SerializerWriter</a>
+<pre>public class <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.33">SerializerWriter</a>
 extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a></pre>
 <div class="block">Simple wrapper around a standard <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io"><code>Writer</code></a> with additional 
methods.
 
@@ -399,7 +399,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>out</h4>
-<pre>protected final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a> <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.35">out</a></pre>
+<pre>protected final&nbsp;<a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a> <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.36">out</a></pre>
 <div class="block">The underlying writer.</div>
 </li>
 </ul>
@@ -409,7 +409,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>useWhitespace</h4>
-<pre>protected final&nbsp;boolean <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.38">useWhitespace</a></pre>
+<pre>protected final&nbsp;boolean <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.39">useWhitespace</a></pre>
 <div class="block">Use-whitespace flag.</div>
 </li>
 </ul>
@@ -419,7 +419,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>maxIndent</h4>
-<pre>protected final&nbsp;int <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.41">maxIndent</a></pre>
+<pre>protected final&nbsp;int <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.42">maxIndent</a></pre>
 <div class="block">Max indentation levels.</div>
 </li>
 </ul>
@@ -429,7 +429,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>trimStrings</h4>
-<pre>protected final&nbsp;boolean <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.44">trimStrings</a></pre>
+<pre>protected final&nbsp;boolean <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.45">trimStrings</a></pre>
 <div class="block">Trim strings flag.</div>
 </li>
 </ul>
@@ -439,7 +439,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>quoteChar</h4>
-<pre>protected final&nbsp;char <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.47">quoteChar</a></pre>
+<pre>protected final&nbsp;char <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.48">quoteChar</a></pre>
 <div class="block">The quote character being used by this writer.</div>
 </li>
 </ul>
@@ -449,7 +449,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockListLast">
 <li class="blockList">
 <h4>uriResolver</h4>
-<pre>protected final&nbsp;<a 
href="../../../../org/apache/juneau/UriResolver.html" title="class in 
org.apache.juneau">UriResolver</a> <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.50">uriResolver</a></pre>
+<pre>protected final&nbsp;<a 
href="../../../../org/apache/juneau/UriResolver.html" title="class in 
org.apache.juneau">UriResolver</a> <a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.51">uriResolver</a></pre>
 <div class="block">The URI resolver of the request.</div>
 </li>
 </ul>
@@ -467,7 +467,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SerializerWriter</h4>
-<pre>public&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.62">SerializerWriter</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a>&nbsp;out,
+<pre>public&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.63">SerializerWriter</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a>&nbsp;out,
                         boolean&nbsp;useWhitespace,
                         int&nbsp;maxIndent,
                         boolean&nbsp;trimStrings,
@@ -499,7 +499,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>cr</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.82">cr</a>(int&nbsp;depth)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.83">cr</a>(int&nbsp;depth)
                     throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Performs a carriage return.
 
@@ -521,7 +521,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>cre</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.98">cre</a>(int&nbsp;depth)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.99">cre</a>(int&nbsp;depth)
                      throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Performs a carriage return at the end of a line.
 
@@ -543,7 +543,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.113">appendln</a>(int&nbsp;indent,
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.114">appendln</a>(int&nbsp;indent,
                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;text)
                           throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes an indent (if the <code>useWhitespace</code> setting 
is enabled), followed by text, followed by a newline
@@ -565,7 +565,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendln</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.124">appendln</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.125">appendln</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;text)
                           throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes the specified text followed by a newline (if the 
<code>useWhitespace</code> setting is enabled).</div>
 <dl>
@@ -584,7 +584,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.136">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.137">append</a>(int&nbsp;indent,
                                <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;text)
                         throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes an indent (if the <code>useWhitespace</code> setting 
is enabled), followed by text.</div>
@@ -605,7 +605,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.148">append</a>(int&nbsp;indent,
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.149">append</a>(int&nbsp;indent,
                                char&nbsp;c)
                         throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes an indent (if the <code>useWhitespace</code> setting 
is enabled), followed by text.</div>
@@ -626,7 +626,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendUri</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.186">appendUri</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;uri)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.197">appendUri</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;uri)
                            throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Appends the specified object as a URI.
 
@@ -654,7 +654,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.198">append</a>(char[]&nbsp;characters)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.209">append</a>(char[]&nbsp;characters)
                         throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Appends the specified characters to this writer.</div>
 <dl>
@@ -673,7 +673,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>s</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.210">s</a>()
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.221">s</a>()
                    throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Adds a whitespace character to the output if the 
<code>useWhitespace</code> setting is enabled.</div>
 <dl>
@@ -690,7 +690,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>q</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.222">q</a>()
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.233">q</a>()
                    throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Adds the quote character specified by the 
<code>quoteChar</code> setting to the output.</div>
 <dl>
@@ -707,7 +707,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>i</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.234">i</a>(int&nbsp;indent)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.245">i</a>(int&nbsp;indent)
                    throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes an indent to the writer if the 
<code>useWhitespace</code> setting is enabled.</div>
 <dl>
@@ -726,7 +726,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>ie</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.248">ie</a>(int&nbsp;indent)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.259">ie</a>(int&nbsp;indent)
                     throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes an end-of-line indent to the writer if the 
<code>useWhitespace</code> setting is enabled.</div>
 <dl>
@@ -745,7 +745,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>nl</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.262">nl</a>(int&nbsp;indent)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.273">nl</a>(int&nbsp;indent)
                     throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes a newline to the writer if the 
<code>useWhitespace</code> setting is enabled.</div>
 <dl>
@@ -764,7 +764,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>nlIf</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.276">nlIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.287">nlIf</a>(boolean&nbsp;b,
                              int&nbsp;indent)
                       throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes a newline to the writer if the 
<code>useWhitespace</code> setting is enabled and the boolean flag is 
true.</div>
@@ -785,7 +785,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.289">append</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;text)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.300">append</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>&nbsp;text)
                         throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes the specified text to the writer.</div>
 <dl>
@@ -804,7 +804,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.301">append</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;text)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.312">append</a>(<a
 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;text)
                         throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes the specified text to the writer.</div>
 <dl>
@@ -823,7 +823,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendIf</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.315">appendIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.326">appendIf</a>(boolean&nbsp;b,
                                  <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;text)
                           throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes the specified text to the writer if b is true.</div>
@@ -844,7 +844,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>appendIf</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.329">appendIf</a>(boolean&nbsp;b,
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.340">appendIf</a>(boolean&nbsp;b,
                                  char&nbsp;c)
                           throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <div class="block">Writes the specified text to the writer if b is true.</div>
@@ -865,7 +865,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.341">append</a>(char&nbsp;c)
+<pre>public&nbsp;<a 
href="../../../../org/apache/juneau/serializer/SerializerWriter.html" 
title="class in org.apache.juneau.serializer">SerializerWriter</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.352">append</a>(char&nbsp;c)
                         throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -883,7 +883,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>write</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.347">write</a>(char[]&nbsp;cbuf,
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.358">write</a>(char[]&nbsp;cbuf,
                   int&nbsp;off,
                   int&nbsp;len)
            throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
@@ -901,7 +901,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockList">
 <li class="blockList">
 <h4>flush</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.352">flush</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.363">flush</a>()
            throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -919,7 +919,7 @@ extends <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/Writer.html?is
 <ul class="blockListLast">
 <li class="blockList">
 <h4>close</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.357">close</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/juneau/serializer/SerializerWriter.html#line.368">close</a>()
            throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/03d6af50/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html 
b/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html
index 16c2fc0..c901ea4 100644
--- a/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/soap/SoapXmlSerializer.html
@@ -344,7 +344,7 @@ extends <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="cl
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getResponseHeaders</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" 
title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/soap/SoapXmlSerializer.html#line.79">getResponseHeaders</a>(<a
 href="../../../../org/apache/juneau/ObjectMap.html" title="class in 
org.apache.juneau">ObjectMap</a>&nbsp;properties)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/juneau/ObjectMap.html" 
title="class in org.apache.juneau">ObjectMap</a>&nbsp;<a 
href="../../../../src-html/org/apache/juneau/soap/SoapXmlSerializer.html#line.80">getResponseHeaders</a>(<a
 href="../../../../org/apache/juneau/ObjectMap.html" title="class in 
org.apache.juneau">ObjectMap</a>&nbsp;properties)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">Serializer</a></code></span></div>
 <div class="block">Optional method that specifies HTTP request headers for 
this serializer.
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/03d6af50/content/site/apidocs/overview-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/overview-summary.html 
b/content/site/apidocs/overview-summary.html
index 86780e6..16ac10d 100644
--- a/content/site/apidocs/overview-summary.html
+++ b/content/site/apidocs/overview-summary.html
@@ -2836,7 +2836,10 @@
       // "request:/..." URIs are relative to the request URI.
       // "servlet:/..." URIs are relative to the servlet URI.</jc>
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       ),
       
       <jc>// Properties that get applied to all serializers and parsers.</jc>
@@ -3787,7 +3790,9 @@
       path=<js>"/"</js>,
       messages=<js>"nls/RootResources"</js>,
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{options:'?method=OPTIONS'}"</js>
+         links={
+            <js>"options: ?method=OPTIONS"</js>
+         }
       ),
       children={
          HelloWorldResource.<jk>class</jk>, 
@@ -3893,7 +3898,10 @@
       messages=<js>"nls/HelloWorldResource"</js>, 
       path=<js>"/helloWorld"</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       )
    ) 
    <jk>public class</jk> HelloWorldResource <jk>extends</jk> Resource { 
@@ -3983,7 +3991,10 @@
       path=<js>"/methodExample"</js>, 
       messages=<js>"nls/MethodExampleResource"</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       )
    ) 
    <jk>public class</jk> MethodExampleResource <jk>extends</jk> Resource { 
@@ -4212,7 +4223,9 @@
       <p class='bcode'>
    <ja>@RestResource</ja>(
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{options:'?method=OPTIONS'}"</js>
+         links={
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       )
    )
       </p>
@@ -4322,6 +4335,7 @@
       </p>
       
       <h6 class='figure'>UrlEncodedForm.html</h6>
+      <b>TODO - Needs update</b>
       <p class='bcode'>
    <xt>&lt;html&gt;</xt> 
    <xt>&lt;head&gt;</xt> 
@@ -4339,8 +4353,8 @@
       <xt>&lt;/script&gt;</xt> 
    <xt>&lt;/head&gt;</xt> 
    <xt>&lt;body&gt;</xt> 
-      <xt>&lt;h3</xt> 
<xa>class</xa>=<xs>'title'</xs><xt>&gt;</xt>$R{servletTitle}<xt>&lt;/h3&gt;</xt>
 
-      <xt>&lt;h5</xt> 
<xa>class</xa>=<xs>"description"</xs><xt>&gt;</xt>$R{servletDescription}<xt>&lt;/h5&gt;</xt>
 
+      <xt>&lt;h1&gt;</xt>$R{servletTitle}<xt>&lt;/h1&gt;</xt> 
+      <xt>&lt;h2&gt;</xt>$R{servletDescription}<xt>&lt;/h2&gt;</xt> 
       <xt>&lt;div</xt> <xa>class</xa>=<xs>'data'</xs><xt>&gt;</xt> 
          <xt>&lt;form</xt> <xa>id</xa>=<xs>'form'</xs> 
<xa>action</xa>=<xs>'$R{servletURI}'</xs> <xa>method</xa>=<xs>'POST'</xs> 
<xa>target</xa>=<xs>'buff'</xs><xt>&gt;</xt> 
             <xt>&lt;table&gt;</xt> 
@@ -4497,7 +4511,10 @@
       path=<js>"/echo"</js>,
       messages=<js>"nls/RequestEchoResource"</js>,
       htmldoc=<ja>@HtmlDoc</ja>(
-         
links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>,
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       ),
       properties={
          <ja>@Property</ja>(name=<jsf>SERIALIZER_maxDepth</jsf>, 
value=<js>"10"</js>),
@@ -5021,8 +5038,11 @@
       // "servlet:/..." URIs are relative to the servlet URI.
       // "$C{...}" variables are pulled from the config file.</jc>
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{up:'request:/..', options:'servlet:/?method=OPTIONS', 
-            
source:'$C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java'}"</js>
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>,
+            <js>"source: 
$C{Source/gitHub}/org/apache/juneau/examples/rest/addressbook/AddressBookResource.java"</js>
+         }
       ),
 
       <jc>// Properties that get applied to all serializers and parsers.</jc>
@@ -5744,7 +5764,10 @@
       description=<js>"Sample class showing how to use remoteable proxies. The 
list below are exposed services that 
          can be retrieved using RestClient.getProxyInterface(Class)."</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       ),
       properties={ 
          <jc>// Allow us to use method=POST from a browser.</jc> 
@@ -5863,7 +5886,11 @@
       path=<js>"/tempDir"</js>, 
       messages=<js>"nls/TempDirResource"</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{up:'request:/..', options:'servlet:/?method=OPTIONS', 
upload:'servlet:/upload'}"</js>
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>,
+            <js>"upload: servlet:/upload"</js>
+         }
       ),
       properties={ 
          <ja>@Property</ja>(name=<js>"DirectoryResource.rootDir"</js>, 
value=<js>"$S{java.io.tmpdir}"</js>), 
@@ -5927,6 +5954,7 @@
       </p>
       
       <h6 class='figure'>TempDirUploadPage.html</h6>
+      <b>TODO - Needs update</b>
       <p class='bcode'>
    <xt>&lt;html&gt;</xt>
    <xt>&lt;head&gt;</xt>
@@ -5936,8 +5964,8 @@
       <xt>&lt;/style&gt;</xt>
    <xt>&lt;/head&gt;</xt>
    <xt>&lt;body&gt;</xt>
-      <xt>&lt;h3</xt> 
<xa>class</xa>=<xs>'title'</xs><xt>&gt;</xt>$R{servletTitle}<xt>&lt;/h3&gt;</xt>
-      <xt>&lt;h5</xt> 
<xa>class</xa>=<xs>"description"</xs><xt>&gt;</xt>$R{servletDescription}<xt>&lt;/h5&gt;</xt>
+      <xt>&lt;h1&gt;</xt>$R{servletTitle}<xt>&lt;/h1&gt;</xt>
+      <xt>&lt;h2&gt;</xt>$R{servletDescription}<xt>&lt;/h2&gt;</xt>
       <xt>&lt;div</xt> <xa>class</xa>=<xs>'data'</xs><xt>&gt;</xt>
          <xt>&lt;form</xt> <xa>id</xa>=<xs>'form'</xs> 
<xa>action</xa>=<xs>'$R{servletURI}/upload'</xs> 
<xa>method</xa>=<xs>'POST'</xs> <xa>target</xa>=<xs>'buff'</xs> 
<xa>enctype</xa>=<xs>"multipart/form-data"</xs><xt>&gt;</xt>
             <xt>&lt;input</xt> <xa>name</xa>=<xs>"contents"</xs> 
<xa>type</xa>=<xs>"file"</xs><xt>&gt;</xt><xt>&lt;button</xt> 
<xa>type</xa>=<xs>"submit"</xs><xt>&gt;</xt>Submit<xt>&lt;/button&gt;</xt>
@@ -5990,7 +6018,10 @@
       path=<js>"/atom"</js>, 
       messages=<js>"nls/AtomFeedResource"</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js>
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       ),
       properties={ 
          <ja>@Property</ja>(name=<jsf>SERIALIZER_quoteChar</jsf>, 
value=<js>"'"</js>), 
@@ -6109,7 +6140,10 @@
       path=<js>"/docker"</js>, 
       title=<js>"Sample Docker resource"</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         
links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js> 
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       )
    ) 
    <jk>public class</jk> DockerRegistryResource <jk>extends</jk> Resource { 
@@ -6199,7 +6233,10 @@
       title=<js>"Tumblr parser service"</js>, 
       description=<js>"Specify a URL to a Tumblr blog and parse the 
results."</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         
links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js> 
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       )
    ) 
    <jk>public class</jk> TumblrParserResource <jk>extends</jk> Resource { 
@@ -6285,7 +6322,9 @@
       title=<js>"Photo REST service"</js>,
       description=<js>"Use a tool like Poster to upload and retrieve jpeg and 
png images."</js>,
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{options:'?method=OPTIONS'}"</js>
+         links={
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       )
    )
    <jk>public class</jk> PhotosResource <jk>extends</jk> RestServletDefault {
@@ -6429,7 +6468,10 @@
       messages=<js>"nls/JsonSchemaResource"</js>, 
       title=<js>"Sample JSON-Schema document"</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         
links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js> 
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       )
    ) 
    <jk>public class</jk> JsonSchemaResource <jk>extends</jk> ResourceJena { 
@@ -6517,7 +6559,10 @@
       title=<js>"SQL query service"</js>, 
       description=<js>"Executes queries against the local derby 
'$C{SqlQueryResource/connectionUrl}' database"</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         
links=<js>"{up:'request:/..',options:'servlet:/?method=OPTIONS'}"</js> 
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>
+         }
       )
    ) 
    <jk>public class</jk> SqlQueryResource <jk>extends</jk> Resource { 
@@ -6611,6 +6656,7 @@
       </p>
       
       <h6 class='figure'>SqlQueryResource.html</h6>
+      <b>TODO - Needs update</b>
       <p class='bcode'>
    <xt>&lt;html&gt;</xt> 
    <xt>&lt;head&gt;</xt> 
@@ -6636,7 +6682,7 @@
       <xt>&lt;/script&gt;</xt> 
    <xt>&lt;/head&gt;</xt> 
    <xt>&lt;body&gt;</xt> 
-      <xt>&lt;h3</xt> <xa>class</xa>=<xs>'title'</xs><xt>&gt;</xt>SQL Query 
API<xt>&lt;/h3&gt;</xt> 
+      <xt>&lt;h1&gt;</xt>SQL Query API<xt>&lt;/h1&gt;</xt> 
       <xt>&lt;div</xt> <xa>class</xa>=<xs>'data'</xs><xt>&gt;</xt> 
          <xt>&lt;form</xt> <xa>action</xa>=<xs>'sqlQuery'</xs> 
<xa>method</xa>=<xs>'POST'</xs> <xa>target</xa>=<xs>'buf'</xs><xt>&gt;</xt> 
             <xt>&lt;table&gt;</xt> 
@@ -6709,7 +6755,11 @@
       title=<js>"Configuration"</js>, 
       description=<js>"Contents of configuration file."</js>, 
       htmldoc=<ja>@HtmlDoc</ja>(
-         links=<js>"{up:'request:/..', options:'servlet:/?method=OPTIONS', 
edit:'servlet:/edit'}"</js>
+         links={
+            <js>"up: request:/.."</js>,
+            <js>"options: servlet:/?method=OPTIONS"</js>,
+            <js>"edit: servlet:/edit"</js>
+         }
       )
    ) 
    <jk>public class</jk> ConfigResource <jk>extends</jk> Resource { 
@@ -6864,6 +6914,7 @@
       </p>
       
       <h6 class='figure'>ConfigEdit.html</h6>
+      <b>TODO - Needs update</b>
       <p class='bcode'>
    <xt>&lt;html&gt;</xt> 
    <xt>&lt;head&gt;</xt> 
@@ -6873,8 +6924,8 @@
       <xt>&lt;/style&gt;</xt> 
    <xt>&lt;/head&gt;</xt> 
    <xt>&lt;body&gt;</xt> 
-      <xt>&lt;h3</xt> 
<xa>class</xa>=<xs>'title'</xs><xt>&gt;</xt>$R{servletTitle}<xt>&lt;/h3&gt;</xt>
 
-      <xt>&lt;h5</xt> <xa>class</xa>=<xs>'description'</xs><xt>&gt;</xt>Edit 
config file<xt>&lt;/h5&gt;</xt> 
+      <xt>&lt;h1&gt;</xt>$R{servletTitle}<xt>&lt;/h1&gt;</xt> 
+      <xt>&lt;h2&gt;</xt>Edit config file<xt>&lt;/h2&gt;</xt> 
       <xt>&lt;p</xt> 
<xa>class</xa>=<xs>'links'</xs><xt>&gt;</xt><xt>&lt;a</xt> 
<xa>href</xa>=<xs>'$R{requestParentURI}'</xs><xt>&gt;</xt>up<xt>&lt;/a&gt;</xt> 
- <xt>&lt;a</xt> 
<xa>href=<xs>'$R{servletURI}?method</xa>=OPTIONS'</xs><xt>&gt;</xt>options<xt>&lt;/a&gt;</xt><xt>&lt;/p&gt;</xt>
 
       <xt>&lt;form</xt> <xa>id</xa>=<xs>'form'</xs> 
<xa>action</xa>=<xs>'$R{servletURI}'</xs> <xa>method</xa>=<xs>'POST'</xs> 
<xa>enctype</xa>=<xs>'application/x-www-form-urlencoded'</xs><xt>&gt;</xt> 
          <xt>&lt;div</xt> <xa>class</xa>=<xs>'data'</xs><xt>&gt;</xt> 
@@ -7227,6 +7278,54 @@
             <br>For those nolstalgic for old times, there's also 'original':
             <br><img src='doc-files/ReleaseNotes_631_OriginalStyle.png'>
          <li>
+            Simplified the stylesheets and HTML code.
+            <ul>
+               <li>Replaced <code><xt>&lt;h3</xt> 
<xa>class</xa>=<xs>'title'</xs><xt>&gt;</xt></code> with just 
<code><xt>&lt;header&gt;</xt>/<xt>&lt;h1&gt;</xt></code>.
+               <li>Replaced <code><xt>&lt;h5</xt> 
<xa>class</xa>=<xs>'description'</xs><xt>&gt;</xt></code> with just 
<code><xt>&lt;header&gt;</xt>/<xt>&lt;h2&gt;</xt></code>.
+               <li>Replaced <code><xt>&lt;a</xt> 
<xa>class</xa>=<xs>'link'</xs><xt>&gt;</xt></code> with just 
<code><xt>&lt;nav&gt;</xt>/<xt>&lt;a&gt;</xt></code>.
+               <li>The nav links are now an ordered list of elements.
+            </ul>
+         <li>
+            Modifications to the following <ja>@HtmlDoc</ja> annotations:
+            <ul>
+               <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#links--"><code>links()</code></a>
 - Now an array of strings instead of a JSON object.  Simplified syntax.
+                  <br>For example:
+                  <p class='bcode'>
+   <jc>// Old syntax</jc>
+   htmldoc=<ja>@HtmlDoc</ja>(
+      links=<js>"{"</js>
+         + <js>"up:'request:/..',"</js>
+         + <js>"options:'servlet:/?method=OPTIONS',"</js>
+         + <js>"contentTypes:'$W{contentTypeMenuItem}',"</js>
+         + <js>"styles:'$W{styleMenuItem}',"</js>
+         + 
<js>"source:'$C{Source/gitHub}/org/apache/juneau/examples/rest/PetStoreResource.java'"</js>
+      + <js>"}"</js>
+   )
+   
+   <jc>// New syntax</jc>
+   htmldoc=<ja>@HtmlDoc</ja>(
+      links={
+         <js>"up: request:/.."</js>,
+         <js>"options: servlet:/?method=OPTIONS"</js>,
+         <js>"$W{contentTypeMenuItem}"</js>,
+         <js>"$W{styleMenuItem}"</js>,
+         <js>"source: 
$C{Source/gitHub}/org/apache/juneau/examples/rest/PetStoreResource.java"</js>
+      }
+   )
+                  </p>
+                  Previous syntax will still work, but you're encouraged to 
use the simplified syntax.
+               <li>Several annotations are now arrays of strings instead of 
simple strings.
+                  Values are simply concatenated with newlines which makes 
multi-line values cleaner.
+                  <ul>
+                     <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#header--"><code>header()</code></a>
+                     <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#nav--"><code>nav()</code></a>
+                     <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#aside--"><code>aside()</code></a>
+                     <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#footer--"><code>footer()</code></a>
+                     <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#script--"><code>script()</code></a>
+                     <li><a 
href="org/apache/juneau/rest/annotation/HtmlDoc.html#style--"><code>style()</code></a>
+                  </ul>
+            </ul>
+         <li>
             Improvements made to the <a 
href="org/apache/juneau/rest/widget/Widget.html" title="class in 
org.apache.juneau.rest.widget"><code>Widget</code></a> API.
             <ul>
                <li>
@@ -7290,9 +7389,9 @@
       <h6 class='topic'>org.apache.juneau.rest.examples</h6>
       <ul class='spaced-list'>
          <li>
-            Added CONTENT-TYPE menu items to most pages.
+            Added CONTENT-TYPE and STYLES menu items to most pages.
          <li>
-            Added improved QUERY menu items to PetStore page.
+            Added improved QUERY menu item to PetStore page.
       </ul>
    </div>
    
@@ -7619,7 +7718,7 @@
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlDescription-java.lang.String-"><code>setHtmlDescription(String)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlBranding-java.lang.String-"><code>setHtmlBranding(String)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlHeader-java.lang.String-"><code>setHtmlHeader(String)</code></a>
-               <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlLinks-java.lang.String-"><code>setHtmlLinks(String)</code></a>
+               <li><code><del>setHtmlLinks(String)</del></code>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlNav-java.lang.String-"><code>setHtmlNav(String)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlAside-java.lang.String-"><code>setHtmlAside(String)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestConfig.html#setHtmlFooter-java.lang.String-"><code>setHtmlFooter(String)</code></a>
@@ -7638,7 +7737,7 @@
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlDescription-java.lang.Object-"><code>setHtmlDescription(Object)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlBranding-java.lang.Object-"><code>setHtmlBranding(Object)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlHeader-java.lang.Object-"><code>setHtmlHeader(Object)</code></a>
-               <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlLinks-java.lang.Object-"><code>setHtmlLinks(Object)</code></a>
+               <li><code><del>setHtmlLinks(Object)</del></code>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlNav-java.lang.Object-"><code>setHtmlNav(Object)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlAside-java.lang.Object-"><code>setHtmlAside(Object)</code></a>
                <li><a 
href="org/apache/juneau/rest/RestResponse.html#setHtmlFooter-java.lang.Object-"><code>setHtmlFooter(Object)</code></a>


Reply via email to