freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [09/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.
Date Mon, 28 Mar 2016 15:26:57 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateException.html b/docs/api/freemarker/template/class-use/TemplateException.html
index dee32d0..7355dfb 100644
--- a/docs/api/freemarker/template/class-use/TemplateException.html
+++ b/docs/api/freemarker/template/class-use/TemplateException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -179,42 +179,55 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">NonMarkupOutputException</a></span></code>
+<div class="block">Indicates that a <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><code>TemplateMethodModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template"><code>TemplateNodeModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonSequenceException.html" title="class in freemarker.core">NonSequenceException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> or <a href="../../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a> value was expected, but the value
  had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> value was expected (or maybe something that can be automatically coerced
  to that), but the value had a different type.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">NonStringOrTemplateOutputException</a></span></code>
+<div class="block">Indicates that a <a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> (or maybe something that can be automatically coerced
+ to that) or <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/StopException.html" title="class in freemarker.core">StopException</a></span></code>
@@ -291,7 +304,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#applyEqualsOperatorLenient-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyEqualsOperatorLenient</a></span>(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;leftValue,
                           <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;rightValue)</code>
 <div class="block">Compares two <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s according the rules of the FTL "==" operator, except that if the two types
-     are incompatible, they are treated as non-equal instead of throwing an exception.</div>
+ are incompatible, they are treated as non-equal instead of throwing an exception.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -350,8 +363,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colFirst"><code><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-">importLib</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,
          <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;namespace)</code>
-<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate
- root relative.</div>
+<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate root relative.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -366,15 +378,14 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#include-java.lang.String-java.lang.String-boolean-">include</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,
        <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;encoding,
        boolean&nbsp;parse)</code>
-<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate
- root relative.</div>
+<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate root relative.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#include-freemarker.template.Template-">include</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;includedTemplate)</code>
-<div class="block">Processes a Template in the context of this <code>Environment</code>, including its
- output in the <code>Environment</code>'s Writer.</div>
+<div class="block">Processes a Template in the context of this <code>Environment</code>, including its output in the
+ <code>Environment</code>'s Writer.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -451,7 +462,11 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#visit-freemarker.core.TemplateElement-freemarker.template.TemplateDirectiveModel-java.util.Map-java.util.List-">visit</a></span>(freemarker.core.TemplateElement&nbsp;element,
      <a href="../../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>&nbsp;directiveModel,
      <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;args,
-     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)</code>&nbsp;</td>
+     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Should be internal API</span></div>
+</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -495,6 +510,14 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
        <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>[]&nbsp;loopVars,
        <a href="../../../freemarker/template/TemplateDirectiveBody.html" title="interface in freemarker.template">TemplateDirectiveBody</a>&nbsp;body)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">FreemarkerServlet.</span><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#processEnvironment-freemarker.core.Environment-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">processEnvironment</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
+                  javax.servlet.http.HttpServletRequest&nbsp;request,
+                  javax.servlet.http.HttpServletResponse&nbsp;response)</code>
+<div class="block">This is the method that actually executes the template.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -583,8 +606,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Template.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-">process</a></span>(<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>&nbsp;dataModel,
        <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>
-<div class="block">Executes template, using the data-model provided, writing the generated output
- to the supplied <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+<div class="block">Executes template, using the data-model provided, writing the generated output to the supplied <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
 </td>
 </tr>
 <tr class="altColor">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html b/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html
index 8b12d12..5f3b98c 100644
--- a/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html
+++ b/docs/api/freemarker/template/class-use/TemplateExceptionHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateExceptionHandler (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateExceptionHandler (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateExceptionHandler (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateExceptionHandler (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateHashModel.html b/docs/api/freemarker/template/class-use/TemplateHashModel.html
index 6012908..7b187be 100644
--- a/docs/api/freemarker/template/class-use/TemplateHashModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -348,7 +348,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateHashModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateHashModelEx.html b/docs/api/freemarker/template/class-use/TemplateHashModelEx.html
index f57bbdc..01cc5e1 100644
--- a/docs/api/freemarker/template/class-use/TemplateHashModelEx.html
+++ b/docs/api/freemarker/template/class-use/TemplateHashModelEx.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateHashModelEx (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateHashModelEx (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateHashModelEx (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateHashModelEx (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateMethodModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateMethodModel.html b/docs/api/freemarker/template/class-use/TemplateMethodModel.html
index 146ac42..52b199d 100644
--- a/docs/api/freemarker/template/class-use/TemplateMethodModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateMethodModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateMethodModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateMethodModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateMethodModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateMethodModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateMethodModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateMethodModelEx.html b/docs/api/freemarker/template/class-use/TemplateMethodModelEx.html
index 7f672f7..b422ee1 100644
--- a/docs/api/freemarker/template/class-use/TemplateMethodModelEx.html
+++ b/docs/api/freemarker/template/class-use/TemplateMethodModelEx.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateMethodModelEx (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateMethodModelEx (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateMethodModelEx (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateMethodModelEx (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModel.html b/docs/api/freemarker/template/class-use/TemplateModel.html
index e4043fd..4f19955 100644
--- a/docs/api/freemarker/template/class-use/TemplateModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -174,6 +174,22 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <!--   -->
 </a>
 <h3>Uses of <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO extends <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</span></code>
+<div class="block">"markup output" template language data-type; stores markup (some kind of "rich text" / structured format, as opposed
+ to plain text) that meant to be printed as template output.</div>
+</td>
+</tr>
+</tbody>
+</table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
 <caption><span>Classes in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that implement <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
@@ -183,8 +199,45 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO extends <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</span></code>
+<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.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></span></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></span></code>
+<div class="block">Stores combined markup to be printed; used with <a href="../../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></span></code>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></span></code>
+<div class="block">Stores RTF markup to be printed; used with <a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><code>RTFOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></span></code>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></span></code>
+<div class="block">Stores XML markup to be printed; used with <a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -203,8 +256,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getLocalVariable-java.lang.String-">getLocalVariable</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)</code>
-<div class="block">Returns the loop or macro local variable corresponding to this
- variable name.</div>
+<div class="block">Returns the loop or macro local variable corresponding to this variable name.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -234,7 +286,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#applyEqualsOperatorLenient-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyEqualsOperatorLenient</a></span>(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;leftValue,
                           <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;rightValue)</code>
 <div class="block">Compares two <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s according the rules of the FTL "==" operator, except that if the two types
-     are incompatible, they are treated as non-equal instead of throwing an exception.</div>
+ are incompatible, they are treated as non-equal instead of throwing an exception.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -567,7 +619,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>
@@ -913,7 +965,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                    javax.servlet.http.HttpServletResponse&nbsp;response,
                    <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
                    <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)</code>
-<div class="block">Called after the execution returns from template.process().</div>
+<div class="block">Called after the execution returns from <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -921,8 +973,8 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">FreemarkerServlet.</span><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#preTemplateProcess-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-freemarker.template.Template-freemarker.template.TemplateModel-">preTemplateProcess</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request,
                   javax.servlet.http.HttpServletResponse&nbsp;response,
                   <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
-                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)</code>
-<div class="block">Called before the execution is passed to template.process().</div>
+                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
+<div class="block">Called before the execution is passed to <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -1343,7 +1395,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<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>&nbsp;obj)</code>
-<div class="block">Called for an object that aren't considered to be of a "basic" Java type, like for an application specific type,
+<div class="block">Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type,
  or for a W3C DOM node.</div>
 </td>
 </tr>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateModelAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelAdapter.html b/docs/api/freemarker/template/class-use/TemplateModelAdapter.html
index 0f41878..7739cdb 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelAdapter.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelAdapter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateModelAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateModelAdapter (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateModelAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModelAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateModelException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelException.html b/docs/api/freemarker/template/class-use/TemplateModelException.html
index 1002988..c51b147 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelException.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -189,6 +189,74 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#concat-MO-MO-">concat</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo1,
+      <a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo2)</code>
+<div class="block">Returns a <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> that contains the content of both <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>
+ objects concatenated.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat</a></span>(<a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo1,
+      <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo2)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <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"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.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>
+<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>
+</tr>
+<tr 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"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><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></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#format-freemarker.template.TemplateDateModel-">format</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><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></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#format-freemarker.template.TemplateNumberModel-">format</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <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"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <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"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.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
+ format.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.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
+ special characters in the plain text.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getGlobalVariable-java.lang.String-">getGlobalVariable</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)</code>
 <div class="block">Returns the globally visible variable of the given name (or null).</div>
@@ -203,16 +271,128 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getLocalVariable-java.lang.String-">getLocalVariable</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)</code>
-<div class="block">Returns the loop or macro local variable corresponding to this
- variable name.</div>
+<div class="block">Returns the loop or macro local variable corresponding to this variable name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <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"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">Returns the content as markup text; never <code>null</code>.</div>
+</td>
+</tr>
+<tr 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="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#getNonNullDate-freemarker.template.TemplateDateModel-">getNonNullDate</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> from an <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, and throw
+ <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#getNonNullNumber-freemarker.template.TemplateNumberModel-">getNonNullNumber</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a> from an <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a>, and throws
+ <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>abstract <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"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">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>
+</td>
+</tr>
+<tr 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="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getVariable-java.lang.String-">getVariable</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)</code>
 <div class="block">Returns the variable that is visible in this context, or <code>null</code> if the variable is not found.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#isEmpty-MO-">isEmpty</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">Returns if the markup is empty (0 length).</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#isEmpty-MO-">isEmpty</a></span>(<a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.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>
+<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>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected abstract <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><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>
+<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 class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">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>
+<div class="block">Prints the parameter model to the output.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">XMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/XMLOutputFormat.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>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">XHTMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/XHTMLOutputFormat.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>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RTFOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/RTFOutputFormat.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>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.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>
+<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>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">HTMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/HTMLOutputFormat.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>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><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>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -973,7 +1153,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<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>&nbsp;obj)</code>
-<div class="block">Called for an object that aren't considered to be of a "basic" Java type, like for an application specific type,
+<div class="block">Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type,
  or for a W3C DOM node.</div>
 </td>
 </tr>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateModelIterator.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelIterator.html b/docs/api/freemarker/template/class-use/TemplateModelIterator.html
index 8b2aa2e..17ba8e1 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelIterator.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelIterator.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateModelIterator (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateModelIterator (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateModelIterator (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModelIterator (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateModelListSequence.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelListSequence.html b/docs/api/freemarker/template/class-use/TemplateModelListSequence.html
index 9866d0c..3adad1b 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelListSequence.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelListSequence.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.TemplateModelListSequence (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.TemplateModelListSequence (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.TemplateModelListSequence (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateModelListSequence (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.html b/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.html
index 4120269..06c49e2 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelWithAPISupport.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateModelWithAPISupport (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateModelWithAPISupport (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateModelWithAPISupport (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModelWithAPISupport (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateNodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateNodeModel.html b/docs/api/freemarker/template/class-use/TemplateNodeModel.html
index c76ad87..1cf98e7 100644
--- a/docs/api/freemarker/template/class-use/TemplateNodeModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateNodeModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -163,7 +163,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateNotFoundException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateNotFoundException.html b/docs/api/freemarker/template/class-use/TemplateNotFoundException.html
index 3558004..22d578d 100644
--- a/docs/api/freemarker/template/class-use/TemplateNotFoundException.html
+++ b/docs/api/freemarker/template/class-use/TemplateNotFoundException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.TemplateNotFoundException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.TemplateNotFoundException (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.TemplateNotFoundException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateNotFoundException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateNumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateNumberModel.html b/docs/api/freemarker/template/class-use/TemplateNumberModel.html
index e23c841..67a9162 100644
--- a/docs/api/freemarker/template/class-use/TemplateNumberModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateNumberModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -84,6 +84,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="#freemarker.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="#freemarker.ext.beans">freemarker.ext.beans</a></td>
 <td class="colLast">
 <div class="block">The <a href="../../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>default object wrapper</code></a> of FreeMarker uses
@@ -91,19 +97,19 @@ this to expose Java Beans and POJO-s to templates, but it can also be used in it
 better alternative <a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#freemarker.ext.jython">freemarker.ext.jython</a></td>
 <td class="colLast">
 <div class="block">Exposes <a href="http://www.jython.org" target="_blank">Jython</a> objects to templates.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#freemarker.ext.rhino">freemarker.ext.rhino</a></td>
 <td class="colLast">
 <div class="block">Exposes Rhino (ECMAScript) objects to templates.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
 <td class="colLast">
 <div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
@@ -111,7 +117,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#freemarker.template.utility">freemarker.template.utility</a></td>
 <td class="colLast">
 <div class="block">Various classes used by core FreeMarker code but might be useful outside of it too.</div>
@@ -122,6 +128,38 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </li>
 <li class="blockList">
 <ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with parameters of type <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><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></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#format-freemarker.template.TemplateNumberModel-">format</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <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"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#getNonNullNumber-freemarker.template.TemplateNumberModel-">getNonNullNumber</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a> from an <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a>, and throws
+ <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="freemarker.ext.beans">
 <!--   -->
 </a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateScalarModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateScalarModel.html b/docs/api/freemarker/template/class-use/TemplateScalarModel.html
index 9355bbc..46e9108 100644
--- a/docs/api/freemarker/template/class-use/TemplateScalarModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateScalarModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateScalarModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateScalarModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateScalarModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateScalarModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateSequenceModel.html b/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
index 923038d..dfbee8c 100644
--- a/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -200,7 +200,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>



Mime
View raw message