http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/51c3b7e5/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
----------------------------------------------------------------------
diff --git 
a/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html 
b/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
index 30d612b..a3e6eb6 100644
--- a/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
+++ b/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_144) on Sun Oct 15 21:19:44 EDT 2017 -->
+<!-- Generated by javadoc (1.8.0_144) on Sat Nov 11 19:25:48 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>CallPlaceCustomDataInitializationException (FreeMarker 
2.3.27-incubating API)</title>
-<meta name="date" content="2017-10-15">
+<meta name="date" content="2017-11-11">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -92,13 +92,13 @@
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
+<li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>java.lang.Throwable</li>
 <li>
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>java.lang.Exception</li>
 <li>
 <ul class="inheritance">
 <li>freemarker.core.CallPlaceCustomDataInitializationException</li>
@@ -114,12 +114,12 @@
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a></dd>
+<dd>java.io.Serializable</dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span 
class="typeNameLabel">CallPlaceCustomDataInitializationException</span>
-extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception</a></pre>
+extends java.lang.Exception</pre>
 <div class="block">Thrown by <a 
href="../../freemarker/core/DirectiveCallPlace.html#getOrCreateCustomData-java.lang.Object-freemarker.template.utility.ObjectFactory-"><code>DirectiveCallPlace.getOrCreateCustomData(Object,
 freemarker.template.utility.ObjectFactory)</code></a></div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
@@ -145,8 +145,8 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.ht
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CallPlaceCustomDataInitializationException.html#CallPlaceCustomDataInitializationException-java.lang.String-java.lang.Throwable-">CallPlaceCustomDataInitializationException</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;message,
-                                          <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in 
java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CallPlaceCustomDataInitializationException.html#CallPlaceCustomDataInitializationException-java.lang.String-java.lang.Throwable-">CallPlaceCustomDataInitializationException</a></span>(java.lang.String&nbsp;message,
+                                          
java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -161,15 +161,15 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.ht
 <li class="blockList"><a 
name="methods.inherited.from.class.java.lang.Throwable">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-";
 title="class or interface in java.lang">addSuppressed</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--";
 title="class or interface in java.lang">fillInStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--";
 title="class or interface in java.lang">getCause</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--";
 title="class or interface in java.lang">getLocalizedMessage</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--";
 title="class or interface in java.lang">getMessage</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--";
 title="class or inter
 face in java.lang">getStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--";
 title="class or interface in java.lang">getSuppressed</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-";
 title="class or interface in java.lang">initCause</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--";
 title="class or interface in java.lang">printStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-";
 title="class or interface in java.lang">printStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-";
 title="class or interface in java.lang">printStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lan
 
g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" 
title="class or interface in java.lang">setStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, 
getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, 
printStackTrace, printStackTrace, setStackTrace, toString</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, 
wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -191,8 +191,8 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CallPlaceCustomDataInitializationException</h4>
-<pre>public&nbsp;CallPlaceCustomDataInitializationException(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;message,
-                                                  <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+<pre>public&nbsp;CallPlaceCustomDataInitializationException(java.lang.String&nbsp;message,
+                                                  
java.lang.Throwable&nbsp;cause)</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/51c3b7e5/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CombinedMarkupOutputFormat.html 
b/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
index 741e75d..9b35b2a 100644
--- a/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
+++ b/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_144) on Sun Oct 15 21:19:44 EDT 2017 -->
+<!-- Generated by javadoc (1.8.0_144) on Sat Nov 11 19:25:48 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>CombinedMarkupOutputFormat (FreeMarker 2.3.27-incubating API)</title>
-<meta name="date" content="2017-10-15">
+<meta name="date" content="2017-11-11">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
+<li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../freemarker/core/OutputFormat.html" title="class in 
freemarker.core">freemarker.core.OutputFormat</a></li>
@@ -157,7 +157,7 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name,
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat</a></span>(java.lang.String&nbsp;name,
                           <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in 
freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
                           <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in 
freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</code>&nbsp;</td>
 </tr>
@@ -177,8 +177,8 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in 
java.lang">String</a>&nbsp;plainTextContent)</code>
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</a></span>(java.lang.String&nbsp;plainTextContent)</code>
 <div class="block">Should give the same result as <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>
 and then
  <a 
href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>,
 but the implementation may uses a more efficient solution.</div>
 </td>
@@ -188,13 +188,13 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#getInnerOutputFormat--">getInnerOutputFormat</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
 <div class="block">Returns the MIME type of the output format.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#getName--">getName</a></span>()</code>
 <div class="block">The short name used to refer to this format (like in the 
<code>#ftl</code> header).</div>
 </td>
@@ -211,7 +211,7 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;builtInName)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</a></span>(java.lang.String&nbsp;builtInName)</code>
 <div class="block">Tells if a string built-in that can't handle a <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand 
can bypass
  this object as is.</div>
 </td>
@@ -225,15 +225,15 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>protected <a 
href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" 
title="class in 
freemarker.core">TemplateCombinedMarkupOutputModel</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;plainTextContent,
-                            <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;markupContent)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></span>(java.lang.String&nbsp;plainTextContent,
+                            java.lang.String&nbsp;markupContent)</code>
 <div class="block">Creates a new <a 
href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class 
in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's 
bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in 
freemarker.core"><code>OutputFormat</code></a> instance.</div>
 </td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;textToEsc,
-      <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CombinedMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></span>(java.lang.String&nbsp;textToEsc,
+      java.io.Writer&nbsp;out)</code>
 <div class="block">Equivalent to calling <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>
 and then
  <a 
href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel,
 Writer)</code></a>, but the implementation may uses a more efficient 
solution.</div>
 </td>
@@ -257,8 +257,8 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, 
wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -292,7 +292,7 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CombinedMarkupOutputFormat</h4>
-<pre>public&nbsp;CombinedMarkupOutputFormat(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;name,
+<pre>public&nbsp;CombinedMarkupOutputFormat(java.lang.String&nbsp;name,
                                   <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in 
freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
                                   <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in 
freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</pre>
 <dl>
@@ -316,7 +316,7 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <ul class="blockList">
 <li class="blockList">
 <h4>getName</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
 <div class="block">The short name used to refer to this format (like in the 
<code>#ftl</code> header).</div>
 <dl>
@@ -331,7 +331,7 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <ul class="blockList">
 <li class="blockList">
 <h4>getMimeType</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<pre>public&nbsp;java.lang.String&nbsp;getMimeType()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
 <div class="block">Returns the MIME type of the output format. This might 
comes handy when generating a HTTP response. <code>null</code>
  <code>null</code> if this output format doesn't clearly corresponds to a 
specific MIME type.</div>
@@ -347,9 +347,9 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <ul class="blockList">
 <li class="blockList">
 <h4>output</h4>
-<pre>public&nbsp;void&nbsp;output(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;textToEsc,
-                   <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a>&nbsp;out)
-            throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a>,
+<pre>public&nbsp;void&nbsp;output(java.lang.String&nbsp;textToEsc,
+                   java.io.Writer&nbsp;out)
+            throws java.io.IOException,
                    <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
 <div class="block">Equivalent to calling <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>
 and then
@@ -358,7 +358,7 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></code>&nbsp;in
 class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" 
title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a 
href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" 
title="class in 
freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+<dd><code>java.io.IOException</code></dd>
 <dd><code><a href="../../freemarker/template/TemplateModelException.html" 
title="class in freemarker.template">TemplateModelException</a></code></dd>
 </dl>
 </li>
@@ -369,8 +369,8 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <ul class="blockList">
 <li class="blockList">
 <h4>escapePlainText</h4>
-<pre>public&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;escapePlainText(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;plainTextContent)
-                       throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
+<pre>public&nbsp;java.lang.String&nbsp;escapePlainText(java.lang.String&nbsp;plainTextContent)
+                                 throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">MarkupOutputFormat</a></code></span></div>
 <div class="block">Should give the same result as <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>
 and then
  <a 
href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>,
 but the implementation may uses a more efficient solution.</div>
@@ -388,7 +388,7 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <ul class="blockList">
 <li class="blockList">
 <h4>isLegacyBuiltInBypassed</h4>
-<pre>public&nbsp;boolean&nbsp;isLegacyBuiltInBypassed(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;builtInName)
+<pre>public&nbsp;boolean&nbsp;isLegacyBuiltInBypassed(java.lang.String&nbsp;builtInName)
                                 throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">MarkupOutputFormat</a></code></span></div>
 <div class="block">Tells if a string built-in that can't handle a <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand 
can bypass
@@ -469,8 +469,8 @@ extends <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <ul class="blockListLast">
 <li class="blockList">
 <h4>newTemplateMarkupOutputModel</h4>
-<pre>protected&nbsp;<a 
href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" 
title="class in 
freemarker.core">TemplateCombinedMarkupOutputModel</a>&nbsp;newTemplateMarkupOutputModel(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;plainTextContent,
-                                                                         <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;markupContent)</pre>
+<pre>protected&nbsp;<a 
href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" 
title="class in 
freemarker.core">TemplateCombinedMarkupOutputModel</a>&nbsp;newTemplateMarkupOutputModel(java.lang.String&nbsp;plainTextContent,
+                                                                         
java.lang.String&nbsp;markupContent)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonMarkupOutputFormat</a></code></span></div>
 <div class="block">Creates a new <a 
href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class 
in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's 
bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in 
freemarker.core"><code>OutputFormat</code></a> instance.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/51c3b7e5/docs/api/freemarker/core/CommandLine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CommandLine.html 
b/docs/api/freemarker/core/CommandLine.html
index 1cbeb22..c194e01 100644
--- a/docs/api/freemarker/core/CommandLine.html
+++ b/docs/api/freemarker/core/CommandLine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_144) on Sun Oct 15 21:19:44 EDT 2017 -->
+<!-- Generated by javadoc (1.8.0_144) on Sat Nov 11 19:25:48 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>CommandLine (FreeMarker 2.3.27-incubating API)</title>
-<meta name="date" content="2017-10-15">
+<meta name="date" content="2017-11-11">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
+<li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
 <li>freemarker.core.CommandLine</li>
@@ -113,9 +113,9 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Will be removed (main 
method in a library, often classified as CWE-489 "Leftover Debug 
Code").</span></div>
 </div>
 <br>
-<pre><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true";
 title="class or interface in java.lang">@Deprecated</a>
+<pre>@Deprecated
 public class <span class="typeNameLabel">CommandLine</span>
-extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
+extends java.lang.Object</pre>
 <div class="block">FreeMarker command-line utility, the Main-Class of 
<tt>freemarker.jar</tt>.
  Currently it just prints the version number.</div>
 </li>
@@ -157,7 +157,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommandLine.html#main-java.lang.String:A-">main</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>[]&nbsp;args)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommandLine.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 &nbsp;</td>
 </tr>
@@ -166,8 +166,8 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, 
toString, wait, wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -207,7 +207,7 @@ extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;main(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
+<pre>public static&nbsp;void&nbsp;main(java.lang.String[]&nbsp;args)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/51c3b7e5/docs/api/freemarker/core/CommonMarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CommonMarkupOutputFormat.html 
b/docs/api/freemarker/core/CommonMarkupOutputFormat.html
index 4b9569c..514a717 100644
--- a/docs/api/freemarker/core/CommonMarkupOutputFormat.html
+++ b/docs/api/freemarker/core/CommonMarkupOutputFormat.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_144) on Sun Oct 15 21:19:44 EDT 2017 -->
+<!-- Generated by javadoc (1.8.0_144) on Sat Nov 11 19:25:48 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>CommonMarkupOutputFormat (FreeMarker 2.3.27-incubating API)</title>
-<meta name="date" content="2017-10-15">
+<meta name="date" content="2017-11-11">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
+<li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../freemarker/core/OutputFormat.html" title="class in 
freemarker.core">freemarker.core.OutputFormat</a></li>
@@ -179,26 +179,26 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;markupText)</code>
-<div class="block">Wraps a <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang"><code>String</code></a> that's already 
markup to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" 
title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> 
interface, to indicate its
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</a></span>(java.lang.String&nbsp;markupText)</code>
+<div class="block">Wraps a <code>String</code> that's already markup to <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a> interface, to 
indicate its
  format.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;textToEsc)</code>
-<div class="block">Converts a <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang"><code>String</code></a> that's assumed 
to be plain text to <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</a></span>(java.lang.String&nbsp;textToEsc)</code>
+<div class="block">Converts a <code>String</code> that's assumed to be plain 
text to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" 
title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
  special characters in the plain text.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a></span>(<a
 href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>
 <div class="block">Returns the content as markup text; never 
<code>null</code>.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a></span>(<a
 href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>
 <div class="block">If this <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created with <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>,
 it returns
  the original plain text, otherwise it returns <code>null</code>.</div>
@@ -225,22 +225,22 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>protected abstract <a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;plainTextContent,
-                            <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;markupContent)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></span>(java.lang.String&nbsp;plainTextContent,
+                            java.lang.String&nbsp;markupContent)</code>
 <div class="block">Creates a new <a 
href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class 
in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's 
bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in 
freemarker.core"><code>OutputFormat</code></a> instance.</div>
 </td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></span>(<a
 href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo,
-      <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+      java.io.Writer&nbsp;out)</code>
 <div class="block">Prints the parameter model to the output.</div>
 </td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;textToEsc,
-      <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></span>(java.lang.String&nbsp;textToEsc,
+      java.io.Writer&nbsp;out)</code>
 <div class="block">Equivalent to calling <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>
 and then
  <a 
href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel,
 Writer)</code></a>, but the implementation may uses a more efficient 
solution.</div>
 </td>
@@ -264,8 +264,8 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, 
wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -304,10 +304,10 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>fromPlainTextByEscaping</h4>
-<pre>public final&nbsp;<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;fromPlainTextByEscaping(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;textToEsc)
+<pre>public final&nbsp;<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in 
CommonMarkupOutputFormat">MO</a>&nbsp;fromPlainTextByEscaping(java.lang.String&nbsp;textToEsc)
                                  throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">MarkupOutputFormat</a></code></span></div>
-<div class="block">Converts a <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang"><code>String</code></a> that's assumed 
to be plain text to <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
+<div class="block">Converts a <code>String</code> that's assumed to be plain 
text to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" 
title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
  special characters in the plain text. This corresponds to <code>?esc</code>, 
or, to outputting with auto-escaping if
  that wasn't using <a 
href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-"><code>MarkupOutputFormat.output(String,
 Writer)</code></a> as an optimization.</div>
 <dl>
@@ -327,10 +327,10 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>fromMarkup</h4>
-<pre>public final&nbsp;<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;fromMarkup(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;markupText)
+<pre>public final&nbsp;<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in 
CommonMarkupOutputFormat">MO</a>&nbsp;fromMarkup(java.lang.String&nbsp;markupText)
                     throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-">MarkupOutputFormat</a></code></span></div>
-<div class="block">Wraps a <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang"><code>String</code></a> that's already 
markup to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" 
title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> 
interface, to indicate its
+<div class="block">Wraps a <code>String</code> that's already markup to <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a> interface, to 
indicate its
  format. This corresponds to <code>?noEsc</code>. (This methods is allowed to 
throw <a href="../../freemarker/template/TemplateModelException.html" 
title="class in freemarker.template"><code>TemplateModelException</code></a> if
  the parameter markup text is malformed, but it's unlikely that an 
implementation chooses to parse the parameter
  until, and if ever, that becomes necessary.)</div>
@@ -353,8 +353,8 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <li class="blockList">
 <h4>output</h4>
 <pre>public final&nbsp;void&nbsp;output(<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo,
-                         <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a>&nbsp;out)
-                  throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a>,
+                         java.io.Writer&nbsp;out)
+                  throws java.io.IOException,
                          <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
 <div class="block">Prints the parameter model to the output.</div>
@@ -362,7 +362,7 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></code>&nbsp;in
 class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" 
title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a> extends <a 
href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class 
in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+<dd><code>java.io.IOException</code></dd>
 <dd><code><a href="../../freemarker/template/TemplateModelException.html" 
title="class in freemarker.template">TemplateModelException</a></code></dd>
 </dl>
 </li>
@@ -373,9 +373,9 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>output</h4>
-<pre>public abstract&nbsp;void&nbsp;output(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;textToEsc,
-                            <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true";
 title="class or interface in java.io">Writer</a>&nbsp;out)
-                     throws <a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a>,
+<pre>public abstract&nbsp;void&nbsp;output(java.lang.String&nbsp;textToEsc,
+                            java.io.Writer&nbsp;out)
+                     throws java.io.IOException,
                             <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
 <div class="block">Equivalent to calling <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>
 and then
@@ -384,7 +384,7 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a 
href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></code>&nbsp;in
 class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" 
title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a> extends <a 
href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class 
in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true";
 title="class or interface in java.io">IOException</a></code></dd>
+<dd><code>java.io.IOException</code></dd>
 <dd><code><a href="../../freemarker/template/TemplateModelException.html" 
title="class in freemarker.template">TemplateModelException</a></code></dd>
 </dl>
 </li>
@@ -397,8 +397,8 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getSourcePlainText</h4>
-<pre>public final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;getSourcePlainText(<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)
-                                throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
+<pre>public final&nbsp;java.lang.String&nbsp;getSourcePlainText(<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)
+                                          throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#getSourcePlainText-MO-">MarkupOutputFormat</a></code></span></div>
 <div class="block">If this <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created with <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>,
 it returns
  the original plain text, otherwise it returns <code>null</code>. Useful for 
converting between different types
@@ -420,8 +420,8 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>getMarkupString</h4>
-<pre>public final&nbsp;<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;getMarkupString(<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)
-                             throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
+<pre>public final&nbsp;java.lang.String&nbsp;getMarkupString(<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)
+                                       throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-">MarkupOutputFormat</a></code></span></div>
 <div class="block">Returns the content as markup text; never 
<code>null</code>. If this <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created
  with <a 
href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-"><code>MarkupOutputFormat.fromMarkup(String)</code></a>,
 it might returns the original markup text literally, but this is not required
@@ -526,8 +526,8 @@ extends <a 
href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <ul class="blockListLast">
 <li class="blockList">
 <h4>newTemplateMarkupOutputModel</h4>
-<pre>protected abstract&nbsp;<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in 
CommonMarkupOutputFormat">MO</a>&nbsp;newTemplateMarkupOutputModel(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;plainTextContent,
-                                                   <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;markupContent)
+<pre>protected abstract&nbsp;<a 
href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type 
parameter in 
CommonMarkupOutputFormat">MO</a>&nbsp;newTemplateMarkupOutputModel(java.lang.String&nbsp;plainTextContent,
+                                                   
java.lang.String&nbsp;markupContent)
                                             throws <a 
href="../../freemarker/template/TemplateModelException.html" title="class in 
freemarker.template">TemplateModelException</a></pre>
 <div class="block">Creates a new <a 
href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class 
in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's 
bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in 
freemarker.core"><code>OutputFormat</code></a> instance.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/51c3b7e5/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html 
b/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
index 123426f..c05db53 100644
--- a/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
+++ b/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_144) on Sun Oct 15 21:19:44 EDT 2017 -->
+<!-- Generated by javadoc (1.8.0_144) on Sat Nov 11 19:25:48 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>CommonTemplateMarkupOutputModel (FreeMarker 2.3.27-incubating 
API)</title>
-<meta name="date" content="2017-10-15">
+<meta name="date" content="2017-11-11">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
+<li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
 <li>freemarker.core.CommonTemplateMarkupOutputModel&lt;MO&gt;</li>
@@ -119,7 +119,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public abstract class <span 
class="typeNameLabel">CommonTemplateMarkupOutputModel&lt;MO extends 
CommonTemplateMarkupOutputModel&lt;MO&gt;&gt;</span>
-extends <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>
+extends java.lang.Object
 implements <a href="../../freemarker/core/TemplateMarkupOutputModel.html" 
title="interface in 
freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;</pre>
 <div class="block">Common superclass for implementing <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in 
freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
  <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in 
freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.
@@ -167,8 +167,8 @@ implements <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title=
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>protected </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#CommonTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonTemplateMarkupOutputModel</a></span>(<a
 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;plainTextContent,
-                               <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;markupContent)</code>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#CommonTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonTemplateMarkupOutputModel</a></span>(java.lang.String&nbsp;plainTextContent,
+                               java.lang.String&nbsp;markupContent)</code>
 <div class="block">A least one of the parameters must be 
non-<code>null</code>!</div>
 </td>
 </tr>
@@ -198,8 +198,8 @@ implements <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title=
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, 
toString, wait, wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -221,8 +221,8 @@ implements <a 
href="../../freemarker/core/TemplateMarkupOutputModel.html" title=
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CommonTemplateMarkupOutputModel</h4>
-<pre>protected&nbsp;CommonTemplateMarkupOutputModel(<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;plainTextContent,
-                                          <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&nbsp;markupContent)</pre>
+<pre>protected&nbsp;CommonTemplateMarkupOutputModel(java.lang.String&nbsp;plainTextContent,
+                                          
java.lang.String&nbsp;markupContent)</pre>
 <div class="block">A least one of the parameters must be 
non-<code>null</code>!</div>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/51c3b7e5/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
----------------------------------------------------------------------
diff --git 
a/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html 
b/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
index 53d4057..12349d1 100644
--- a/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
+++ b/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_144) on Sun Oct 15 21:19:44 EDT 2017 -->
+<!-- Generated by javadoc (1.8.0_144) on Sat Nov 11 19:25:48 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Configurable.SettingValueAssignmentException (FreeMarker 
2.3.27-incubating API)</title>
-<meta name="date" content="2017-10-15">
+<meta name="date" content="2017-11-11">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -92,13 +92,13 @@
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
+<li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>java.lang.Throwable</li>
 <li>
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>java.lang.Exception</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../freemarker/template/TemplateException.html" title="class in 
freemarker.template">freemarker.template.TemplateException</a></li>
@@ -124,7 +124,7 @@
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a></dd>
+<dd>java.io.Serializable</dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
@@ -165,15 +165,15 @@ extends freemarker.core._MiscTemplateException</pre>
 <li class="blockList"><a 
name="methods.inherited.from.class.java.lang.Throwable">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-";
 title="class or interface in java.lang">addSuppressed</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--";
 title="class or interface in java.lang">fillInStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--";
 title="class or interface in java.lang">getCause</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--";
 title="class or interface in java.lang">getLocalizedMessage</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--";
 title="class or interface in java.lang">getStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--";
 title="class or
  interface in java.lang">getSuppressed</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-";
 title="class or interface in java.lang">initCause</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--";
 title="class or interface in java.lang">printStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-";
 title="class or interface in java.lang">setStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, 
getStackTrace, getSuppressed, initCause, printStackTrace, setStackTrace, 
toString</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, 
wait, wait</code></li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/51c3b7e5/docs/api/freemarker/core/Configurable.UnknownSettingException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/Configurable.UnknownSettingException.html 
b/docs/api/freemarker/core/Configurable.UnknownSettingException.html
index dad6cfe..eeadf30 100644
--- a/docs/api/freemarker/core/Configurable.UnknownSettingException.html
+++ b/docs/api/freemarker/core/Configurable.UnknownSettingException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_144) on Sun Oct 15 21:19:44 EDT 2017 -->
+<!-- Generated by javadoc (1.8.0_144) on Sat Nov 11 19:25:48 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Configurable.UnknownSettingException (FreeMarker 2.3.27-incubating 
API)</title>
-<meta name="date" content="2017-10-15">
+<meta name="date" content="2017-11-11">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" 
title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -92,13 +92,13 @@
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">java.lang.Object</a></li>
+<li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>java.lang.Throwable</li>
 <li>
 <ul class="inheritance">
-<li><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>java.lang.Exception</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../freemarker/template/TemplateException.html" title="class in 
freemarker.template">freemarker.template.TemplateException</a></li>
@@ -124,7 +124,7 @@
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a 
href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable</a></dd>
+<dd>java.io.Serializable</dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
@@ -162,15 +162,15 @@ extends freemarker.core._MiscTemplateException</pre>
 <li class="blockList"><a 
name="methods.inherited.from.class.java.lang.Throwable">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true";
 title="class or interface in java.lang">Throwable</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-";
 title="class or interface in java.lang">addSuppressed</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--";
 title="class or interface in java.lang">fillInStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--";
 title="class or interface in java.lang">getCause</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--";
 title="class or interface in java.lang">getLocalizedMessage</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--";
 title="class or interface in java.lang">getStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--";
 title="class or
  interface in java.lang">getSuppressed</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-";
 title="class or interface in java.lang">initCause</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--";
 title="class or interface in java.lang">printStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-";
 title="class or interface in java.lang">setStackTrace</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--";
 title="class or interface in java.lang">toString</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, 
getStackTrace, getSuppressed, initCause, printStackTrace, setStackTrace, 
toString</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;java.lang.<a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></h3>
-<code><a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--";
 title="class or interface in java.lang">clone</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-";
 title="class or interface in java.lang">equals</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--";
 title="class or interface in java.lang">finalize</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--";
 title="class or interface in java.lang">getClass</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--";
 title="class or interface in java.lang">hashCode</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--";
 title="class or interface in java.lang">notify</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in 
java.lang">notifyAll</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-";
 title="class or interface in java.lang">wait</a>, <a 
href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-";
 title="class or interface in java.lang">wait</a></code></li>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, 
wait, wait</code></li>
 </ul>
 </li>
 </ul>

Reply via email to