http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html 
b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html
index baff2da..5ae0a0d 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerContext.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a 
href="../../../../org/apache/juneau/html/HtmlSerializer.SqReadable.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/html/HtmlSerializerBuilder.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -136,10 +136,10 @@ var activeTableTab = "activeTableTab";
 extends <a href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" 
title="class in org.apache.juneau.xml">XmlSerializerContext</a></pre>
 <div class="block">Configurable properties on the <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in 
org.apache.juneau.html"><code>HtmlSerializer</code></a> class.
  <p>
- Context properties are set by calling <a 
href="../../../../org/apache/juneau/ContextFactory.html#setProperty-java.lang.String-java.lang.Object-"><code>ContextFactory.setProperty(String,
 Object)</code></a> on the context factory
- returned <a 
href="../../../../org/apache/juneau/CoreApi.html#getContextFactory--"><code>CoreApi.getContextFactory()</code></a>.
+ Context properties are set by calling <a 
href="../../../../org/apache/juneau/PropertyStore.html#setProperty-java.lang.String-java.lang.Object-"><code>PropertyStore.setProperty(String,
 Object)</code></a> on the property store
+ passed into the constructor.
  <p>
- See <a href="../../../../org/apache/juneau/ContextFactory.html" title="class 
in org.apache.juneau"><code>ContextFactory</code></a> for more information 
about context properties.
+ See <a href="../../../../org/apache/juneau/PropertyStore.html" title="class 
in org.apache.juneau"><code>PropertyStore</code></a> for more information about 
context properties.
 
  <h5 class='section'>Inherited configurable properties:</h5>
  <ul class='javahierarchy'>
@@ -268,7 +268,7 @@ extends <a 
href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" ti
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/html/HtmlSerializerContext.html#HtmlSerializerContext-org.apache.juneau.ContextFactory-">HtmlSerializerContext</a></span>(<a
 href="../../../../org/apache/juneau/ContextFactory.html" title="class in 
org.apache.juneau">ContextFactory</a>&nbsp;cf)</code>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/html/HtmlSerializerContext.html#HtmlSerializerContext-org.apache.juneau.PropertyStore-">HtmlSerializerContext</a></span>(<a
 href="../../../../org/apache/juneau/PropertyStore.html" title="class in 
org.apache.juneau">PropertyStore</a>&nbsp;ps)</code>
 <div class="block">Constructor.</div>
 </td>
 </tr>
@@ -561,19 +561,19 @@ extends <a 
href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" ti
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HtmlSerializerContext-org.apache.juneau.ContextFactory-">
+<a name="HtmlSerializerContext-org.apache.juneau.PropertyStore-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HtmlSerializerContext</h4>
-<pre>public&nbsp;<a 
href="../../../../src-html/org/apache/juneau/html/HtmlSerializerContext.html#line.165">HtmlSerializerContext</a>(<a
 href="../../../../org/apache/juneau/ContextFactory.html" title="class in 
org.apache.juneau">ContextFactory</a>&nbsp;cf)</pre>
+<pre>public&nbsp;<a 
href="../../../../src-html/org/apache/juneau/html/HtmlSerializerContext.html#line.165">HtmlSerializerContext</a>(<a
 href="../../../../org/apache/juneau/PropertyStore.html" title="class in 
org.apache.juneau">PropertyStore</a>&nbsp;ps)</pre>
 <div class="block">Constructor.
  <p>
- Typically only called from <a 
href="../../../../org/apache/juneau/ContextFactory.html#getContext-java.lang.Class-"><code>ContextFactory.getContext(Class)</code></a>.</div>
+ Typically only called from <a 
href="../../../../org/apache/juneau/PropertyStore.html#getContext-java.lang.Class-"><code>PropertyStore.getContext(Class)</code></a>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>cf</code> - The factory that created this context.</dd>
+<dd><code>ps</code> - The property store that created this context.</dd>
 </dl>
 </li>
 </ul>
@@ -629,7 +629,7 @@ extends <a 
href="../../../../org/apache/juneau/xml/XmlSerializerContext.html" ti
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a 
href="../../../../org/apache/juneau/html/HtmlSerializer.SqReadable.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/apache/juneau/html/HtmlSerializerBuilder.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/apache/juneau/html/HtmlSerializerSession.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html 
b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
index 29e8172..b197783 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlSerializerSession.html
@@ -307,7 +307,7 @@ extends <a 
href="../../../../org/apache/juneau/xml/XmlSerializerSession.html" ti
 <dd><code>output</code> - The output object.  See <a 
href="../../../../org/apache/juneau/json/JsonSerializerSession.html#getWriter--"><code>JsonSerializerSession.getWriter()</code></a>
 for valid class types.</dd>
 <dd><code>op</code> - The override properties.
  These override any context properties defined in the context.</dd>
-<dd><code>javaMethod</code> - The java method that called this parser, usually 
the method in a REST servlet.</dd>
+<dd><code>javaMethod</code> - The java method that called this serializer, 
usually the method in a REST servlet.</dd>
 <dd><code>locale</code> - The session locale.
  If <jk>null</jk>, then the locale defined on the context is used.</dd>
 <dd><code>timeZone</code> - The session timezone.

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html 
b/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html
index 4025200..5a88e2e 100644
--- a/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html
+++ b/content/site/apidocs/org/apache/juneau/html/HtmlStrippedDocSerializer.html
@@ -99,10 +99,7 @@ var activeTableTab = "activeTableTab";
 <li><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/Lockable.html" title="class in 
org.apache.juneau">org.apache.juneau.Lockable</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/apache/juneau/CoreApi.html" title="class in 
org.apache.juneau">org.apache.juneau.CoreApi</a></li>
+<li><a href="../../../../org/apache/juneau/CoreObject.html" title="class in 
org.apache.juneau">org.apache.juneau.CoreObject</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../org/apache/juneau/serializer/Serializer.html" 
title="class in 
org.apache.juneau.serializer">org.apache.juneau.serializer.Serializer</a></li>
@@ -131,16 +128,10 @@ var activeTableTab = "activeTableTab";
 </ul>
 </li>
 </ul>
-</li>
-</ul>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
 <dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true";
 title="class or interface in java.lang">Cloneable</a></dd>
-</dl>
-<dl>
 <dt>Direct Known Subclasses:</dt>
 <dd><a href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" 
title="class in org.apache.juneau.html">HtmlDocSerializer</a></dd>
 </dl>
@@ -148,7 +139,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre><a href="../../../../org/apache/juneau/annotation/Produces.html" 
title="annotation in org.apache.juneau.annotation">@Produces</a>(<a 
href="../../../../org/apache/juneau/annotation/Produces.html#value--">value</a>="text/html+stripped",
           <a 
href="../../../../org/apache/juneau/annotation/Produces.html#contentType--">contentType</a>="text/html")
-public class <a 
href="../../../../src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html#line.36">HtmlStrippedDocSerializer</a>
+public class <a 
href="../../../../src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html#line.37">HtmlStrippedDocSerializer</a>
 extends <a href="../../../../org/apache/juneau/html/HtmlSerializer.html" 
title="class in org.apache.juneau.html">HtmlSerializer</a></pre>
 <div class="block">Serializes POJOs to HTTP responses as stripped HTML.
 
@@ -210,6 +201,13 @@ extends <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <h3>Fields inherited from class&nbsp;org.apache.juneau.xml.<a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in 
org.apache.juneau.xml">XmlSerializer</a></h3>
 <code><a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#DEFAULT_NS">DEFAULT_NS</a>,
 <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#DEFAULT_NS_SQ">DEFAULT_NS_SQ</a>,
 <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#DEFAULT_NS_SQ_READABLE">DEFAULT_NS_SQ_READABLE</a></code></li>
 </ul>
+<ul class="blockList">
+<li class="blockList"><a 
name="fields.inherited.from.class.org.apache.juneau.CoreObject">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/CoreObject.html" title="class in 
org.apache.juneau">CoreObject</a></h3>
+<code><a 
href="../../../../org/apache/juneau/CoreObject.html#propertyStore">propertyStore</a></code></li>
+</ul>
 </li>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -224,7 +222,9 @@ extends <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.html#HtmlStrippedDocSerializer--">HtmlStrippedDocSerializer</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.html#HtmlStrippedDocSerializer-org.apache.juneau.PropertyStore-">HtmlStrippedDocSerializer</a></span>(<a
 href="../../../../org/apache/juneau/PropertyStore.html" title="class in 
org.apache.juneau">PropertyStore</a>&nbsp;propertyStore)</code>
+<div class="block">Constructor.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -254,14 +254,14 @@ extends <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in 
org.apache.juneau.html">HtmlSerializer</a></h3>
-<code><a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addBeanFilters-java.lang.Class...-">addBeanFilters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addBeanFilters-java.util.Collection-">addBeanFilters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addImplClass-java.lang.Class-java.lang.Class-">addImplClass</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addNotBeanClasses-java.lang.Class...-">addNotBeanClasses</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addNotBeanClasses-java.util.Collection-">addNotBeanClasses</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addNotBeanPackages-java.util.Collection-">addNotBeanPackages</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addNotBeanPackages-java.lang.String...-">addNotBeanPackages</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addPojoSwaps-java.lang.Class...-">addPojoSw
 aps</a>, <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addPojoSwaps-java.util.Collection-">addPojoSwaps</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addToBeanDictionary-java.lang.Class...-">addToBeanDictionary</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addToBeanDictionary-java.util.Collection-">addToBeanDictionary</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#addToProperty-java.lang.String-java.lang.Object-">addToProperty</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#clone--">clone</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>,
 <a href="../../../../org/apache/juneau/html/Ht
 mlSerializer.html#lock--">lock</a>, <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#putToProperty-java.lang.String-java.lang.Object-">putToProperty</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#putToProperty-java.lang.String-java.lang.Object-java.lang.Object-">putToProperty</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeBeanFilters-java.lang.Class...-">removeBeanFilters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeBeanFilters-java.util.Collection-">removeBeanFilters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeFromBeanDictionary-java.lang.Class...-">removeFromBeanDictionary</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeFromBeanDictionary-java.util.Collection-">removeFromBeanDictionary</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeFromProperty-java.lang.String-java.lang.Object-">removeFromProperty</a>,
  <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeNotBeanClasses-java.lang.Class...-">removeNotBeanClasses</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeNotBeanClasses-java.util.Collection-">removeNotBeanClasses</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeNotBeanPackages-java.util.Collection-">removeNotBeanPackages</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removeNotBeanPackages-java.lang.String...-">removeNotBeanPackages</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removePojoSwaps-java.lang.Class...-">removePojoSwaps</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#removePojoSwaps-java.util.Collection-">removePojoSwaps</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#serializeAnything-org.apache.juneau.html.HtmlSerializerSession-org.apache.juneau.html.HtmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.la
 
ng.String-int-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setAbsolutePathUriBase-java.lang.String-">setAbsolutePathUriBase</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setAddBeanTypeProperties-boolean-">setAddBeanTypeProperties</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setAddKeyValueTableHeaders-boolean-">setAddKeyValueTableHeaders</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanClassVisibility-org.apache.juneau.Visibility-">setBeanClassVisibility</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanConstructorVisibility-org.apache.juneau.Visibility-">setBeanConstructorVisibility</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanDictionary-java.lang.Class...-">setBeanDictionary</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanDictionary-java.ut
 il.Collection-">setBeanDictionary</a>, <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanFieldVisibility-org.apache.juneau.Visibility-">setBeanFieldVisibility</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanFilters-java.lang.Class...-">setBeanFilters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanFilters-java.util.Collection-">setBeanFilters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanMapPutReturnsOldValue-boolean-">setBeanMapPutReturnsOldValue</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeansRequireDefaultConstructor-boolean-">setBeansRequireDefaultConstructor</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeansRequireSerializable-boolean-">setBeansRequireSerializable</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeansRequireSettersForGetters-boolean-">setBeansRequireSettersForGetters</a>,
 <a hre
 
f="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeansRequireSomeProperties-boolean-">setBeansRequireSomeProperties</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setBeanTypePropertyName-java.lang.String-">setBeanTypePropertyName</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setClassLoader-java.lang.ClassLoader-">setClassLoader</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setDebug-boolean-">setDebug</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setDefaultParser-java.lang.Class-">setDefaultParser</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setDetectLinksInStrings-boolean-">setDetectLinksInStrings</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setDetectRecursions-boolean-">setDetectRecursions</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setIgnoreInvocationExceptionsOnGetters-boolean-">setIgnoreInvocationException
 sOnGetters</a>, <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setIgnoreInvocationExceptionsOnSetters-boolean-">setIgnoreInvocationExceptionsOnSetters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setIgnorePropertiesWithoutSetters-boolean-">setIgnorePropertiesWithoutSetters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setIgnoreRecursions-boolean-">setIgnoreRecursions</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setIgnoreUnknownBeanProperties-boolean-">setIgnoreUnknownBeanProperties</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setIgnoreUnknownNullBeanProperties-boolean-">setIgnoreUnknownNullBeanProperties</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setImplClasses-java.util.Map-">setImplClasses</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setInitialDepth-int-">setInitialDepth</a>,
 <a href="../../../../org/apache/juneau/html/Ht
 mlSerializer.html#setLabelParameter-java.lang.String-">setLabelParameter</a>, 
<a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setLocale-java.util.Locale-">setLocale</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setLookForLabelParameters-boolean-">setLookForLabelParameters</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setMaxDepth-int-">setMaxDepth</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setMediaType-org.apache.juneau.MediaType-">setMediaType</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setMethodVisibility-org.apache.juneau.Visibility-">setMethodVisibility</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setNotBeanClasses-java.lang.Class...-">setNotBeanClasses</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setNotBeanClasses-java.util.Collection-">setNotBeanClasses</a>,
 <a href="../../../../org/apache/juneau/html/HtmlSerializer.htm
 l#setNotBeanPackages-java.util.Collection-">setNotBeanPackages</a>, <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setNotBeanPackages-java.lang.String...-">setNotBeanPackages</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setPojoSwaps-java.lang.Class...-">setPojoSwaps</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setPojoSwaps-java.util.Collection-">setPojoSwaps</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setProperties-org.apache.juneau.ObjectMap-">setProperties</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setProperty-java.lang.String-java.lang.Object-">setProperty</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setQuoteChar-char-">setQuoteChar</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setRelativeUriBase-java.lang.String-">setRelativeUriBase</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setSortCollections
 -boolean-">setSortCollections</a>, <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setSortMaps-boolean-">setSortMaps</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setSortProperties-boolean-">setSortProperties</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setTimeZone-java.util.TimeZone-">setTimeZone</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setTrimEmptyCollections-boolean-">setTrimEmptyCollections</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setTrimEmptyMaps-boolean-">setTrimEmptyMaps</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setTrimNullProperties-boolean-">setTrimNullProperties</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setTrimStrings-boolean-">setTrimStrings</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setUriAnchorText-java.lang.String-">setUriAnchorText</a>,
 <a href="../../../../org/apache/june
 
au/html/HtmlSerializer.html#setUseInterfaceProxies-boolean-">setUseInterfaceProxies</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setUseJavaBeanIntrospector-boolean-">setUseJavaBeanIntrospector</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#setUseWhitespace-boolean-">setUseWhitespace</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#builder--">builder</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#createSession-java.lang.Object-org.apache.juneau.ObjectMap-java.lang.reflect.Method-java.util.Locale-java.util.TimeZone-org.apache.juneau.MediaType-">createSession</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#getSchemaSerializer--">getSchemaSerializer</a>,
 <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html#serializeAnything-org.apache.juneau.html.HtmlSerializerSession-org.apache.juneau.html.HtmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-int-org.apache.juneau.BeanPropertyMeta-boolean-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a 
name="methods.inherited.from.class.org.apache.juneau.xml.XmlSerializer">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.juneau.xml.<a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html" title="class in 
org.apache.juneau.xml">XmlSerializer</a></h3>
-<code><a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>,
 <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a>,
 <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#setAddNamespaceUrisToRoot-boolean-">setAddNamespaceUrisToRoot</a>,
 <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#setAutoDetectNamespaces-boolean-">setAutoDetectNamespaces</a>,
 <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#setDefaultNamespace-java.lang.String-">setDefaultNamespace</a>,
 <a href="../../../../org/apache/juneau/xml/XmlSerializer.html#setEnableNam
 espaces-boolean-">setEnableNamespaces</a>, <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#setNamespaces-org.apache.juneau.xml.Namespace...-">setNamespaces</a>,
 <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#setXsNamespace-org.apache.juneau.xml.Namespace-">setXsNamespace</a></code></li>
+<code><a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#findNsfMappings-org.apache.juneau.xml.XmlSerializerSession-java.lang.Object-">findNsfMappings</a>,
 <a 
href="../../../../org/apache/juneau/xml/XmlSerializer.html#serializeAnything-org.apache.juneau.xml.XmlSerializerSession-org.apache.juneau.xml.XmlWriter-java.lang.Object-org.apache.juneau.ClassMeta-java.lang.String-org.apache.juneau.xml.Namespace-boolean-org.apache.juneau.xml.annotation.XmlFormat-boolean-boolean-org.apache.juneau.BeanPropertyMeta-">serializeAnything</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a 
name="methods.inherited.from.class.org.apache.juneau.serializer.WriterSerializer">
@@ -278,25 +278,18 @@ extends <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <code><a 
href="../../../../org/apache/juneau/serializer/Serializer.html#createSession-java.lang.Object-">createSession</a>,
 <a 
href="../../../../org/apache/juneau/serializer/Serializer.html#getMediaTypes--">getMediaTypes</a>,
 <a 
href="../../../../org/apache/juneau/serializer/Serializer.html#getPrimaryMediaType--">getPrimaryMediaType</a>,
 <a 
href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseContentType--">getResponseContentType</a>,
 <a 
href="../../../../org/apache/juneau/serializer/Serializer.html#getResponseHeaders-org.apache.juneau.ObjectMap-">getResponseHeaders</a>,
 <a 
href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-java.lang.Object-java.lang.Object-">serialize</a>,
 <a 
href="../../../../org/apache/juneau/serializer/Serializer.html#serialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">serialize</a>,
 <a 
href="../../../../org/apache/juneau/serializer/Serializer.html#toList-java.lang.Class-java.lang.Object-">toList
 </a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a 
name="methods.inherited.from.class.org.apache.juneau.CoreApi">
+<li class="blockList"><a 
name="methods.inherited.from.class.org.apache.juneau.CoreObject">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/CoreApi.html" title="class in 
org.apache.juneau">CoreApi</a></h3>
-<code><a 
href="../../../../org/apache/juneau/CoreApi.html#checkLock--">checkLock</a>, <a 
href="../../../../org/apache/juneau/CoreApi.html#getBeanContext--">getBeanContext</a>,
 <a 
href="../../../../org/apache/juneau/CoreApi.html#getContext-java.lang.Class-">getContext</a>,
 <a 
href="../../../../org/apache/juneau/CoreApi.html#getContextFactory--">getContextFactory</a>,
 <a href="../../../../org/apache/juneau/CoreApi.html#object--">object</a>, <a 
href="../../../../org/apache/juneau/CoreApi.html#string--">string</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a 
name="methods.inherited.from.class.org.apache.juneau.Lockable">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/Lockable.html" title="class in 
org.apache.juneau">Lockable</a></h3>
-<code><a 
href="../../../../org/apache/juneau/Lockable.html#isLocked--">isLocked</a>, <a 
href="../../../../org/apache/juneau/Lockable.html#onUnclone--">onUnclone</a></code></li>
+<h3>Methods inherited from class&nbsp;org.apache.juneau.<a 
href="../../../../org/apache/juneau/CoreObject.html" title="class in 
org.apache.juneau">CoreObject</a></h3>
+<code><a 
href="../../../../org/apache/juneau/CoreObject.html#createContext-java.lang.Class-">createContext</a>,
 <a 
href="../../../../org/apache/juneau/CoreObject.html#createPropertyStore--">createPropertyStore</a>,
 <a 
href="../../../../org/apache/juneau/CoreObject.html#getBeanContext--">getBeanContext</a>,
 <a 
href="../../../../org/apache/juneau/CoreObject.html#getOverrideProperties--">getOverrideProperties</a>,
 <a href="../../../../org/apache/juneau/CoreObject.html#object--">object</a>, 
<a 
href="../../../../org/apache/juneau/CoreObject.html#string--">string</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.<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></h3>
-<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notifyAll--";
 title="class or interface in java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/j
 ava/lang/Object.html?is-external=true#toString--" title="class or interface in 
java.lang">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+<code><a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
 </ul>
 </li>
 </ul>
@@ -312,13 +305,18 @@ extends <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HtmlStrippedDocSerializer--">
+<a name="HtmlStrippedDocSerializer-org.apache.juneau.PropertyStore-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HtmlStrippedDocSerializer</h4>
-<pre>public&nbsp;<a 
href="../../../../src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html#line.36">HtmlStrippedDocSerializer</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html#line.43">HtmlStrippedDocSerializer</a>(<a
 href="../../../../org/apache/juneau/PropertyStore.html" title="class in 
org.apache.juneau">PropertyStore</a>&nbsp;propertyStore)</pre>
+<div class="block">Constructor.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>propertyStore</code> - The property store containing all the 
settings for this object.</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -335,7 +333,7 @@ extends <a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>doSerialize</h4>
-<pre>protected&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html#line.43">doSerialize</a>(<a
 href="../../../../org/apache/juneau/serializer/SerializerSession.html" 
title="class in 
org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
+<pre>protected&nbsp;void&nbsp;<a 
href="../../../../src-html/org/apache/juneau/html/HtmlStrippedDocSerializer.html#line.52">doSerialize</a>(<a
 href="../../../../org/apache/juneau/serializer/SerializerSession.html" 
title="class in 
org.apache.juneau.serializer">SerializerSession</a>&nbsp;session,
                            <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;o)
                     throws <a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../org/apache/juneau/serializer/Serializer.html#doSerialize-org.apache.juneau.serializer.SerializerSession-java.lang.Object-">Serializer</a></code></span></div>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/html/package-frame.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/package-frame.html 
b/content/site/apidocs/org/apache/juneau/html/package-frame.html
index 8c9c051..20d8154 100644
--- a/content/site/apidocs/org/apache/juneau/html/package-frame.html
+++ b/content/site/apidocs/org/apache/juneau/html/package-frame.html
@@ -19,12 +19,14 @@
 <li><a href="HtmlDocSerializerContext.html" title="class in 
org.apache.juneau.html" target="classFrame">HtmlDocSerializerContext</a></li>
 <li><a href="HtmlDocSerializerSession.html" title="class in 
org.apache.juneau.html" target="classFrame">HtmlDocSerializerSession</a></li>
 <li><a href="HtmlParser.html" title="class in org.apache.juneau.html" 
target="classFrame">HtmlParser</a></li>
+<li><a href="HtmlParserBuilder.html" title="class in org.apache.juneau.html" 
target="classFrame">HtmlParserBuilder</a></li>
 <li><a href="HtmlParserContext.html" title="class in org.apache.juneau.html" 
target="classFrame">HtmlParserContext</a></li>
 <li><a href="HtmlParserSession.html" title="class in org.apache.juneau.html" 
target="classFrame">HtmlParserSession</a></li>
 <li><a href="HtmlSchemaDocSerializer.html" title="class in 
org.apache.juneau.html" target="classFrame">HtmlSchemaDocSerializer</a></li>
 <li><a href="HtmlSerializer.html" title="class in org.apache.juneau.html" 
target="classFrame">HtmlSerializer</a></li>
 <li><a href="HtmlSerializer.Sq.html" title="class in org.apache.juneau.html" 
target="classFrame">HtmlSerializer.Sq</a></li>
 <li><a href="HtmlSerializer.SqReadable.html" title="class in 
org.apache.juneau.html" target="classFrame">HtmlSerializer.SqReadable</a></li>
+<li><a href="HtmlSerializerBuilder.html" title="class in 
org.apache.juneau.html" target="classFrame">HtmlSerializerBuilder</a></li>
 <li><a href="HtmlSerializerContext.html" title="class in 
org.apache.juneau.html" target="classFrame">HtmlSerializerContext</a></li>
 <li><a href="HtmlSerializerSession.html" title="class in 
org.apache.juneau.html" target="classFrame">HtmlSerializerSession</a></li>
 <li><a href="HtmlStrippedDocSerializer.html" title="class in 
org.apache.juneau.html" target="classFrame">HtmlStrippedDocSerializer</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/html/package-summary.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/package-summary.html 
b/content/site/apidocs/org/apache/juneau/html/package-summary.html
index 2b1a2f5..53ca5a2 100644
--- a/content/site/apidocs/org/apache/juneau/html/package-summary.html
+++ b/content/site/apidocs/org/apache/juneau/html/package-summary.html
@@ -122,41 +122,53 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlParserBuilder.html" title="class 
in org.apache.juneau.html">HtmlParserBuilder</a></td>
+<td class="colLast">
+<div class="block">Builder class for building instances of HTML parsers.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlParserContext.html" title="class 
in org.apache.juneau.html">HtmlParserContext</a></td>
 <td class="colLast">
 <div class="block">Configurable properties on the <a 
href="../../../../org/apache/juneau/html/HtmlParser.html" title="class in 
org.apache.juneau.html"><code>HtmlParser</code></a> class.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlParserSession.html" title="class 
in org.apache.juneau.html">HtmlParserSession</a></td>
 <td class="colLast">
 <div class="block">Session object that lives for the duration of a single use 
of <a href="../../../../org/apache/juneau/html/HtmlParser.html" title="class in 
org.apache.juneau.html"><code>HtmlParser</code></a>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlSchemaDocSerializer.html" 
title="class in org.apache.juneau.html">HtmlSchemaDocSerializer</a></td>
 <td class="colLast">
 <div class="block">Serializes POJO metamodels to HTML.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in 
org.apache.juneau.html">HtmlSerializer</a></td>
 <td class="colLast">
 <div class="block">Serializes POJO models to HTML.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlSerializer.Sq.html" title="class 
in org.apache.juneau.html">HtmlSerializer.Sq</a></td>
 <td class="colLast">
 <div class="block">Default serializer, single quotes.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlSerializer.SqReadable.html" 
title="class in org.apache.juneau.html">HtmlSerializer.SqReadable</a></td>
 <td class="colLast">
 <div class="block">Default serializer, single quotes, whitespace added.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlSerializerBuilder.html" 
title="class in org.apache.juneau.html">HtmlSerializerBuilder</a></td>
+<td class="colLast">
+<div class="block">Builder class for building instances of HTML 
serializers.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><a 
href="../../../../org/apache/juneau/html/HtmlSerializerContext.html" 
title="class in org.apache.juneau.html">HtmlSerializerContext</a></td>
 <td class="colLast">

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/1809c234/content/site/apidocs/org/apache/juneau/html/package-tree.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/org/apache/juneau/html/package-tree.html 
b/content/site/apidocs/org/apache/juneau/html/package-tree.html
index 6ba9e68..27f9c2f 100644
--- a/content/site/apidocs/org/apache/juneau/html/package-tree.html
+++ b/content/site/apidocs/org/apache/juneau/html/package-tree.html
@@ -120,9 +120,7 @@
 </li>
 </ul>
 </li>
-<li type="circle">org.apache.juneau.<a 
href="../../../../org/apache/juneau/Lockable.html" title="class in 
org.apache.juneau"><span class="typeNameLink">Lockable</span></a> (implements 
java.lang.<a 
href="http://docs.oracle.com/javase/7/docs/api/java/lang/Cloneable.html?is-external=true";
 title="class or interface in java.lang">Cloneable</a>)
-<ul>
-<li type="circle">org.apache.juneau.<a 
href="../../../../org/apache/juneau/CoreApi.html" title="class in 
org.apache.juneau"><span class="typeNameLink">CoreApi</span></a>
+<li type="circle">org.apache.juneau.<a 
href="../../../../org/apache/juneau/CoreObject.html" title="class in 
org.apache.juneau"><span class="typeNameLink">CoreObject</span></a>
 <ul>
 <li type="circle">org.apache.juneau.parser.<a 
href="../../../../org/apache/juneau/parser/Parser.html" title="class in 
org.apache.juneau.parser"><span class="typeNameLink">Parser</span></a>
 <ul>
@@ -145,11 +143,8 @@
 <ul>
 <li type="circle">org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlSerializer.html" title="class in 
org.apache.juneau.html"><span class="typeNameLink">HtmlSerializer</span></a>
 <ul>
-<li type="circle">org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlSerializer.Sq.html" title="class 
in org.apache.juneau.html"><span 
class="typeNameLink">HtmlSerializer.Sq</span></a>
-<ul>
+<li type="circle">org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlSerializer.Sq.html" title="class 
in org.apache.juneau.html"><span 
class="typeNameLink">HtmlSerializer.Sq</span></a></li>
 <li type="circle">org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlSerializer.SqReadable.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">HtmlSerializer.SqReadable</span></a></li>
-</ul>
-</li>
 <li type="circle">org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlStrippedDocSerializer.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">HtmlStrippedDocSerializer</span></a>
 <ul>
 <li type="circle">org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlDocSerializer.html" title="class 
in org.apache.juneau.html"><span 
class="typeNameLink">HtmlDocSerializer</span></a>
@@ -169,6 +164,26 @@
 </li>
 </ul>
 </li>
+<li type="circle">org.apache.juneau.<a 
href="../../../../org/apache/juneau/CoreObjectBuilder.html" title="class in 
org.apache.juneau"><span class="typeNameLink">CoreObjectBuilder</span></a>
+<ul>
+<li type="circle">org.apache.juneau.parser.<a 
href="../../../../org/apache/juneau/parser/ParserBuilder.html" title="class in 
org.apache.juneau.parser"><span class="typeNameLink">ParserBuilder</span></a>
+<ul>
+<li type="circle">org.apache.juneau.xml.<a 
href="../../../../org/apache/juneau/xml/XmlParserBuilder.html" title="class in 
org.apache.juneau.xml"><span class="typeNameLink">XmlParserBuilder</span></a>
+<ul>
+<li type="circle">org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlParserBuilder.html" title="class 
in org.apache.juneau.html"><span 
class="typeNameLink">HtmlParserBuilder</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">org.apache.juneau.serializer.<a 
href="../../../../org/apache/juneau/serializer/SerializerBuilder.html" 
title="class in org.apache.juneau.serializer"><span 
class="typeNameLink">SerializerBuilder</span></a>
+<ul>
+<li type="circle">org.apache.juneau.xml.<a 
href="../../../../org/apache/juneau/xml/XmlSerializerBuilder.html" title="class 
in org.apache.juneau.xml"><span 
class="typeNameLink">XmlSerializerBuilder</span></a>
+<ul>
+<li type="circle">org.apache.juneau.html.<a 
href="../../../../org/apache/juneau/html/HtmlSerializerBuilder.html" 
title="class in org.apache.juneau.html"><span 
class="typeNameLink">HtmlSerializerBuilder</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
 </ul>
 </li>
 <li type="circle">org.apache.juneau.<a 
href="../../../../org/apache/juneau/Session.html" title="class in 
org.apache.juneau"><span class="typeNameLink">Session</span></a>


Reply via email to