am 46c777f3: updated current distribution

* commit '46c777f3b673c15229003ec585c8817ab411382d':
  updated current distribution
diff --git a/distrib/javadoc/allclasses-frame.html b/distrib/javadoc/allclasses-frame.html
index 249005e..d543976 100644
--- a/distrib/javadoc/allclasses-frame.html
+++ b/distrib/javadoc/allclasses-frame.html
@@ -50,6 +50,8 @@
 <BR>
 <A HREF="org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html" target="classFrame">HtmlStreamRenderer</A>
 <BR>
+<A HREF="org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html" target="classFrame">HtmlTextEscapingMode</A>
+<BR>
 <A HREF="org/owasp/html/PolicyFactory.html" title="class in org.owasp.html" target="classFrame">PolicyFactory</A>
 <BR>
 <A HREF="org/owasp/html/Sanitizers.html" title="class in org.owasp.html" target="classFrame">Sanitizers</A>
@@ -60,6 +62,8 @@
 <BR>
 <A HREF="org/owasp/html/TCB.html" title="annotation in org.owasp.html" target="classFrame">TCB</A>
 <BR>
+<A HREF="org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples" target="classFrame">UrlTextExample</A>
+<BR>
 </FONT></TD>
 </TR>
 </TABLE>
diff --git a/distrib/javadoc/allclasses-noframe.html b/distrib/javadoc/allclasses-noframe.html
index 98283d5..a6cd906 100644
--- a/distrib/javadoc/allclasses-noframe.html
+++ b/distrib/javadoc/allclasses-noframe.html
@@ -50,6 +50,8 @@
 <BR>
 <A HREF="org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html">HtmlStreamRenderer</A>
 <BR>
+<A HREF="org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>
+<BR>
 <A HREF="org/owasp/html/PolicyFactory.html" title="class in org.owasp.html">PolicyFactory</A>
 <BR>
 <A HREF="org/owasp/html/Sanitizers.html" title="class in org.owasp.html">Sanitizers</A>
@@ -60,6 +62,8 @@
 <BR>
 <A HREF="org/owasp/html/TCB.html" title="annotation in org.owasp.html">TCB</A>
 <BR>
+<A HREF="org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples">UrlTextExample</A>
+<BR>
 </FONT></TD>
 </TR>
 </TABLE>
diff --git a/distrib/javadoc/index-files/index-1.html b/distrib/javadoc/index-files/index-1.html
index b152a8c..dd3c59c 100644
--- a/distrib/javadoc/index-files/index-1.html
+++ b/distrib/javadoc/index-files/index-1.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_A_"><!-- --></A><H2>
 <B>A</B></H2>
 <DL>
@@ -102,6 +102,11 @@
 <DT><A HREF="../org/owasp/html/FilterUrlByProtocolAttributePolicy.html#allowProtocolRelativeUrls()"><B>allowProtocolRelativeUrls()</B></A> - 
 Method in class org.owasp.html.<A HREF="../org/owasp/html/FilterUrlByProtocolAttributePolicy.html" title="class in org.owasp.html">FilterUrlByProtocolAttributePolicy</A>
 <DD>&nbsp;
+<DT><A HREF="../org/owasp/html/HtmlTextEscapingMode.html#allowsEscapingTextSpan(java.lang.String)"><B>allowsEscapingTextSpan(String)</B></A> - 
+Static method in enum org.owasp.html.<A HREF="../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>
+<DD>True iff the content following the given tag allows escaping text
+ spans: <code>&lt;!--&amp;hellip;--&gt;</code> that escape even things that might
+ be an end tag for the corresponding open tag.
 <DT><A HREF="../org/owasp/html/HtmlPolicyBuilder.html#allowStandardUrlProtocols()"><B>allowStandardUrlProtocols()</B></A> - 
 Method in class org.owasp.html.<A HREF="../org/owasp/html/HtmlPolicyBuilder.html" title="class in org.owasp.html">HtmlPolicyBuilder</A>
 <DD>A canned URL protocol policy that allows <code>http</code>,
@@ -203,7 +208,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-10.html b/distrib/javadoc/index-files/index-10.html
index 833e4da..d7dc218 100644
--- a/distrib/javadoc/index-files/index-10.html
+++ b/distrib/javadoc/index-files/index-10.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_J_"><!-- --></A><H2>
 <B>J</B></H2>
 <DL>
@@ -141,7 +141,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-11.html b/distrib/javadoc/index-files/index-11.html
index 315773a..4825794 100644
--- a/distrib/javadoc/index-files/index-11.html
+++ b/distrib/javadoc/index-files/index-11.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_L_"><!-- --></A><H2>
 <B>L</B></H2>
 <DL>
@@ -136,7 +136,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-12.html b/distrib/javadoc/index-files/index-12.html
index 8d7849f..a61ef06 100644
--- a/distrib/javadoc/index-files/index-12.html
+++ b/distrib/javadoc/index-files/index-12.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_M_"><!-- --></A><H2>
 <B>M</B></H2>
 <DL>
@@ -89,6 +89,9 @@
 <DT><A HREF="../org/owasp/html/examples/SlashdotPolicyExample.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
 Static method in class org.owasp.html.examples.<A HREF="../org/owasp/html/examples/SlashdotPolicyExample.html" title="class in org.owasp.html.examples">SlashdotPolicyExample</A>
 <DD>&nbsp;
+<DT><A HREF="../org/owasp/html/examples/UrlTextExample.html#main(java.lang.String...)"><B>main(String...)</B></A> - 
+Static method in class org.owasp.html.examples.<A HREF="../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples">UrlTextExample</A>
+<DD>&nbsp;
 <DT><A HREF="../org/owasp/html/HtmlPolicyBuilder.AttributeBuilder.html#matching(org.owasp.html.AttributePolicy)"><B>matching(AttributePolicy)</B></A> - 
 Method in class org.owasp.html.<A HREF="../org/owasp/html/HtmlPolicyBuilder.AttributeBuilder.html" title="class in org.owasp.html">HtmlPolicyBuilder.AttributeBuilder</A>
 <DD>Filters and/or transforms the attribute values
@@ -162,7 +165,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-13.html b/distrib/javadoc/index-files/index-13.html
index 3e02400..d0d5d56 100644
--- a/distrib/javadoc/index-files/index-13.html
+++ b/distrib/javadoc/index-files/index-13.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_O_"><!-- --></A><H2>
 <B>O</B></H2>
 <DL>
@@ -160,7 +160,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-14.html b/distrib/javadoc/index-files/index-14.html
index 3add980..a91d187 100644
--- a/distrib/javadoc/index-files/index-14.html
+++ b/distrib/javadoc/index-files/index-14.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_P_"><!-- --></A><H2>
 <B>P</B></H2>
 <DL>
@@ -146,7 +146,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-15.html b/distrib/javadoc/index-files/index-15.html
index 8c2e3d8..5e3fb43 100644
--- a/distrib/javadoc/index-files/index-15.html
+++ b/distrib/javadoc/index-files/index-15.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_R_"><!-- --></A><H2>
 <B>R</B></H2>
 <DL>
@@ -90,6 +90,9 @@
 Method in class org.owasp.html.<A HREF="../org/owasp/html/HtmlPolicyBuilder.html" title="class in org.owasp.html">HtmlPolicyBuilder</A>
 <DD>Adds <a href="http://en.wikipedia.org/wiki/Nofollow"><code>rel=nofollow</code></a>
  to links.
+<DT><A HREF="../org/owasp/html/examples/UrlTextExample.html#run(java.lang.Appendable, java.lang.String...)"><B>run(Appendable, String...)</B></A> - 
+Static method in class org.owasp.html.examples.<A HREF="../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples">UrlTextExample</A>
+<DD>&nbsp;
 </DL>
 <HR>
 
@@ -143,7 +146,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-16.html b/distrib/javadoc/index-files/index-16.html
index 1978c50..deb67c8 100644
--- a/distrib/javadoc/index-files/index-16.html
+++ b/distrib/javadoc/index-files/index-16.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_S_"><!-- --></A><H2>
 <B>S</B></H2>
 <DL>
@@ -156,7 +156,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-17.html b/distrib/javadoc/index-files/index-17.html
index 4505c7c..8ab205e 100644
--- a/distrib/javadoc/index-files/index-17.html
+++ b/distrib/javadoc/index-files/index-17.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_T_"><!-- --></A><H2>
 <B>T</B></H2>
 <DL>
@@ -154,7 +154,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-18.html b/distrib/javadoc/index-files/index-18.html
index 3bd09c6..1307bda 100644
--- a/distrib/javadoc/index-files/index-18.html
+++ b/distrib/javadoc/index-files/index-18.html
@@ -76,13 +76,17 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_U_"><!-- --></A><H2>
 <B>U</B></H2>
 <DL>
 <DT><A HREF="../org/owasp/html/CssSchema.html#union(org.owasp.html.CssSchema...)"><B>union(CssSchema...)</B></A> - 
 Static method in class org.owasp.html.<A HREF="../org/owasp/html/CssSchema.html" title="class in org.owasp.html">CssSchema</A>
 <DD>A schema that represents the union of the input schemas.
+<DT><A HREF="../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples"><B>UrlTextExample</B></A> - Class in <A HREF="../org/owasp/html/examples/package-summary.html">org.owasp.html.examples</A><DD>Uses a custom event receiver to emit the domain of a link or inline image
+ after the link or image.<DT><A HREF="../org/owasp/html/examples/UrlTextExample.html#UrlTextExample()"><B>UrlTextExample()</B></A> - 
+Constructor for class org.owasp.html.examples.<A HREF="../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples">UrlTextExample</A>
+<DD>&nbsp;
 </DL>
 <HR>
 
@@ -136,7 +140,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-19.html b/distrib/javadoc/index-files/index-19.html
index c42cd14..dc69043 100644
--- a/distrib/javadoc/index-files/index-19.html
+++ b/distrib/javadoc/index-files/index-19.html
@@ -4,7 +4,7 @@
 <HEAD>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-W-Index (OWASP Java HTML Sanitizer)
+V-Index (OWASP Java HTML Sanitizer)
 </TITLE>
 
 
@@ -14,7 +14,7 @@
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="W-Index (OWASP Java HTML Sanitizer)";
+        parent.document.title="V-Index (OWASP Java HTML Sanitizer)";
     }
 }
 </SCRIPT>
@@ -54,7 +54,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="index-18.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;NEXT LETTER</FONT></TD>
+&nbsp;<A HREF="index-20.html"><B>NEXT LETTER</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../index.html?index-filesindex-19.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="index-19.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -76,13 +76,17 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_W_"><!-- --></A><H2>
-<B>W</B></H2>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
+<A NAME="_V_"><!-- --></A><H2>
+<B>V</B></H2>
 <DL>
-<DT><A HREF="../org/owasp/html/CssSchema.html#withProperties(java.lang.Iterable)"><B>withProperties(Iterable&lt;? extends String&gt;)</B></A> - 
-Static method in class org.owasp.html.<A HREF="../org/owasp/html/CssSchema.html" title="class in org.owasp.html">CssSchema</A>
-<DD>A schema that includes all and only the named properties.
+<DT><A HREF="../org/owasp/html/HtmlTextEscapingMode.html#valueOf(java.lang.String)"><B>valueOf(String)</B></A> - 
+Static method in enum org.owasp.html.<A HREF="../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>
+<DD>Returns the enum constant of this type with the specified name.
+<DT><A HREF="../org/owasp/html/HtmlTextEscapingMode.html#values()"><B>values()</B></A> - 
+Static method in enum org.owasp.html.<A HREF="../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>
+<DD>Returns an array containing the constants of this enum type, in
+the order they are declared.
 </DL>
 <HR>
 
@@ -114,7 +118,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="index-18.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;NEXT LETTER</FONT></TD>
+&nbsp;<A HREF="index-20.html"><B>NEXT LETTER</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../index.html?index-filesindex-19.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="index-19.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -136,7 +140,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-2.html b/distrib/javadoc/index-files/index-2.html
index 547df31..b2e8e7b 100644
--- a/distrib/javadoc/index-files/index-2.html
+++ b/distrib/javadoc/index-files/index-2.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_B_"><!-- --></A><H2>
 <B>B</B></H2>
 <DL>
@@ -143,7 +143,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-20.html b/distrib/javadoc/index-files/index-20.html
new file mode 100644
index 0000000..56a7e94
--- /dev/null
+++ b/distrib/javadoc/index-files/index-20.html
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>
+W-Index (OWASP Java HTML Sanitizer)
+</TITLE>
+
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="W-Index (OWASP Java HTML Sanitizer)";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="index-19.html"><B>PREV LETTER</B></A>&nbsp;
+&nbsp;NEXT LETTER</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../index.html?index-filesindex-20.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="index-20.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
+<A NAME="_W_"><!-- --></A><H2>
+<B>W</B></H2>
+<DL>
+<DT><A HREF="../org/owasp/html/CssSchema.html#withProperties(java.lang.Iterable)"><B>withProperties(Iterable&lt;? extends String&gt;)</B></A> - 
+Static method in class org.owasp.html.<A HREF="../org/owasp/html/CssSchema.html" title="class in org.owasp.html">CssSchema</A>
+<DD>A schema that includes all and only the named properties.
+</DL>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="index-19.html"><B>PREV LETTER</B></A>&nbsp;
+&nbsp;NEXT LETTER</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../index.html?index-filesindex-20.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="index-20.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
+
+</BODY>
+</HTML>
diff --git a/distrib/javadoc/index-files/index-3.html b/distrib/javadoc/index-files/index-3.html
index 29e24cf..512e5f2 100644
--- a/distrib/javadoc/index-files/index-3.html
+++ b/distrib/javadoc/index-files/index-3.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_C_"><!-- --></A><H2>
 <B>C</B></H2>
 <DL>
@@ -160,7 +160,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-4.html b/distrib/javadoc/index-files/index-4.html
index 0866250..97badd3 100644
--- a/distrib/javadoc/index-files/index-4.html
+++ b/distrib/javadoc/index-files/index-4.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_D_"><!-- --></A><H2>
 <B>D</B></H2>
 <DL>
@@ -165,7 +165,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-5.html b/distrib/javadoc/index-files/index-5.html
index f04cf43..3654e91 100644
--- a/distrib/javadoc/index-files/index-5.html
+++ b/distrib/javadoc/index-files/index-5.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_E_"><!-- --></A><H2>
 <B>E</B></H2>
 <DL>
@@ -138,7 +138,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-6.html b/distrib/javadoc/index-files/index-6.html
index 9a2ddb9..a66cc81 100644
--- a/distrib/javadoc/index-files/index-6.html
+++ b/distrib/javadoc/index-files/index-6.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_F_"><!-- --></A><H2>
 <B>F</B></H2>
 <DL>
@@ -140,7 +140,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-7.html b/distrib/javadoc/index-files/index-7.html
index 92ccf76..b9f0a58 100644
--- a/distrib/javadoc/index-files/index-7.html
+++ b/distrib/javadoc/index-files/index-7.html
@@ -76,10 +76,13 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_G_"><!-- --></A><H2>
 <B>G</B></H2>
 <DL>
+<DT><A HREF="../org/owasp/html/HtmlTextEscapingMode.html#getModeForTag(java.lang.String)"><B>getModeForTag(String)</B></A> - 
+Static method in enum org.owasp.html.<A HREF="../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>
+<DD>The mode used for content following a start tag with the given name.
 <DT><A HREF="../org/owasp/html/HtmlChangeReporter.html#getWrappedPolicy()"><B>getWrappedPolicy()</B></A> - 
 Method in class org.owasp.html.<A HREF="../org/owasp/html/HtmlChangeReporter.html" title="class in org.owasp.html">HtmlChangeReporter</A>
 <DD>&nbsp;
@@ -143,7 +146,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-8.html b/distrib/javadoc/index-files/index-8.html
index aeb7ff1..efadd94 100644
--- a/distrib/javadoc/index-files/index-8.html
+++ b/distrib/javadoc/index-files/index-8.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_H_"><!-- --></A><H2>
 <B>H</B></H2>
 <DL>
@@ -96,7 +96,7 @@
 Constructor for class org.owasp.html.<A HREF="../org/owasp/html/HtmlSanitizer.html" title="class in org.owasp.html">HtmlSanitizer</A>
 <DD>&nbsp;
 <DT><A HREF="../org/owasp/html/HtmlSanitizer.Policy.html" title="interface in org.owasp.html"><B>HtmlSanitizer.Policy</B></A> - Interface in <A HREF="../org/owasp/html/package-summary.html">org.owasp.html</A><DD>Receives events based on the HTML stream, and applies a policy to decide
- what HTML constructs to allow.<DT><A HREF="../org/owasp/html/HtmlStreamEventReceiver.html" title="interface in org.owasp.html"><B>HtmlStreamEventReceiver</B></A> - Interface in <A HREF="../org/owasp/html/package-summary.html">org.owasp.html</A><DD>A light-weight SAX-like listener for HTML.<DT><A HREF="../org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html"><B>HtmlStreamRenderer</B></A> - Class in <A HREF="../org/owasp/html/package-summary.html">org.owasp.html</A><DD>Given a series of HTML tokens, writes valid, normalized HTML to the output.</DL>
+ what HTML constructs to allow.<DT><A HREF="../org/owasp/html/HtmlStreamEventReceiver.html" title="interface in org.owasp.html"><B>HtmlStreamEventReceiver</B></A> - Interface in <A HREF="../org/owasp/html/package-summary.html">org.owasp.html</A><DD>A light-weight SAX-like listener for HTML.<DT><A HREF="../org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html"><B>HtmlStreamRenderer</B></A> - Class in <A HREF="../org/owasp/html/package-summary.html">org.owasp.html</A><DD>Given a series of HTML tokens, writes valid, normalized HTML to the output.<DT><A HREF="../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><B>HtmlTextEscapingMode</B></A> - Enum in <A HREF="../org/owasp/html/package-summary.html">org.owasp.html</A><DD>From section 8.1.2.6 of http://www.whatwg.org/specs/web-apps/current-work/</DL>
 <HR>
 
 
@@ -149,7 +149,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/index-files/index-9.html b/distrib/javadoc/index-files/index-9.html
index 0567978..da0bf0b 100644
--- a/distrib/javadoc/index-files/index-9.html
+++ b/distrib/javadoc/index-files/index-9.html
@@ -76,7 +76,7 @@
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 <A NAME="_I_"><!-- --></A><H2>
 <B>I</B></H2>
 <DL>
@@ -92,6 +92,15 @@
 <DT><A HREF="../org/owasp/html/HtmlStreamRenderer.html#isDocumentOpen()"><B>isDocumentOpen()</B></A> - 
 Method in class org.owasp.html.<A HREF="../org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html">HtmlStreamRenderer</A>
 <DD>&nbsp;
+<DT><A HREF="../org/owasp/html/HtmlTextEscapingMode.html#isTagFollowedByLiteralContent(java.lang.String)"><B>isTagFollowedByLiteralContent(String)</B></A> - 
+Static method in enum org.owasp.html.<A HREF="../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>
+<DD>True if content immediately following the start tag must be treated as
+ special CDATA so that &lt;'s are not treated as starting tags, comments
+ or directives.
+<DT><A HREF="../org/owasp/html/HtmlTextEscapingMode.html#isVoidElement(java.lang.String)"><B>isVoidElement(String)</B></A> - 
+Static method in enum org.owasp.html.<A HREF="../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>
+<DD>True iff the tag cannot contain any content -- will an HTML parser consider
+ the element to have ended immediately after the start tag.
 </DL>
 <HR>
 
@@ -145,7 +154,7 @@
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">W</A> <HR>
+<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">H</A> <A HREF="index-9.html">I</A> <A HREF="index-10.html">J</A> <A HREF="index-11.html">L</A> <A HREF="index-12.html">M</A> <A HREF="index-13.html">O</A> <A HREF="index-14.html">P</A> <A HREF="index-15.html">R</A> <A HREF="index-16.html">S</A> <A HREF="index-17.html">T</A> <A HREF="index-18.html">U</A> <A HREF="index-19.html">V</A> <A HREF="index-20.html">W</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/distrib/javadoc/org/owasp/html/FilterUrlByProtocolAttributePolicy.html b/distrib/javadoc/org/owasp/html/FilterUrlByProtocolAttributePolicy.html
index 4929088..68f84e8 100644
--- a/distrib/javadoc/org/owasp/html/FilterUrlByProtocolAttributePolicy.html
+++ b/distrib/javadoc/org/owasp/html/FilterUrlByProtocolAttributePolicy.html
@@ -273,7 +273,7 @@
 <A NAME="allowProtocolRelativeUrls()"><!-- --></A><H3>
 allowProtocolRelativeUrls</H3>
 <PRE>
-protected boolean <A HREF="../../../src-html/org/owasp/html/FilterUrlByProtocolAttributePolicy.html#line.87"><B>allowProtocolRelativeUrls</B></A>()</PRE>
+protected boolean <A HREF="../../../src-html/org/owasp/html/FilterUrlByProtocolAttributePolicy.html#line.88"><B>allowProtocolRelativeUrls</B></A>()</PRE>
 <DL>
 <DD><DL>
 </DL>
diff --git a/distrib/javadoc/org/owasp/html/HtmlStreamRenderer.html b/distrib/javadoc/org/owasp/html/HtmlStreamRenderer.html
index 46b469a..d6bf951 100644
--- a/distrib/javadoc/org/owasp/html/HtmlStreamRenderer.html
+++ b/distrib/javadoc/org/owasp/html/HtmlStreamRenderer.html
@@ -54,7 +54,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../org/owasp/html/HtmlStreamEventReceiver.html" title="interface in org.owasp.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../org/owasp/html/PolicyFactory.html" title="class in org.owasp.html"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?org/owasp/html/HtmlStreamRenderer.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="HtmlStreamRenderer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -378,7 +378,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../org/owasp/html/HtmlStreamEventReceiver.html" title="interface in org.owasp.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../org/owasp/html/PolicyFactory.html" title="class in org.owasp.html"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?org/owasp/html/HtmlStreamRenderer.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="HtmlStreamRenderer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/distrib/javadoc/org/owasp/html/HtmlTextEscapingMode.html b/distrib/javadoc/org/owasp/html/HtmlTextEscapingMode.html
new file mode 100644
index 0000000..03a4c2d
--- /dev/null
+++ b/distrib/javadoc/org/owasp/html/HtmlTextEscapingMode.html
@@ -0,0 +1,519 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>
+HtmlTextEscapingMode (OWASP Java HTML Sanitizer)
+</TITLE>
+
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="HtmlTextEscapingMode (OWASP Java HTML Sanitizer)";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/HtmlTextEscapingMode.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/owasp/html/PolicyFactory.html" title="class in org.owasp.html"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/owasp/html/HtmlTextEscapingMode.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="HtmlTextEscapingMode.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#enum_constant_summary">ENUM CONSTANTS</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#enum_constant_detail">ENUM CONSTANTS</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.owasp.html</FONT>
+<BR>
+Enum HtmlTextEscapingMode</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../resources/inherit.gif" ALT="extended by ">java.lang.Enum&lt;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>&gt;
+      <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>org.owasp.html.HtmlTextEscapingMode</B>
+</PRE>
+<DL>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable, java.lang.Comparable&lt;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>&gt;</DD>
+</DL>
+<HR>
+<DL>
+<DT><PRE>public enum <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.54"><B>HtmlTextEscapingMode</B></A><DT>extends java.lang.Enum&lt;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>&gt;</DL>
+</PRE>
+
+<P>
+From section 8.1.2.6 of http://www.whatwg.org/specs/web-apps/current-work/
+ <p>
+ The text in CDATA and RCDATA elements must not contain any
+ occurrences of the string "</" (U+003C LESS-THAN SIGN, U+002F
+ SOLIDUS) followed by characters that case-insensitively match the
+ tag name of the element followed by one of U+0009 CHARACTER
+ TABULATION, U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C
+ FORM FEED (FF), U+0020 SPACE, U+003E GREATER-THAN SIGN (>), or
+ U+002F SOLIDUS (/), unless that string is part of an escaping
+ text span.
+ </p>
+
+ <p>
+ See also
+ http://www.whatwg.org/specs/web-apps/current-work/#cdata-rcdata-restrictions
+ for the elements which fall in each category.
+ </p>
+<P>
+
+<P>
+<DL>
+<DT><B>Author:</B></DT>
+  <DD>Mike Samuel <mikesamuel@gmail.com></DD>
+</DL>
+<HR>
+
+<P>
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+
+<A NAME="enum_constant_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Enum Constant Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#CDATA">CDATA</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A span of text where HTML special characters are interpreted literally,
+ as in a SCRIPT tag.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#CDATA_SOMETIMES">CDATA_SOMETIMES</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Like <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#CDATA"><CODE>CDATA</CODE></A> but only for certain browsers.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#PCDATA">PCDATA</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Normally escaped character data that breaks around comments and tags.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#PLAIN_TEXT">PLAIN_TEXT</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A span of text where HTML special characters are interpreted literally,
+ where there is no end tag.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#RCDATA">RCDATA</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A span of text and character entity references where HTML special
+ characters are interpreted literally, as in a TITLE tag.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#VOID">VOID</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Cannot contain data.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#allowsEscapingTextSpan(java.lang.String)">allowsEscapingTextSpan</A></B>(java.lang.String&nbsp;canonTagName)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;True iff the content following the given tag allows escaping text
+ spans: <code>&lt;!--&amp;hellip;--&gt;</code> that escape even things that might
+ be an end tag for the corresponding open tag.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#getModeForTag(java.lang.String)">getModeForTag</A></B>(java.lang.String&nbsp;canonTagName)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The mode used for content following a start tag with the given name.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#isTagFollowedByLiteralContent(java.lang.String)">isTagFollowedByLiteralContent</A></B>(java.lang.String&nbsp;canonTagName)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;True if content immediately following the start tag must be treated as
+ special CDATA so that &lt;'s are not treated as starting tags, comments
+ or directives.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#isVoidElement(java.lang.String)">isVoidElement</A></B>(java.lang.String&nbsp;canonTagName)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;True iff the tag cannot contain any content -- will an HTML parser consider
+ the element to have ended immediately after the start tag.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String&nbsp;name)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the enum constant of this type with the specified name.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#values()">values</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns an array containing the constants of this enum type, in
+the order they are declared.</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Enum"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Enum</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>getClass, notify, notifyAll, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+
+<A NAME="enum_constant_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Enum Constant Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="PCDATA"><!-- --></A><H3>
+PCDATA</H3>
+<PRE>
+public static final <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.58"><B>PCDATA</B></A></PRE>
+<DL>
+<DD>Normally escaped character data that breaks around comments and tags.
+<P>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="CDATA"><!-- --></A><H3>
+CDATA</H3>
+<PRE>
+public static final <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.63"><B>CDATA</B></A></PRE>
+<DL>
+<DD>A span of text where HTML special characters are interpreted literally,
+ as in a SCRIPT tag.
+<P>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="CDATA_SOMETIMES"><!-- --></A><H3>
+CDATA_SOMETIMES</H3>
+<PRE>
+public static final <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.67"><B>CDATA_SOMETIMES</B></A></PRE>
+<DL>
+<DD>Like <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html#CDATA"><CODE>CDATA</CODE></A> but only for certain browsers.
+<P>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="RCDATA"><!-- --></A><H3>
+RCDATA</H3>
+<PRE>
+public static final <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.72"><B>RCDATA</B></A></PRE>
+<DL>
+<DD>A span of text and character entity references where HTML special
+ characters are interpreted literally, as in a TITLE tag.
+<P>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="PLAIN_TEXT"><!-- --></A><H3>
+PLAIN_TEXT</H3>
+<PRE>
+public static final <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.77"><B>PLAIN_TEXT</B></A></PRE>
+<DL>
+<DD>A span of text where HTML special characters are interpreted literally,
+ where there is no end tag.  PLAIN_TEXT runs until the end of the file.
+<P>
+<DL>
+</DL>
+</DL>
+<HR>
+
+<A NAME="VOID"><!-- --></A><H3>
+VOID</H3>
+<PRE>
+public static final <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.82"><B>VOID</B></A></PRE>
+<DL>
+<DD>Cannot contain data.
+<P>
+<DL>
+</DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="values()"><!-- --></A><H3>
+values</H3>
+<PRE>
+public static <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>[] <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.34"><B>values</B></A>()</PRE>
+<DL>
+<DD>Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (HtmlTextEscapingMode c : HtmlTextEscapingMode.values())
+&nbsp;   System.out.println(c);
+</pre>
+<P>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>an array containing the constants of this enum type, in
+the order they are declared</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="valueOf(java.lang.String)"><!-- --></A><H3>
+valueOf</H3>
+<PRE>
+public static <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.34"><B>valueOf</B></A>(java.lang.String&nbsp;name)</PRE>
+<DL>
+<DD>Returns the enum constant of this type with the specified name.
+The string must match <I>exactly</I> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)
+<P>
+<DD><DL>
+<DT><B>Parameters:</B><DD><CODE>name</CODE> - the name of the enum constant to be returned.
+<DT><B>Returns:</B><DD>the enum constant with the specified name
+<DT><B>Throws:</B>
+<DD><CODE>java.lang.IllegalArgumentException</CODE> - if this enum type has no constant
+with the specified name
+<DD><CODE>java.lang.NullPointerException</CODE> - if the argument is null</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getModeForTag(java.lang.String)"><!-- --></A><H3>
+getModeForTag</H3>
+<PRE>
+public static <A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.137"><B>getModeForTag</B></A>(java.lang.String&nbsp;canonTagName)</PRE>
+<DL>
+<DD>The mode used for content following a start tag with the given name.
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="allowsEscapingTextSpan(java.lang.String)"><!-- --></A><H3>
+allowsEscapingTextSpan</H3>
+<PRE>
+public static boolean <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.147"><B>allowsEscapingTextSpan</B></A>(java.lang.String&nbsp;canonTagName)</PRE>
+<DL>
+<DD>True iff the content following the given tag allows escaping text
+ spans: <code>&lt;!--&amp;hellip;--&gt;</code> that escape even things that might
+ be an end tag for the corresponding open tag.
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="isTagFollowedByLiteralContent(java.lang.String)"><!-- --></A><H3>
+isTagFollowedByLiteralContent</H3>
+<PRE>
+public static boolean <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.159"><B>isTagFollowedByLiteralContent</B></A>(java.lang.String&nbsp;canonTagName)</PRE>
+<DL>
+<DD>True if content immediately following the start tag must be treated as
+ special CDATA so that &lt;'s are not treated as starting tags, comments
+ or directives.
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="isVoidElement(java.lang.String)"><!-- --></A><H3>
+isVoidElement</H3>
+<PRE>
+public static boolean <A HREF="../../../src-html/org/owasp/html/HtmlTextEscapingMode.html#line.168"><B>isVoidElement</B></A>(java.lang.String&nbsp;canonTagName)</PRE>
+<DL>
+<DD>True iff the tag cannot contain any content -- will an HTML parser consider
+ the element to have ended immediately after the start tag.
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/HtmlTextEscapingMode.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/owasp/html/PolicyFactory.html" title="class in org.owasp.html"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../index.html?org/owasp/html/HtmlTextEscapingMode.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="HtmlTextEscapingMode.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#enum_constant_summary">ENUM CONSTANTS</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#enum_constant_detail">ENUM CONSTANTS</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/distrib/javadoc/org/owasp/html/PolicyFactory.html b/distrib/javadoc/org/owasp/html/PolicyFactory.html
index ef183b5..5373489 100644
--- a/distrib/javadoc/org/owasp/html/PolicyFactory.html
+++ b/distrib/javadoc/org/owasp/html/PolicyFactory.html
@@ -53,7 +53,7 @@
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../org/owasp/html/Sanitizers.html" title="class in org.owasp.html"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?org/owasp/html/PolicyFactory.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -353,7 +353,7 @@
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../org/owasp/html/Sanitizers.html" title="class in org.owasp.html"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?org/owasp/html/PolicyFactory.html" target="_top"><B>FRAMES</B></A>  &nbsp;
diff --git a/distrib/javadoc/org/owasp/html/class-use/HtmlTextEscapingMode.html b/distrib/javadoc/org/owasp/html/class-use/HtmlTextEscapingMode.html
new file mode 100644
index 0000000..8ba0d43
--- /dev/null
+++ b/distrib/javadoc/org/owasp/html/class-use/HtmlTextEscapingMode.html
@@ -0,0 +1,196 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>
+Uses of Class org.owasp.html.HtmlTextEscapingMode (OWASP Java HTML Sanitizer)
+</TITLE>
+
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.owasp.html.HtmlTextEscapingMode (OWASP Java HTML Sanitizer)";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/owasp/html//class-useHtmlTextEscapingMode.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="HtmlTextEscapingMode.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.owasp.html.HtmlTextEscapingMode</B></H2>
+</CENTER>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Packages that use <A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#org.owasp.html"><B>org.owasp.html</B></A></TD>
+<TD>An efficient <A HREF="../../../../org/owasp/html/HtmlSanitizer.html" title="class in org.owasp.html"><CODE>HtmlSanitizer</CODE></A>
+ configurable via a flexible
+ <A HREF="../../../../org/owasp/html/HtmlPolicyBuilder.html" title="class in org.owasp.html"><CODE>HtmlPolicyBuilder</CODE></A>.&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="org.owasp.html"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A> in <A HREF="../../../../org/owasp/html/package-summary.html">org.owasp.html</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">Methods in <A HREF="../../../../org/owasp/html/package-summary.html">org.owasp.html</A> that return <A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A></CODE></FONT></TD>
+<TD><CODE><B>HtmlTextEscapingMode.</B><B><A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html#getModeForTag(java.lang.String)">getModeForTag</A></B>(java.lang.String&nbsp;canonTagName)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The mode used for content following a start tag with the given name.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A></CODE></FONT></TD>
+<TD><CODE><B>HtmlTextEscapingMode.</B><B><A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html#valueOf(java.lang.String)">valueOf</A></B>(java.lang.String&nbsp;name)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the enum constant of this type with the specified name.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A>[]</CODE></FONT></TD>
+<TD><CODE><B>HtmlTextEscapingMode.</B><B><A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html#values()">values</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns an array containing the constants of this enum type, in
+the order they are declared.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/owasp/html//class-useHtmlTextEscapingMode.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="HtmlTextEscapingMode.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/distrib/javadoc/org/owasp/html/examples/SlashdotPolicyExample.html b/distrib/javadoc/org/owasp/html/examples/SlashdotPolicyExample.html
index 3b2c950..0d85123 100644
--- a/distrib/javadoc/org/owasp/html/examples/SlashdotPolicyExample.html
+++ b/distrib/javadoc/org/owasp/html/examples/SlashdotPolicyExample.html
@@ -54,7 +54,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../org/owasp/html/examples/EbayPolicyExample.html" title="class in org.owasp.html.examples"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
+&nbsp;<A HREF="../../../../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?org/owasp/html/examples/SlashdotPolicyExample.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="SlashdotPolicyExample.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -275,7 +275,7 @@
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../org/owasp/html/examples/EbayPolicyExample.html" title="class in org.owasp.html.examples"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
+&nbsp;<A HREF="../../../../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?org/owasp/html/examples/SlashdotPolicyExample.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="SlashdotPolicyExample.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/distrib/javadoc/org/owasp/html/examples/UrlTextExample.html b/distrib/javadoc/org/owasp/html/examples/UrlTextExample.html
new file mode 100644
index 0000000..c96506e
--- /dev/null
+++ b/distrib/javadoc/org/owasp/html/examples/UrlTextExample.html
@@ -0,0 +1,281 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>
+UrlTextExample (OWASP Java HTML Sanitizer)
+</TITLE>
+
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="UrlTextExample (OWASP Java HTML Sanitizer)";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/UrlTextExample.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../../org/owasp/html/examples/SlashdotPolicyExample.html" title="class in org.owasp.html.examples"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;NEXT CLASS</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/owasp/html/examples/UrlTextExample.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="UrlTextExample.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.owasp.html.examples</FONT>
+<BR>
+Class UrlTextExample</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>org.owasp.html.examples.UrlTextExample</B>
+</PRE>
+<HR>
+<DL>
+<DT><PRE>public class <A HREF="../../../../src-html/org/owasp/html/examples/UrlTextExample.html#line.48"><B>UrlTextExample</B></A><DT>extends java.lang.Object</DL>
+</PRE>
+
+<P>
+Uses a custom event receiver to emit the domain of a link or inline image
+ after the link or image.
+<P>
+
+<P>
+<HR>
+
+<P>
+
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../org/owasp/html/examples/UrlTextExample.html#UrlTextExample()">UrlTextExample</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../org/owasp/html/examples/UrlTextExample.html#main(java.lang.String...)">main</A></B>(java.lang.String...&nbsp;argv)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../org/owasp/html/examples/UrlTextExample.html#run(java.lang.Appendable, java.lang.String...)">run</A></B>(java.lang.Appendable&nbsp;out,
+       java.lang.String...&nbsp;argv)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="UrlTextExample()"><!-- --></A><H3>
+UrlTextExample</H3>
+<PRE>
+public <A HREF="../../../../src-html/org/owasp/html/examples/UrlTextExample.html#line.48"><B>UrlTextExample</B></A>()</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="run(java.lang.Appendable, java.lang.String...)"><!-- --></A><H3>
+run</H3>
+<PRE>
+public static void <A HREF="../../../../src-html/org/owasp/html/examples/UrlTextExample.html#line.120"><B>run</B></A>(java.lang.Appendable&nbsp;out,
+                       java.lang.String...&nbsp;argv)
+                throws java.io.IOException</PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE>java.io.IOException</CODE></DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="main(java.lang.String...)"><!-- --></A><H3>
+main</H3>
+<PRE>
+public static void <A HREF="../../../../src-html/org/owasp/html/examples/UrlTextExample.html#line.155"><B>main</B></A>(java.lang.String...&nbsp;argv)
+                 throws java.io.IOException</PRE>
+<DL>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE>java.io.IOException</CODE></DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/UrlTextExample.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../../org/owasp/html/examples/SlashdotPolicyExample.html" title="class in org.owasp.html.examples"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;NEXT CLASS</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?org/owasp/html/examples/UrlTextExample.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="UrlTextExample.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/distrib/javadoc/org/owasp/html/examples/class-use/UrlTextExample.html b/distrib/javadoc/org/owasp/html/examples/class-use/UrlTextExample.html
new file mode 100644
index 0000000..139cfba
--- /dev/null
+++ b/distrib/javadoc/org/owasp/html/examples/class-use/UrlTextExample.html
@@ -0,0 +1,141 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>
+Uses of Class org.owasp.html.examples.UrlTextExample (OWASP Java HTML Sanitizer)
+</TITLE>
+
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Uses of Class org.owasp.html.examples.UrlTextExample (OWASP Java HTML Sanitizer)";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../../index.html?org/owasp/html/examples//class-useUrlTextExample.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="UrlTextExample.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.owasp.html.examples.UrlTextExample</B></H2>
+</CENTER>
+No usage of org.owasp.html.examples.UrlTextExample
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<a href="http://code.google.com/p/owasp-java-html-sanitizer" target=_top>code.google.com home</a></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../../index.html?org/owasp/html/examples//class-useUrlTextExample.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="UrlTextExample.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/distrib/javadoc/org/owasp/html/examples/package-frame.html b/distrib/javadoc/org/owasp/html/examples/package-frame.html
index 92daad4..882829f 100644
--- a/distrib/javadoc/org/owasp/html/examples/package-frame.html
+++ b/distrib/javadoc/org/owasp/html/examples/package-frame.html
@@ -24,7 +24,9 @@
 <BR>
 <A HREF="EbayPolicyExample.html" title="class in org.owasp.html.examples" target="classFrame">EbayPolicyExample</A>
 <BR>
-<A HREF="SlashdotPolicyExample.html" title="class in org.owasp.html.examples" target="classFrame">SlashdotPolicyExample</A></FONT></TD>
+<A HREF="SlashdotPolicyExample.html" title="class in org.owasp.html.examples" target="classFrame">SlashdotPolicyExample</A>
+<BR>
+<A HREF="UrlTextExample.html" title="class in org.owasp.html.examples" target="classFrame">UrlTextExample</A></FONT></TD>
 </TR>
 </TABLE>
 
diff --git a/distrib/javadoc/org/owasp/html/examples/package-summary.html b/distrib/javadoc/org/owasp/html/examples/package-summary.html
index 415bb89..4558c1a 100644
--- a/distrib/javadoc/org/owasp/html/examples/package-summary.html
+++ b/distrib/javadoc/org/owasp/html/examples/package-summary.html
@@ -96,6 +96,11 @@
 <TD>Based on the
  <a href="http://www.owasp.org/index.php/Category:OWASP_AntiSamy_Project#Stage_2_-_Choosing_a_base_policy_file">AntiSamy Slashdot example</a>.</TD>
 </TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples">UrlTextExample</A></B></TD>
+<TD>Uses a custom event receiver to emit the domain of a link or inline image
+ after the link or image.</TD>
+</TR>
 </TABLE>
 &nbsp;
 
diff --git a/distrib/javadoc/org/owasp/html/examples/package-tree.html b/distrib/javadoc/org/owasp/html/examples/package-tree.html
index fc3efef..e63d37c 100644
--- a/distrib/javadoc/org/owasp/html/examples/package-tree.html
+++ b/distrib/javadoc/org/owasp/html/examples/package-tree.html
@@ -90,7 +90,7 @@
 </H2>
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">org.owasp.html.examples.<A HREF="../../../../org/owasp/html/examples/EbayPolicyExample.html" title="class in org.owasp.html.examples"><B>EbayPolicyExample</B></A><LI TYPE="circle">org.owasp.html.examples.<A HREF="../../../../org/owasp/html/examples/SlashdotPolicyExample.html" title="class in org.owasp.html.examples"><B>SlashdotPolicyExample</B></A></UL>
+<LI TYPE="circle">org.owasp.html.examples.<A HREF="../../../../org/owasp/html/examples/EbayPolicyExample.html" title="class in org.owasp.html.examples"><B>EbayPolicyExample</B></A><LI TYPE="circle">org.owasp.html.examples.<A HREF="../../../../org/owasp/html/examples/SlashdotPolicyExample.html" title="class in org.owasp.html.examples"><B>SlashdotPolicyExample</B></A><LI TYPE="circle">org.owasp.html.examples.<A HREF="../../../../org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples"><B>UrlTextExample</B></A></UL>
 </UL>
 <HR>
 
diff --git a/distrib/javadoc/org/owasp/html/package-frame.html b/distrib/javadoc/org/owasp/html/package-frame.html
index 5dc14ea..ae2af78 100644
--- a/distrib/javadoc/org/owasp/html/package-frame.html
+++ b/distrib/javadoc/org/owasp/html/package-frame.html
@@ -71,6 +71,17 @@
 <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
 <TR>
 <TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Enums</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="HtmlTextEscapingMode.html" title="enum in org.owasp.html" target="classFrame">HtmlTextEscapingMode</A></FONT></TD>
+</TR>
+</TABLE>
+
+
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
 Annotation Types</FONT>&nbsp;
 <FONT CLASS="FrameItemFont">
 <BR>
diff --git a/distrib/javadoc/org/owasp/html/package-summary.html b/distrib/javadoc/org/owasp/html/package-summary.html
index a6ab74f..47bf0cb 100644
--- a/distrib/javadoc/org/owasp/html/package-summary.html
+++ b/distrib/javadoc/org/owasp/html/package-summary.html
@@ -190,6 +190,20 @@
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Enum Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html">HtmlTextEscapingMode</A></B></TD>
+<TD>From section 8.1.2.6 of http://www.whatwg.org/specs/web-apps/current-work/</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
 <B>Annotation Types Summary</B></FONT></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
diff --git a/distrib/javadoc/org/owasp/html/package-tree.html b/distrib/javadoc/org/owasp/html/package-tree.html
index 02d0804..01845fa 100644
--- a/distrib/javadoc/org/owasp/html/package-tree.html
+++ b/distrib/javadoc/org/owasp/html/package-tree.html
@@ -109,6 +109,16 @@
 <UL>
 <LI TYPE="circle">org.owasp.html.<A HREF="../../../org/owasp/html/TCB.html" title="annotation in org.owasp.html"><B>TCB</B></A> (implements java.lang.annotation.Annotation)
 </UL>
+<H2>
+Enum Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">java.lang.Object<UL>
+<LI TYPE="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
+<UL>
+<LI TYPE="circle">org.owasp.html.<A HREF="../../../org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><B>HtmlTextEscapingMode</B></A></UL>
+</UL>
+</UL>
 <HR>
 
 
diff --git a/distrib/javadoc/org/owasp/html/package-use.html b/distrib/javadoc/org/owasp/html/package-use.html
index 62d4a36..f7050e9 100644
--- a/distrib/javadoc/org/owasp/html/package-use.html
+++ b/distrib/javadoc/org/owasp/html/package-use.html
@@ -171,6 +171,12 @@
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Given a series of HTML tokens, writes valid, normalized HTML to the output.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../org/owasp/html/class-use/HtmlTextEscapingMode.html#org.owasp.html"><B>HtmlTextEscapingMode</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;From section 8.1.2.6 of http://www.whatwg.org/specs/web-apps/current-work/</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><B><A HREF="../../../org/owasp/html/class-use/PolicyFactory.html#org.owasp.html"><B>PolicyFactory</B></A></B>
 
 <BR>
diff --git a/distrib/javadoc/overview-tree.html b/distrib/javadoc/overview-tree.html
index 2e92702..a31be0c 100644
--- a/distrib/javadoc/overview-tree.html
+++ b/distrib/javadoc/overview-tree.html
@@ -93,7 +93,7 @@
 <LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/HtmlChangeReporter.html" title="class in org.owasp.html"><B>HtmlChangeReporter</B></A>&lt;T&gt;<LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/HtmlPolicyBuilder.html" title="class in org.owasp.html"><B>HtmlPolicyBuilder</B></A><LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/HtmlPolicyBuilder.AttributeBuilder.html" title="class in org.owasp.html"><B>HtmlPolicyBuilder.AttributeBuilder</B></A><LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/HtmlSanitizer.html" title="class in org.owasp.html"><B>HtmlSanitizer</B></A><LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/HtmlStreamRenderer.html" title="class in org.owasp.html"><B>HtmlStreamRenderer</B></A> (implements org.owasp.html.<A HREF="org/owasp/html/HtmlStreamEventReceiver.html" title="interface in org.owasp.html">HtmlStreamEventReceiver</A>)
 <LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/PolicyFactory.html" title="class in org.owasp.html"><B>PolicyFactory</B></A> (implements com.google.common.base.Function&lt;F,T&gt;)
 <LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/Sanitizers.html" title="class in org.owasp.html"><B>Sanitizers</B></A><LI TYPE="circle">org.owasp.html.examples.<A HREF="org/owasp/html/examples/SlashdotPolicyExample.html" title="class in org.owasp.html.examples"><B>SlashdotPolicyExample</B></A><LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/TagBalancingHtmlStreamEventReceiver.html" title="class in org.owasp.html"><B>TagBalancingHtmlStreamEventReceiver</B></A> (implements org.owasp.html.<A HREF="org/owasp/html/HtmlStreamEventReceiver.html" title="interface in org.owasp.html">HtmlStreamEventReceiver</A>)
-</UL>
+<LI TYPE="circle">org.owasp.html.examples.<A HREF="org/owasp/html/examples/UrlTextExample.html" title="class in org.owasp.html.examples"><B>UrlTextExample</B></A></UL>
 </UL>
 <H2>
 Interface Hierarchy
@@ -108,6 +108,16 @@
 <UL>
 <LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/TCB.html" title="annotation in org.owasp.html"><B>TCB</B></A> (implements java.lang.annotation.Annotation)
 </UL>
+<H2>
+Enum Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">java.lang.Object<UL>
+<LI TYPE="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
+<UL>
+<LI TYPE="circle">org.owasp.html.<A HREF="org/owasp/html/HtmlTextEscapingMode.html" title="enum in org.owasp.html"><B>HtmlTextEscapingMode</B></A></UL>
+</UL>
+</UL>
 <HR>
 
 
diff --git a/distrib/javadoc/src-html/org/owasp/html/FilterUrlByProtocolAttributePolicy.html b/distrib/javadoc/src-html/org/owasp/html/FilterUrlByProtocolAttributePolicy.html
index 9a84190..ef6ce1e 100644
--- a/distrib/javadoc/src-html/org/owasp/html/FilterUrlByProtocolAttributePolicy.html
+++ b/distrib/javadoc/src-html/org/owasp/html/FilterUrlByProtocolAttributePolicy.html
@@ -80,77 +80,78 @@
 <FONT color="green">077</FONT>              }<a name="line.77"></a>
 <FONT color="green">078</FONT>              break protocol_loop;<a name="line.78"></a>
 <FONT color="green">079</FONT>            case ':':<a name="line.79"></a>
-<FONT color="green">080</FONT>              if (!protocols.contains(s.substring(0, i))) { return null; }<a name="line.80"></a>
-<FONT color="green">081</FONT>              break protocol_loop;<a name="line.81"></a>
-<FONT color="green">082</FONT>          }<a name="line.82"></a>
-<FONT color="green">083</FONT>        }<a name="line.83"></a>
-<FONT color="green">084</FONT>        return normalizeUri(s);<a name="line.84"></a>
-<FONT color="green">085</FONT>      }<a name="line.85"></a>
-<FONT color="green">086</FONT>    <a name="line.86"></a>
-<FONT color="green">087</FONT>      protected boolean allowProtocolRelativeUrls() {<a name="line.87"></a>
-<FONT color="green">088</FONT>        return protocols.contains("http") &amp;&amp; protocols.contains("https");<a name="line.88"></a>
-<FONT color="green">089</FONT>      }<a name="line.89"></a>
-<FONT color="green">090</FONT>    <a name="line.90"></a>
-<FONT color="green">091</FONT>      /** Percent encodes anything that looks like a colon, or a parenthesis. */<a name="line.91"></a>
-<FONT color="green">092</FONT>      static String normalizeUri(String s) {<a name="line.92"></a>
-<FONT color="green">093</FONT>        int n = s.length();<a name="line.93"></a>
-<FONT color="green">094</FONT>        boolean colonsIrrelevant = false;<a name="line.94"></a>
-<FONT color="green">095</FONT>        for (int i = 0; i &lt; n; ++i) {<a name="line.95"></a>
-<FONT color="green">096</FONT>          char ch = s.charAt(i);<a name="line.96"></a>
-<FONT color="green">097</FONT>          switch (ch) {<a name="line.97"></a>
-<FONT color="green">098</FONT>            case '/': case '#': case '?': case ':':<a name="line.98"></a>
-<FONT color="green">099</FONT>              colonsIrrelevant = true;<a name="line.99"></a>
-<FONT color="green">100</FONT>              break;<a name="line.100"></a>
-<FONT color="green">101</FONT>            case '(': case ')': case '\uff1a':<a name="line.101"></a>
-<FONT color="green">102</FONT>              StringBuilder sb = new StringBuilder(n + 16);<a name="line.102"></a>
-<FONT color="green">103</FONT>              int pos = 0;<a name="line.103"></a>
-<FONT color="green">104</FONT>              for (; i &lt; n; ++i) {<a name="line.104"></a>
-<FONT color="green">105</FONT>                ch = s.charAt(i);<a name="line.105"></a>
-<FONT color="green">106</FONT>                switch (ch) {<a name="line.106"></a>
-<FONT color="green">107</FONT>                  case '(':<a name="line.107"></a>
-<FONT color="green">108</FONT>                    sb.append(s, pos, i).append("%28");<a name="line.108"></a>
-<FONT color="green">109</FONT>                    pos = i + 1;<a name="line.109"></a>
-<FONT color="green">110</FONT>                    break;<a name="line.110"></a>
-<FONT color="green">111</FONT>                  case ')':<a name="line.111"></a>
-<FONT color="green">112</FONT>                    sb.append(s, pos, i).append("%29");<a name="line.112"></a>
-<FONT color="green">113</FONT>                    pos = i + 1;<a name="line.113"></a>
-<FONT color="green">114</FONT>                    break;<a name="line.114"></a>
-<FONT color="green">115</FONT>                  default:<a name="line.115"></a>
-<FONT color="green">116</FONT>                    if (ch &gt; 0x100 &amp;&amp; !colonsIrrelevant) {<a name="line.116"></a>
-<FONT color="green">117</FONT>                      // Other colon like characters.<a name="line.117"></a>
-<FONT color="green">118</FONT>                      // TODO: do we need to encode non-colon characters if we're<a name="line.118"></a>
-<FONT color="green">119</FONT>                      // not dealing with URLs that haven't been copy/pasted into<a name="line.119"></a>
-<FONT color="green">120</FONT>                      // the URL bar?<a name="line.120"></a>
-<FONT color="green">121</FONT>                      // Is it safe to assume UTF-8 here?<a name="line.121"></a>
-<FONT color="green">122</FONT>                      switch (ch) {<a name="line.122"></a>
-<FONT color="green">123</FONT>                        case '\u0589':<a name="line.123"></a>
-<FONT color="green">124</FONT>                          sb.append(s, pos, i).append("%d6%89");<a name="line.124"></a>
-<FONT color="green">125</FONT>                          pos = i + 1;<a name="line.125"></a>
-<FONT color="green">126</FONT>                          break;<a name="line.126"></a>
-<FONT color="green">127</FONT>                        case '\u05c3':<a name="line.127"></a>
-<FONT color="green">128</FONT>                          sb.append(s, pos, i).append("%d7%83");<a name="line.128"></a>
-<FONT color="green">129</FONT>                          pos = i + 1;<a name="line.129"></a>
-<FONT color="green">130</FONT>                          break;<a name="line.130"></a>
-<FONT color="green">131</FONT>                        case '\u2236':<a name="line.131"></a>
-<FONT color="green">132</FONT>                          sb.append(s, pos, i).append("%e2%88%b6");<a name="line.132"></a>
-<FONT color="green">133</FONT>                          pos = i + 1;<a name="line.133"></a>
-<FONT color="green">134</FONT>                          break;<a name="line.134"></a>
-<FONT color="green">135</FONT>                        case '\uff1a':<a name="line.135"></a>
-<FONT color="green">136</FONT>                          sb.append(s, pos, i).append("%ef%bc%9a");<a name="line.136"></a>
-<FONT color="green">137</FONT>                          pos = i + 1;<a name="line.137"></a>
-<FONT color="green">138</FONT>                          break;<a name="line.138"></a>
-<FONT color="green">139</FONT>                      }<a name="line.139"></a>
-<FONT color="green">140</FONT>                    }<a name="line.140"></a>
-<FONT color="green">141</FONT>                    break;<a name="line.141"></a>
-<FONT color="green">142</FONT>                }<a name="line.142"></a>
-<FONT color="green">143</FONT>              }<a name="line.143"></a>
-<FONT color="green">144</FONT>              return sb.append(s, pos, n).toString();<a name="line.144"></a>
-<FONT color="green">145</FONT>          }<a name="line.145"></a>
-<FONT color="green">146</FONT>        }<a name="line.146"></a>
-<FONT color="green">147</FONT>        return s;<a name="line.147"></a>
-<FONT color="green">148</FONT>      }<a name="line.148"></a>
-<FONT color="green">149</FONT>    <a name="line.149"></a>
-<FONT color="green">150</FONT>    }<a name="line.150"></a>
+<FONT color="green">080</FONT>              String protocol = Strings.toLowerCase(s.substring(0, i));<a name="line.80"></a>
+<FONT color="green">081</FONT>              if (!protocols.contains(protocol)) { return null; }<a name="line.81"></a>
+<FONT color="green">082</FONT>              break protocol_loop;<a name="line.82"></a>
+<FONT color="green">083</FONT>          }<a name="line.83"></a>
+<FONT color="green">084</FONT>        }<a name="line.84"></a>
+<FONT color="green">085</FONT>        return normalizeUri(s);<a name="line.85"></a>
+<FONT color="green">086</FONT>      }<a name="line.86"></a>
+<FONT color="green">087</FONT>    <a name="line.87"></a>
+<FONT color="green">088</FONT>      protected boolean allowProtocolRelativeUrls() {<a name="line.88"></a>
+<FONT color="green">089</FONT>        return protocols.contains("http") &amp;&amp; protocols.contains("https");<a name="line.89"></a>
+<FONT color="green">090</FONT>      }<a name="line.90"></a>
+<FONT color="green">091</FONT>    <a name="line.91"></a>
+<FONT color="green">092</FONT>      /** Percent encodes anything that looks like a colon, or a parenthesis. */<a name="line.92"></a>
+<FONT color="green">093</FONT>      static String normalizeUri(String s) {<a name="line.93"></a>
+<FONT color="green">094</FONT>        int n = s.length();<a name="line.94"></a>
+<FONT color="green">095</FONT>        boolean colonsIrrelevant = false;<a name="line.95"></a>
+<FONT color="green">096</FONT>        for (int i = 0; i &lt; n; ++i) {<a name="line.96"></a>
+<FONT color="green">097</FONT>          char ch = s.charAt(i);<a name="line.97"></a>
+<FONT color="green">098</FONT>          switch (ch) {<a name="line.98"></a>
+<FONT color="green">099</FONT>            case '/': case '#': case '?': case ':':<a name="line.99"></a>
+<FONT color="green">100</FONT>              colonsIrrelevant = true;<a name="line.100"></a>
+<FONT color="green">101</FONT>              break;<a name="line.101"></a>
+<FONT color="green">102</FONT>            case '(': case ')': case '\uff1a':<a name="line.102"></a>
+<FONT color="green">103</FONT>              StringBuilder sb = new StringBuilder(n + 16);<a name="line.103"></a>
+<FONT color="green">104</FONT>              int pos = 0;<a name="line.104"></a>
+<FONT color="green">105</FONT>              for (; i &lt; n; ++i) {<a name="line.105"></a>
+<FONT color="green">106</FONT>                ch = s.charAt(i);<a name="line.106"></a>
+<FONT color="green">107</FONT>                switch (ch) {<a name="line.107"></a>
+<FONT color="green">108</FONT>                  case '(':<a name="line.108"></a>
+<FONT color="green">109</FONT>                    sb.append(s, pos, i).append("%28");<a name="line.109"></a>
+<FONT color="green">110</FONT>                    pos = i + 1;<a name="line.110"></a>
+<FONT color="green">111</FONT>                    break;<a name="line.111"></a>
+<FONT color="green">112</FONT>                  case ')':<a name="line.112"></a>
+<FONT color="green">113</FONT>                    sb.append(s, pos, i).append("%29");<a name="line.113"></a>
+<FONT color="green">114</FONT>                    pos = i + 1;<a name="line.114"></a>
+<FONT color="green">115</FONT>                    break;<a name="line.115"></a>
+<FONT color="green">116</FONT>                  default:<a name="line.116"></a>
+<FONT color="green">117</FONT>                    if (ch &gt; 0x100 &amp;&amp; !colonsIrrelevant) {<a name="line.117"></a>
+<FONT color="green">118</FONT>                      // Other colon like characters.<a name="line.118"></a>
+<FONT color="green">119</FONT>                      // TODO: do we need to encode non-colon characters if we're<a name="line.119"></a>
+<FONT color="green">120</FONT>                      // not dealing with URLs that haven't been copy/pasted into<a name="line.120"></a>
+<FONT color="green">121</FONT>                      // the URL bar?<a name="line.121"></a>
+<FONT color="green">122</FONT>                      // Is it safe to assume UTF-8 here?<a name="line.122"></a>
+<FONT color="green">123</FONT>                      switch (ch) {<a name="line.123"></a>
+<FONT color="green">124</FONT>                        case '\u0589':<a name="line.124"></a>
+<FONT color="green">125</FONT>                          sb.append(s, pos, i).append("%d6%89");<a name="line.125"></a>
+<FONT color="green">126</FONT>                          pos = i + 1;<a name="line.126"></a>
+<FONT color="green">127</FONT>                          break;<a name="line.127"></a>
+<FONT color="green">128</FONT>                        case '\u05c3':<a name="line.128"></a>
+<FONT color="green">129</FONT>                          sb.append(s, pos, i).append("%d7%83");<a name="line.129"></a>
+<FONT color="green">130</FONT>                          pos = i + 1;<a name="line.130"></a>
+<FONT color="green">131</FONT>                          break;<a name="line.131"></a>
+<FONT color="green">132</FONT>                        case '\u2236':<a name="line.132"></a>
+<FONT color="green">133</FONT>                          sb.append(s, pos, i).append("%e2%88%b6");<a name="line.133"></a>
+<FONT color="green">134</FONT>                          pos = i + 1;<a name="line.134"></a>
+<FONT color="green">135</FONT>                          break;<a name="line.135"></a>
+<FONT color="green">136</FONT>                        case '\uff1a':<a name="line.136"></a>
+<FONT color="green">137</FONT>                          sb.append(s, pos, i).append("%ef%bc%9a");<a name="line.137"></a>
+<FONT color="green">138</FONT>                          pos = i + 1;<a name="line.138"></a>
+<FONT color="green">139</FONT>                          break;<a name="line.139"></a>
+<FONT color="green">140</FONT>                      }<a name="line.140"></a>
+<FONT color="green">141</FONT>                    }<a name="line.141"></a>
+<FONT color="green">142</FONT>                    break;<a name="line.142"></a>
+<FONT color="green">143</FONT>                }<a name="line.143"></a>
+<FONT color="green">144</FONT>              }<a name="line.144"></a>
+<FONT color="green">145</FONT>              return sb.append(s, pos, n).toString();<a name="line.145"></a>
+<FONT color="green">146</FONT>          }<a name="line.146"></a>
+<FONT color="green">147</FONT>        }<a name="line.147"></a>
+<FONT color="green">148</FONT>        return s;<a name="line.148"></a>
+<FONT color="green">149</FONT>      }<a name="line.149"></a>
+<FONT color="green">150</FONT>    <a name="line.150"></a>
+<FONT color="green">151</FONT>    }<a name="line.151"></a>
 
 
 
diff --git a/distrib/javadoc/src-html/org/owasp/html/HtmlPolicyBuilder.AttributeBuilder.html b/distrib/javadoc/src-html/org/owasp/html/HtmlPolicyBuilder.AttributeBuilder.html
index 6076f25..34dc1c7 100644
--- a/distrib/javadoc/src-html/org/owasp/html/HtmlPolicyBuilder.AttributeBuilder.html
+++ b/distrib/javadoc/src-html/org/owasp/html/HtmlPolicyBuilder.AttributeBuilder.html
@@ -446,7 +446,7 @@
 <FONT color="green">443</FONT>      private static final Set&lt;String&gt; URL_ATTRIBUTE_NAMES = ImmutableSet.of(<a name="line.443"></a>
 <FONT color="green">444</FONT>          "action", "archive", "background", "cite", "classid", "codebase", "data",<a name="line.444"></a>
 <FONT color="green">445</FONT>          "dsync", "formaction", "href", "icon", "longdesc", "manifest", "poster",<a name="line.445"></a>
-<FONT color="green">446</FONT>          "profile", "src", "usemap");<a name="line.446"></a>
+<FONT color="green">446</FONT>          "profile", "src", "srcset", "usemap");<a name="line.446"></a>
 <FONT color="green">447</FONT>    <a name="line.447"></a>
 <FONT color="green">448</FONT>      /**<a name="line.448"></a>
 <FONT color="green">449</FONT>       * Produces a policy based on the allow and disallow calls previously made.<a name="line.449"></a>
diff --git a/distrib/javadoc/src-html/org/owasp/html/HtmlPolicyBuilder.html b/distrib/javadoc/src-html/org/owasp/html/HtmlPolicyBuilder.html
index 6076f25..34dc1c7 100644
--- a/distrib/javadoc/src-html/org/owasp/html/HtmlPolicyBuilder.html
+++ b/distrib/javadoc/src-html/org/owasp/html/HtmlPolicyBuilder.html
@@ -446,7 +446,7 @@
 <FONT color="green">443</FONT>      private static final Set&lt;String&gt; URL_ATTRIBUTE_NAMES = ImmutableSet.of(<a name="line.443"></a>
 <FONT color="green">444</FONT>          "action", "archive", "background", "cite", "classid", "codebase", "data",<a name="line.444"></a>
 <FONT color="green">445</FONT>          "dsync", "formaction", "href", "icon", "longdesc", "manifest", "poster",<a name="line.445"></a>
-<FONT color="green">446</FONT>          "profile", "src", "usemap");<a name="line.446"></a>
+<FONT color="green">446</FONT>          "profile", "src", "srcset", "usemap");<a name="line.446"></a>
 <FONT color="green">447</FONT>    <a name="line.447"></a>
 <FONT color="green">448</FONT>      /**<a name="line.448"></a>
 <FONT color="green">449</FONT>       * Produces a policy based on the allow and disallow calls previously made.<a name="line.449"></a>
diff --git a/distrib/javadoc/src-html/org/owasp/html/HtmlTextEscapingMode.html b/distrib/javadoc/src-html/org/owasp/html/HtmlTextEscapingMode.html
new file mode 100644
index 0000000..baebe4c
--- /dev/null
+++ b/distrib/javadoc/src-html/org/owasp/html/HtmlTextEscapingMode.html
@@ -0,0 +1,237 @@
+<HTML>
+<BODY BGCOLOR="white">
+<PRE>
+<FONT color="green">001</FONT>    // Copyright (c) 2011, Mike Samuel<a name="line.1"></a>
+<FONT color="green">002</FONT>    // All rights reserved.<a name="line.2"></a>
+<FONT color="green">003</FONT>    //<a name="line.3"></a>
+<FONT color="green">004</FONT>    // Redistribution and use in source and binary forms, with or without<a name="line.4"></a>
+<FONT color="green">005</FONT>    // modification, are permitted provided that the following conditions<a name="line.5"></a>
+<FONT color="green">006</FONT>    // are met:<a name="line.6"></a>
+<FONT color="green">007</FONT>    //<a name="line.7"></a>
+<FONT color="green">008</FONT>    // Redistributions of source code must retain the above copyright<a name="line.8"></a>
+<FONT color="green">009</FONT>    // notice, this list of conditions and the following disclaimer.<a name="line.9"></a>
+<FONT color="green">010</FONT>    // Redistributions in binary form must reproduce the above copyright<a name="line.10"></a>
+<FONT color="green">011</FONT>    // notice, this list of conditions and the following disclaimer in the<a name="line.11"></a>
+<FONT color="green">012</FONT>    // documentation and/or other materials provided with the distribution.<a name="line.12"></a>
+<FONT color="green">013</FONT>    // Neither the name of the OWASP nor the names of its contributors may<a name="line.13"></a>
+<FONT color="green">014</FONT>    // be used to endorse or promote products derived from this software<a name="line.14"></a>
+<FONT color="green">015</FONT>    // without specific prior written permission.<a name="line.15"></a>
+<FONT color="green">016</FONT>    // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS<a name="line.16"></a>
+<FONT color="green">017</FONT>    // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT<a name="line.17"></a>
+<FONT color="green">018</FONT>    // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS<a name="line.18"></a>
+<FONT color="green">019</FONT>    // FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE<a name="line.19"></a>
+<FONT color="green">020</FONT>    // COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,<a name="line.20"></a>
+<FONT color="green">021</FONT>    // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,<a name="line.21"></a>
+<FONT color="green">022</FONT>    // BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;<a name="line.22"></a>
+<FONT color="green">023</FONT>    // LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER<a name="line.23"></a>
+<FONT color="green">024</FONT>    // CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT<a name="line.24"></a>
+<FONT color="green">025</FONT>    // LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN<a name="line.25"></a>
+<FONT color="green">026</FONT>    // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<a name="line.26"></a>
+<FONT color="green">027</FONT>    // POSSIBILITY OF SUCH DAMAGE.<a name="line.27"></a>
+<FONT color="green">028</FONT>    <a name="line.28"></a>
+<FONT color="green">029</FONT>    package org.owasp.html;<a name="line.29"></a>
+<FONT color="green">030</FONT>    <a name="line.30"></a>
+<FONT color="green">031</FONT>    import com.google.common.collect.ImmutableMap;<a name="line.31"></a>
+<FONT color="green">032</FONT>    <a name="line.32"></a>
+<FONT color="green">033</FONT>    /**<a name="line.33"></a>
+<FONT color="green">034</FONT>     * From section 8.1.2.6 of http://www.whatwg.org/specs/web-apps/current-work/<a name="line.34"></a>
+<FONT color="green">035</FONT>     * &lt;p&gt;<a name="line.35"></a>
+<FONT color="green">036</FONT>     * The text in CDATA and RCDATA elements must not contain any<a name="line.36"></a>
+<FONT color="green">037</FONT>     * occurrences of the string "&lt;/" (U+003C LESS-THAN SIGN, U+002F<a name="line.37"></a>
+<FONT color="green">038</FONT>     * SOLIDUS) followed by characters that case-insensitively match the<a name="line.38"></a>
+<FONT color="green">039</FONT>     * tag name of the element followed by one of U+0009 CHARACTER<a name="line.39"></a>
+<FONT color="green">040</FONT>     * TABULATION, U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C<a name="line.40"></a>
+<FONT color="green">041</FONT>     * FORM FEED (FF), U+0020 SPACE, U+003E GREATER-THAN SIGN (&gt;), or<a name="line.41"></a>
+<FONT color="green">042</FONT>     * U+002F SOLIDUS (/), unless that string is part of an escaping<a name="line.42"></a>
+<FONT color="green">043</FONT>     * text span.<a name="line.43"></a>
+<FONT color="green">044</FONT>     * &lt;/p&gt;<a name="line.44"></a>
+<FONT color="green">045</FONT>     *<a name="line.45"></a>
+<FONT color="green">046</FONT>     * &lt;p&gt;<a name="line.46"></a>
+<FONT color="green">047</FONT>     * See also<a name="line.47"></a>
+<FONT color="green">048</FONT>     * http://www.whatwg.org/specs/web-apps/current-work/#cdata-rcdata-restrictions<a name="line.48"></a>
+<FONT color="green">049</FONT>     * for the elements which fall in each category.<a name="line.49"></a>
+<FONT color="green">050</FONT>     * &lt;/p&gt;<a name="line.50"></a>
+<FONT color="green">051</FONT>     *<a name="line.51"></a>
+<FONT color="green">052</FONT>     * @author Mike Samuel &lt;mikesamuel@gmail.com&gt;<a name="line.52"></a>
+<FONT color="green">053</FONT>     */<a name="line.53"></a>
+<FONT color="green">054</FONT>    public enum HtmlTextEscapingMode {<a name="line.54"></a>
+<FONT color="green">055</FONT>      /**<a name="line.55"></a>
+<FONT color="green">056</FONT>       * Normally escaped character data that breaks around comments and tags.<a name="line.56"></a>
+<FONT color="green">057</FONT>       */<a name="line.57"></a>
+<FONT color="green">058</FONT>      PCDATA,<a name="line.58"></a>
+<FONT color="green">059</FONT>      /**<a name="line.59"></a>
+<FONT color="green">060</FONT>       * A span of text where HTML special characters are interpreted literally,<a name="line.60"></a>
+<FONT color="green">061</FONT>       * as in a SCRIPT tag.<a name="line.61"></a>
+<FONT color="green">062</FONT>       */<a name="line.62"></a>
+<FONT color="green">063</FONT>      CDATA,<a name="line.63"></a>
+<FONT color="green">064</FONT>      /**<a name="line.64"></a>
+<FONT color="green">065</FONT>       * Like {@link #CDATA} but only for certain browsers.<a name="line.65"></a>
+<FONT color="green">066</FONT>       */<a name="line.66"></a>
+<FONT color="green">067</FONT>      CDATA_SOMETIMES,<a name="line.67"></a>
+<FONT color="green">068</FONT>      /**<a name="line.68"></a>
+<FONT color="green">069</FONT>       * A span of text and character entity references where HTML special<a name="line.69"></a>
+<FONT color="green">070</FONT>       * characters are interpreted literally, as in a TITLE tag.<a name="line.70"></a>
+<FONT color="green">071</FONT>       */<a name="line.71"></a>
+<FONT color="green">072</FONT>      RCDATA,<a name="line.72"></a>
+<FONT color="green">073</FONT>      /**<a name="line.73"></a>
+<FONT color="green">074</FONT>       * A span of text where HTML special characters are interpreted literally,<a name="line.74"></a>
+<FONT color="green">075</FONT>       * where there is no end tag.  PLAIN_TEXT runs until the end of the file.<a name="line.75"></a>
+<FONT color="green">076</FONT>       */<a name="line.76"></a>
+<FONT color="green">077</FONT>      PLAIN_TEXT,<a name="line.77"></a>
+<FONT color="green">078</FONT>    <a name="line.78"></a>
+<FONT color="green">079</FONT>      /**<a name="line.79"></a>
+<FONT color="green">080</FONT>       * Cannot contain data.<a name="line.80"></a>
+<FONT color="green">081</FONT>       */<a name="line.81"></a>
+<FONT color="green">082</FONT>      VOID,<a name="line.82"></a>
+<FONT color="green">083</FONT>      ;<a name="line.83"></a>
+<FONT color="green">084</FONT>    <a name="line.84"></a>
+<FONT color="green">085</FONT>      private static final ImmutableMap&lt;String, HtmlTextEscapingMode&gt; ESCAPING_MODES<a name="line.85"></a>
+<FONT color="green">086</FONT>          = ImmutableMap.&lt;String, HtmlTextEscapingMode&gt;builder()<a name="line.86"></a>
+<FONT color="green">087</FONT>          .put("iframe", CDATA)<a name="line.87"></a>
+<FONT color="green">088</FONT>          // HTML5 does not treat listing as CDATA and treats XMP as deprecated,<a name="line.88"></a>
+<FONT color="green">089</FONT>          // but HTML2 does at<a name="line.89"></a>
+<FONT color="green">090</FONT>          // http://www.w3.org/MarkUp/1995-archive/NonStandard.html<a name="line.90"></a>
+<FONT color="green">091</FONT>          // Listing is not supported by browsers.<a name="line.91"></a>
+<FONT color="green">092</FONT>          .put("listing", CDATA_SOMETIMES)<a name="line.92"></a>
+<FONT color="green">093</FONT>          .put("xmp", CDATA)<a name="line.93"></a>
+<FONT color="green">094</FONT>    <a name="line.94"></a>
+<FONT color="green">095</FONT>          // Technically, noembed, noscript and noframes are CDATA_SOMETIMES but<a name="line.95"></a>
+<FONT color="green">096</FONT>          // we can only be hurt by allowing tag content that looks like text so<a name="line.96"></a>
+<FONT color="green">097</FONT>          // we treat them as regular..<a name="line.97"></a>
+<FONT color="green">098</FONT>          //.put("noembed", CDATA_SOMETIMES)<a name="line.98"></a>
+<FONT color="green">099</FONT>          //.put("noframes", CDATA_SOMETIMES)<a name="line.99"></a>
+<FONT color="green">100</FONT>          //.put("noscript", CDATA_SOMETIMES)<a name="line.100"></a>
+<FONT color="green">101</FONT>          .put("comment", CDATA_SOMETIMES)  // IE only<a name="line.101"></a>
+<FONT color="green">102</FONT>    <a name="line.102"></a>
+<FONT color="green">103</FONT>          // Runs till end of file.<a name="line.103"></a>
+<FONT color="green">104</FONT>          .put("plaintext", PLAIN_TEXT)<a name="line.104"></a>
+<FONT color="green">105</FONT>    <a name="line.105"></a>
+<FONT color="green">106</FONT>          .put("script", CDATA)<a name="line.106"></a>
+<FONT color="green">107</FONT>          .put("style", CDATA)<a name="line.107"></a>
+<FONT color="green">108</FONT>    <a name="line.108"></a>
+<FONT color="green">109</FONT>          // Textarea and Title are RCDATA, not CDATA, so decode entity references.<a name="line.109"></a>
+<FONT color="green">110</FONT>          .put("textarea", RCDATA)<a name="line.110"></a>
+<FONT color="green">111</FONT>          .put("title", RCDATA)<a name="line.111"></a>
+<FONT color="green">112</FONT>    <a name="line.112"></a>
+<FONT color="green">113</FONT>          // Nodes that can't contain content.<a name="line.113"></a>
+<FONT color="green">114</FONT>          // http://www.w3.org/TR/html-markup/syntax.html#void-elements<a name="line.114"></a>
+<FONT color="green">115</FONT>          .put("area", VOID)<a name="line.115"></a>
+<FONT color="green">116</FONT>          .put("base", VOID)<a name="line.116"></a>
+<FONT color="green">117</FONT>          .put("br", VOID)<a name="line.117"></a>
+<FONT color="green">118</FONT>          .put("col", VOID)<a name="line.118"></a>
+<FONT color="green">119</FONT>          .put("command", VOID)<a name="line.119"></a>
+<FONT color="green">120</FONT>          .put("embed", VOID)<a name="line.120"></a>
+<FONT color="green">121</FONT>          .put("hr", VOID)<a name="line.121"></a>
+<FONT color="green">122</FONT>          .put("img", VOID)<a name="line.122"></a>
+<FONT color="green">123</FONT>          .put("input", VOID)<a name="line.123"></a>
+<FONT color="green">124</FONT>          .put("keygen", VOID)<a name="line.124"></a>
+<FONT color="green">125</FONT>          .put("link", VOID)<a name="line.125"></a>
+<FONT color="green">126</FONT>          .put("meta", VOID)<a name="line.126"></a>
+<FONT color="green">127</FONT>          .put("param", VOID)<a name="line.127"></a>
+<FONT color="green">128</FONT>          .put("source", VOID)<a name="line.128"></a>
+<FONT color="green">129</FONT>          .put("track", VOID)<a name="line.129"></a>
+<FONT color="green">130</FONT>          .put("wbr", VOID)<a name="line.130"></a>
+<FONT color="green">131</FONT>          .build();<a name="line.131"></a>
+<FONT color="green">132</FONT>    <a name="line.132"></a>
+<FONT color="green">133</FONT>    <a name="line.133"></a>
+<FONT color="green">134</FONT>      /**<a name="line.134"></a>
+<FONT color="green">135</FONT>       * The mode used for content following a start tag with the given name.<a name="line.135"></a>
+<FONT color="green">136</FONT>       */<a name="line.136"></a>
+<FONT color="green">137</FONT>      public static HtmlTextEscapingMode getModeForTag(String canonTagName) {<a name="line.137"></a>
+<FONT color="green">138</FONT>        HtmlTextEscapingMode mode = ESCAPING_MODES.get(canonTagName);<a name="line.138"></a>
+<FONT color="green">139</FONT>        return mode != null ? mode : PCDATA;<a name="line.139"></a>
+<FONT color="green">140</FONT>      }<a name="line.140"></a>
+<FONT color="green">141</FONT>    <a name="line.141"></a>
+<FONT color="green">142</FONT>      /**<a name="line.142"></a>
+<FONT color="green">143</FONT>       * True iff the content following the given tag allows escaping text<a name="line.143"></a>
+<FONT color="green">144</FONT>       * spans: {@code &lt;!--&amp;hellip;--&gt;} that escape even things that might<a name="line.144"></a>
+<FONT color="green">145</FONT>       * be an end tag for the corresponding open tag.<a name="line.145"></a>
+<FONT color="green">146</FONT>       */<a name="line.146"></a>
+<FONT color="green">147</FONT>      public static boolean allowsEscapingTextSpan(String canonTagName) {<a name="line.147"></a>
+<FONT color="green">148</FONT>        // &lt;xmp&gt; and &lt;plaintext&gt; do not admit escaping text spans.<a name="line.148"></a>
+<FONT color="green">149</FONT>        return "style".equals(canonTagName) || "script".equals(canonTagName)<a name="line.149"></a>
+<FONT color="green">150</FONT>            || "noembed".equals(canonTagName) || "noscript".equals(canonTagName)<a name="line.150"></a>
+<FONT color="green">151</FONT>            || "noframes".equals(canonTagName);<a name="line.151"></a>
+<FONT color="green">152</FONT>      }<a name="line.152"></a>
+<FONT color="green">153</FONT>    <a name="line.153"></a>
+<FONT color="green">154</FONT>      /**<a name="line.154"></a>
+<FONT color="green">155</FONT>       * True if content immediately following the start tag must be treated as<a name="line.155"></a>
+<FONT color="green">156</FONT>       * special CDATA so that &amp;lt;'s are not treated as starting tags, comments<a name="line.156"></a>
+<FONT color="green">157</FONT>       * or directives.<a name="line.157"></a>
+<FONT color="green">158</FONT>       */<a name="line.158"></a>
+<FONT color="green">159</FONT>      public static boolean isTagFollowedByLiteralContent(String canonTagName) {<a name="line.159"></a>
+<FONT color="green">160</FONT>        HtmlTextEscapingMode mode = getModeForTag(canonTagName);<a name="line.160"></a>
+<FONT color="green">161</FONT>        return mode != PCDATA &amp;&amp; mode != VOID;<a name="line.161"></a>
+<FONT color="green">162</FONT>      }<a name="line.162"></a>
+<FONT color="green">163</FONT>    <a name="line.163"></a>
+<FONT color="green">164</FONT>      /**<a name="line.164"></a>
+<FONT color="green">165</FONT>       * True iff the tag cannot contain any content -- will an HTML parser consider<a name="line.165"></a>
+<FONT color="green">166</FONT>       * the element to have ended immediately after the start tag.<a name="line.166"></a>
+<FONT color="green">167</FONT>       */<a name="line.167"></a>
+<FONT color="green">168</FONT>      public static boolean isVoidElement(String canonTagName) {<a name="line.168"></a>
+<FONT color="green">169</FONT>        return getModeForTag(canonTagName) == VOID;<a name="line.169"></a>
+<FONT color="green">170</FONT>      }<a name="line.170"></a>
+<FONT color="green">171</FONT>    }<a name="line.171"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+</BODY>
+</HTML>
diff --git a/distrib/javadoc/src-html/org/owasp/html/examples/EbayPolicyExample.html b/distrib/javadoc/src-html/org/owasp/html/examples/EbayPolicyExample.html
index 19ad37e..100a7c9 100644
--- a/distrib/javadoc/src-html/org/owasp/html/examples/EbayPolicyExample.html
+++ b/distrib/javadoc/src-html/org/owasp/html/examples/EbayPolicyExample.html
@@ -89,7 +89,7 @@
 <FONT color="green">086</FONT>          "(?:[\\p{L}\\p{N}\\\\\\.\\#@\\$%\\+&amp;;\\-_~,\\?=/!]+|\\#(\\w)+)");<a name="line.86"></a>
 <FONT color="green">087</FONT>      private static final Pattern OFFSITE_URL = Pattern.compile(<a name="line.87"></a>
 <FONT color="green">088</FONT>          "\\s*(?:(?:ht|f)tps?://|mailto:)[\\p{L}\\p{N}]"<a name="line.88"></a>
-<FONT color="green">089</FONT>          + "[\\p{L}\\p{N}\\p{Zs}\\.\\#@\\$%\\+&amp;;:\\-_~,\\?=/!\\(\\)]*\\s*");<a name="line.89"></a>
+<FONT color="green">089</FONT>          + "[\\p{L}\\p{N}\\p{Zs}\\.\\#@\\$%\\+&amp;;:\\-_~,\\?=/!\\(\\)]*+\\s*");<a name="line.89"></a>
 <FONT color="green">090</FONT>    <a name="line.90"></a>
 <FONT color="green">091</FONT>      private static final Pattern NUMBER = Pattern.compile(<a name="line.91"></a>
 <FONT color="green">092</FONT>          "[+-]?(?:(?:[0-9]+(?:\\.[0-9]*)?)|\\.[0-9]+)");<a name="line.92"></a>
diff --git a/distrib/javadoc/src-html/org/owasp/html/examples/UrlTextExample.html b/distrib/javadoc/src-html/org/owasp/html/examples/UrlTextExample.html
new file mode 100644
index 0000000..373f07b
--- /dev/null
+++ b/distrib/javadoc/src-html/org/owasp/html/examples/UrlTextExample.html
@@ -0,0 +1,259 @@
+<HTML>
+<BODY BGCOLOR="white">
+<PRE>
+<FONT color="green">001</FONT>    // Copyright (c) 2013, Mike Samuel<a name="line.1"></a>
+<FONT color="green">002</FONT>    // All rights reserved.<a name="line.2"></a>
+<FONT color="green">003</FONT>    //<a name="line.3"></a>
+<FONT color="green">004</FONT>    // Redistribution and use in source and binary forms, with or without<a name="line.4"></a>
+<FONT color="green">005</FONT>    // modification, are permitted provided that the following conditions<a name="line.5"></a>
+<FONT color="green">006</FONT>    // are met:<a name="line.6"></a>
+<FONT color="green">007</FONT>    //<a name="line.7"></a>
+<FONT color="green">008</FONT>    // Redistributions of source code must retain the above copyright<a name="line.8"></a>
+<FONT color="green">009</FONT>    // notice, this list of conditions and the following disclaimer.<a name="line.9"></a>
+<FONT color="green">010</FONT>    // Redistributions in binary form must reproduce the above copyright<a name="line.10"></a>
+<FONT color="green">011</FONT>    // notice, this list of conditions and the following disclaimer in the<a name="line.11"></a>
+<FONT color="green">012</FONT>    // documentation and/or other materials provided with the distribution.<a name="line.12"></a>
+<FONT color="green">013</FONT>    // Neither the name of the OWASP nor the names of its contributors may<a name="line.13"></a>
+<FONT color="green">014</FONT>    // be used to endorse or promote products derived from this software<a name="line.14"></a>
+<FONT color="green">015</FONT>    // without specific prior written permission.<a name="line.15"></a>
+<FONT color="green">016</FONT>    // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS<a name="line.16"></a>
+<FONT color="green">017</FONT>    // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT<a name="line.17"></a>
+<FONT color="green">018</FONT>    // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS<a name="line.18"></a>
+<FONT color="green">019</FONT>    // FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE<a name="line.19"></a>
+<FONT color="green">020</FONT>    // COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,<a name="line.20"></a>
+<FONT color="green">021</FONT>    // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,<a name="line.21"></a>
+<FONT color="green">022</FONT>    // BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;<a name="line.22"></a>
+<FONT color="green">023</FONT>    // LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER<a name="line.23"></a>
+<FONT color="green">024</FONT>    // CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT<a name="line.24"></a>
+<FONT color="green">025</FONT>    // LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN<a name="line.25"></a>
+<FONT color="green">026</FONT>    // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE<a name="line.26"></a>
+<FONT color="green">027</FONT>    // POSSIBILITY OF SUCH DAMAGE.<a name="line.27"></a>
+<FONT color="green">028</FONT>    <a name="line.28"></a>
+<FONT color="green">029</FONT>    package org.owasp.html.examples;<a name="line.29"></a>
+<FONT color="green">030</FONT>    <a name="line.30"></a>
+<FONT color="green">031</FONT>    import java.io.IOException;<a name="line.31"></a>
+<FONT color="green">032</FONT>    import java.util.ArrayList;<a name="line.32"></a>
+<FONT color="green">033</FONT>    import java.util.List;<a name="line.33"></a>
+<FONT color="green">034</FONT>    <a name="line.34"></a>
+<FONT color="green">035</FONT>    import org.owasp.html.Handler;<a name="line.35"></a>
+<FONT color="green">036</FONT>    import org.owasp.html.HtmlPolicyBuilder;<a name="line.36"></a>
+<FONT color="green">037</FONT>    import org.owasp.html.HtmlSanitizer;<a name="line.37"></a>
+<FONT color="green">038</FONT>    import org.owasp.html.HtmlStreamEventReceiver;<a name="line.38"></a>
+<FONT color="green">039</FONT>    import org.owasp.html.HtmlStreamRenderer;<a name="line.39"></a>
+<FONT color="green">040</FONT>    import org.owasp.html.HtmlTextEscapingMode;<a name="line.40"></a>
+<FONT color="green">041</FONT>    import org.owasp.html.PolicyFactory;<a name="line.41"></a>
+<FONT color="green">042</FONT>    import org.owasp.html.TagBalancingHtmlStreamEventReceiver;<a name="line.42"></a>
+<FONT color="green">043</FONT>    <a name="line.43"></a>
+<FONT color="green">044</FONT>    /**<a name="line.44"></a>
+<FONT color="green">045</FONT>     * Uses a custom event receiver to emit the domain of a link or inline image<a name="line.45"></a>
+<FONT color="green">046</FONT>     * after the link or image.<a name="line.46"></a>
+<FONT color="green">047</FONT>     */<a name="line.47"></a>
+<FONT color="green">048</FONT>    public class UrlTextExample {<a name="line.48"></a>
+<FONT color="green">049</FONT>    <a name="line.49"></a>
+<FONT color="green">050</FONT>      /** An event receiver that emits the domain of a link or image after it. */<a name="line.50"></a>
+<FONT color="green">051</FONT>      static class AppendDomainAfterText implements HtmlStreamEventReceiver {<a name="line.51"></a>
+<FONT color="green">052</FONT>        final HtmlStreamEventReceiver underlying;<a name="line.52"></a>
+<FONT color="green">053</FONT>        private final List&lt;String&gt; pendingText = new ArrayList&lt;String&gt;();<a name="line.53"></a>
+<FONT color="green">054</FONT>    <a name="line.54"></a>
+<FONT color="green">055</FONT>        AppendDomainAfterText(HtmlStreamEventReceiver underlying) {<a name="line.55"></a>
+<FONT color="green">056</FONT>          this.underlying = underlying;<a name="line.56"></a>
+<FONT color="green">057</FONT>        }<a name="line.57"></a>
+<FONT color="green">058</FONT>    <a name="line.58"></a>
+<FONT color="green">059</FONT>        public void openDocument() {<a name="line.59"></a>
+<FONT color="green">060</FONT>          underlying.openDocument();<a name="line.60"></a>
+<FONT color="green">061</FONT>        }<a name="line.61"></a>
+<FONT color="green">062</FONT>        public void closeDocument() {<a name="line.62"></a>
+<FONT color="green">063</FONT>          underlying.closeDocument();<a name="line.63"></a>
+<FONT color="green">064</FONT>        }<a name="line.64"></a>
+<FONT color="green">065</FONT>        public void openTag(String elementName, List&lt;String&gt; attribs) {<a name="line.65"></a>
+<FONT color="green">066</FONT>          underlying.openTag(elementName, attribs);<a name="line.66"></a>
+<FONT color="green">067</FONT>    <a name="line.67"></a>
+<FONT color="green">068</FONT>          String trailingText = null;<a name="line.68"></a>
+<FONT color="green">069</FONT>    <a name="line.69"></a>
+<FONT color="green">070</FONT>          if (!attribs.isEmpty()) {<a name="line.70"></a>
+<FONT color="green">071</FONT>            // Figure out which attribute we should look for.<a name="line.71"></a>
+<FONT color="green">072</FONT>            String urlAttrName = null;<a name="line.72"></a>
+<FONT color="green">073</FONT>            if ("a".equals(elementName)) {<a name="line.73"></a>
+<FONT color="green">074</FONT>              urlAttrName = "href";<a name="line.74"></a>
+<FONT color="green">075</FONT>            } else if ("img".equals(elementName)) {<a name="line.75"></a>
+<FONT color="green">076</FONT>              urlAttrName = "src";<a name="line.76"></a>
+<FONT color="green">077</FONT>            }<a name="line.77"></a>
+<FONT color="green">078</FONT>            if (urlAttrName != null) {<a name="line.78"></a>
+<FONT color="green">079</FONT>              // Look for the attribute, and after it for its value.<a name="line.79"></a>
+<FONT color="green">080</FONT>              for (int i = 0, n = attribs.size(); i &lt; n; i += 2) {<a name="line.80"></a>
+<FONT color="green">081</FONT>                if (urlAttrName.equals(attribs.get(i))) {<a name="line.81"></a>
+<FONT color="green">082</FONT>                  String url = attribs.get(i+1).trim();<a name="line.82"></a>
+<FONT color="green">083</FONT>                  String domain = domainOf(url);<a name="line.83"></a>
+<FONT color="green">084</FONT>                  if (domain != null) {<a name="line.84"></a>
+<FONT color="green">085</FONT>                    trailingText = " - " + domain;<a name="line.85"></a>
+<FONT color="green">086</FONT>                  }<a name="line.86"></a>
+<FONT color="green">087</FONT>                  break;<a name="line.87"></a>
+<FONT color="green">088</FONT>                }<a name="line.88"></a>
+<FONT color="green">089</FONT>              }<a name="line.89"></a>
+<FONT color="green">090</FONT>            }<a name="line.90"></a>
+<FONT color="green">091</FONT>          }<a name="line.91"></a>
+<FONT color="green">092</FONT>          if (HtmlTextEscapingMode.isVoidElement(elementName)) {<a name="line.92"></a>
+<FONT color="green">093</FONT>            // A void element like &lt;img&gt; will not have a corresponding closeTag<a name="line.93"></a>
+<FONT color="green">094</FONT>            // call.<a name="line.94"></a>
+<FONT color="green">095</FONT>            if (trailingText != null) {<a name="line.95"></a>
+<FONT color="green">096</FONT>              text(trailingText);<a name="line.96"></a>
+<FONT color="green">097</FONT>            }<a name="line.97"></a>
+<FONT color="green">098</FONT>          } else {<a name="line.98"></a>
+<FONT color="green">099</FONT>            // Push the trailing text onto a stack so when we see the corresponding<a name="line.99"></a>
+<FONT color="green">100</FONT>            // close tag, we can emit the text.<a name="line.100"></a>
+<FONT color="green">101</FONT>            pendingText.add(trailingText);<a name="line.101"></a>
+<FONT color="green">102</FONT>          }<a name="line.102"></a>
+<FONT color="green">103</FONT>        }<a name="line.103"></a>
+<FONT color="green">104</FONT>        public void closeTag(String elementName) {<a name="line.104"></a>
+<FONT color="green">105</FONT>          underlying.closeTag(elementName);<a name="line.105"></a>
+<FONT color="green">106</FONT>          // Pull the trailing text for the recently closed element off the stack.<a name="line.106"></a>
+<FONT color="green">107</FONT>          int pendingTextSize = pendingText.size();<a name="line.107"></a>
+<FONT color="green">108</FONT>          if (pendingTextSize != 0) {<a name="line.108"></a>
+<FONT color="green">109</FONT>            String trailingText = pendingText.remove(pendingTextSize - 1);<a name="line.109"></a>
+<FONT color="green">110</FONT>            if (trailingText != null) {<a name="line.110"></a>
+<FONT color="green">111</FONT>              text(trailingText);<a name="line.111"></a>
+<FONT color="green">112</FONT>            }<a name="line.112"></a>
+<FONT color="green">113</FONT>          }<a name="line.113"></a>
+<FONT color="green">114</FONT>        }<a name="line.114"></a>
+<FONT color="green">115</FONT>        public void text(String text) {<a name="line.115"></a>
+<FONT color="green">116</FONT>          underlying.text(text);<a name="line.116"></a>
+<FONT color="green">117</FONT>        }<a name="line.117"></a>
+<FONT color="green">118</FONT>      }<a name="line.118"></a>
+<FONT color="green">119</FONT>    <a name="line.119"></a>
+<FONT color="green">120</FONT>      public static void run(Appendable out, String... argv) throws IOException {<a name="line.120"></a>
+<FONT color="green">121</FONT>        PolicyFactory policyBuilder = new HtmlPolicyBuilder()<a name="line.121"></a>
+<FONT color="green">122</FONT>          .allowAttributes("src").onElements("img")<a name="line.122"></a>
+<FONT color="green">123</FONT>          .allowAttributes("href").onElements("a")<a name="line.123"></a>
+<FONT color="green">124</FONT>          // Allow some URLs through.<a name="line.124"></a>
+<FONT color="green">125</FONT>          .allowStandardUrlProtocols()<a name="line.125"></a>
+<FONT color="green">126</FONT>          .allowElements(<a name="line.126"></a>
+<FONT color="green">127</FONT>              "a", "label", "h1", "h2", "h3", "h4", "h5", "h6",<a name="line.127"></a>
+<FONT color="green">128</FONT>              "p", "i", "b", "u", "strong", "em", "small", "big", "pre", "code",<a name="line.128"></a>
+<FONT color="green">129</FONT>              "cite", "samp", "sub", "sup", "strike", "center", "blockquote",<a name="line.129"></a>
+<FONT color="green">130</FONT>              "hr", "br", "col", "font", "span", "div", "img",<a name="line.130"></a>
+<FONT color="green">131</FONT>              "ul", "ol", "li", "dd", "dt", "dl", "tbody", "thead", "tfoot",<a name="line.131"></a>
+<FONT color="green">132</FONT>              "table", "td", "th", "tr", "colgroup", "fieldset", "legend"<a name="line.132"></a>
+<FONT color="green">133</FONT>          ).toFactory();<a name="line.133"></a>
+<FONT color="green">134</FONT>    <a name="line.134"></a>
+<FONT color="green">135</FONT>        StringBuilder htmlOut = new StringBuilder();<a name="line.135"></a>
+<FONT color="green">136</FONT>        HtmlSanitizer.Policy policy = policyBuilder.apply(<a name="line.136"></a>
+<FONT color="green">137</FONT>            // The tag balancer passes events to AppendDomainAfterText which<a name="line.137"></a>
+<FONT color="green">138</FONT>            // assumes that openTag and closeTag events line up with one-another.<a name="line.138"></a>
+<FONT color="green">139</FONT>            new TagBalancingHtmlStreamEventReceiver(<a name="line.139"></a>
+<FONT color="green">140</FONT>                // The domain appender forwards events to the HTML renderer,<a name="line.140"></a>
+<FONT color="green">141</FONT>                new AppendDomainAfterText(<a name="line.141"></a>
+<FONT color="green">142</FONT>                    // which puts tags and text onto the output buffer.<a name="line.142"></a>
+<FONT color="green">143</FONT>                    HtmlStreamRenderer.create(htmlOut, Handler.DO_NOTHING)<a name="line.143"></a>
+<FONT color="green">144</FONT>                )<a name="line.144"></a>
+<FONT color="green">145</FONT>            )<a name="line.145"></a>
+<FONT color="green">146</FONT>        );<a name="line.146"></a>
+<FONT color="green">147</FONT>    <a name="line.147"></a>
+<FONT color="green">148</FONT>        for (String input : argv) {<a name="line.148"></a>
+<FONT color="green">149</FONT>          HtmlSanitizer.sanitize(input, policy);<a name="line.149"></a>
+<FONT color="green">150</FONT>        }<a name="line.150"></a>
+<FONT color="green">151</FONT>    <a name="line.151"></a>
+<FONT color="green">152</FONT>        out.append(htmlOut);<a name="line.152"></a>
+<FONT color="green">153</FONT>      }<a name="line.153"></a>
+<FONT color="green">154</FONT>    <a name="line.154"></a>
+<FONT color="green">155</FONT>      public static void main(String... argv) throws IOException {<a name="line.155"></a>
+<FONT color="green">156</FONT>        run(System.out, argv);<a name="line.156"></a>
+<FONT color="green">157</FONT>        System.out.println();<a name="line.157"></a>
+<FONT color="green">158</FONT>      }<a name="line.158"></a>
+<FONT color="green">159</FONT>    <a name="line.159"></a>
+<FONT color="green">160</FONT>    <a name="line.160"></a>
+<FONT color="green">161</FONT>      /**<a name="line.161"></a>
+<FONT color="green">162</FONT>       * The domain (actually authority component) of an HTML5 URL.<a name="line.162"></a>
+<FONT color="green">163</FONT>       * If the input is not hierarchical, then this has undefined behavior.<a name="line.163"></a>
+<FONT color="green">164</FONT>       */<a name="line.164"></a>
+<FONT color="green">165</FONT>      private static String domainOf(String url) {<a name="line.165"></a>
+<FONT color="green">166</FONT>        int start = -1;<a name="line.166"></a>
+<FONT color="green">167</FONT>        if (url.startsWith("//")) {<a name="line.167"></a>
+<FONT color="green">168</FONT>          start = 2;<a name="line.168"></a>
+<FONT color="green">169</FONT>        } else {<a name="line.169"></a>
+<FONT color="green">170</FONT>          start = url.indexOf("://");<a name="line.170"></a>
+<FONT color="green">171</FONT>          if (start &gt;= 0) { start += 3; }<a name="line.171"></a>
+<FONT color="green">172</FONT>        }<a name="line.172"></a>
+<FONT color="green">173</FONT>        if (start &lt; 0) { return null; }<a name="line.173"></a>
+<FONT color="green">174</FONT>        for (int i = 0; i &lt; start - 3; ++i) {<a name="line.174"></a>
+<FONT color="green">175</FONT>          switch (url.charAt(i)) {<a name="line.175"></a>
+<FONT color="green">176</FONT>          case '/': case '?': case '#': return null;<a name="line.176"></a>
+<FONT color="green">177</FONT>          default: break;<a name="line.177"></a>
+<FONT color="green">178</FONT>          }<a name="line.178"></a>
+<FONT color="green">179</FONT>        }<a name="line.179"></a>
+<FONT color="green">180</FONT>        int end = url.length();<a name="line.180"></a>
+<FONT color="green">181</FONT>        for (int i = start; i &lt; end; ++i) {<a name="line.181"></a>
+<FONT color="green">182</FONT>          switch (url.charAt(i)) {<a name="line.182"></a>
+<FONT color="green">183</FONT>          case '/': case '?': case '#': end = i; break;<a name="line.183"></a>
+<FONT color="green">184</FONT>          default: break;<a name="line.184"></a>
+<FONT color="green">185</FONT>          }<a name="line.185"></a>
+<FONT color="green">186</FONT>        }<a name="line.186"></a>
+<FONT color="green">187</FONT>        if (start &lt; end) {<a name="line.187"></a>
+<FONT color="green">188</FONT>          return url.substring(start, end);<a name="line.188"></a>
+<FONT color="green">189</FONT>        } else {<a name="line.189"></a>
+<FONT color="green">190</FONT>          return null;<a name="line.190"></a>
+<FONT color="green">191</FONT>        }<a name="line.191"></a>
+<FONT color="green">192</FONT>      }<a name="line.192"></a>
+<FONT color="green">193</FONT>    }<a name="line.193"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</PRE>
+</BODY>
+</HTML>
diff --git a/distrib/lib/owasp-java-html-sanitizer-javadoc.jar b/distrib/lib/owasp-java-html-sanitizer-javadoc.jar
index 20b919f..ed9d9d6 100644
--- a/distrib/lib/owasp-java-html-sanitizer-javadoc.jar
+++ b/distrib/lib/owasp-java-html-sanitizer-javadoc.jar
Binary files differ
diff --git a/distrib/lib/owasp-java-html-sanitizer-sources.jar b/distrib/lib/owasp-java-html-sanitizer-sources.jar
index e63fec4..b537ae3 100644
--- a/distrib/lib/owasp-java-html-sanitizer-sources.jar
+++ b/distrib/lib/owasp-java-html-sanitizer-sources.jar
Binary files differ
diff --git a/distrib/lib/owasp-java-html-sanitizer.jar b/distrib/lib/owasp-java-html-sanitizer.jar
index af6f3e3..b2ab169 100644
--- a/distrib/lib/owasp-java-html-sanitizer.jar
+++ b/distrib/lib/owasp-java-html-sanitizer.jar
Binary files differ