freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [10/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.
Date Mon, 28 Mar 2016 15:26:58 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/Configuration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/Configuration.html b/docs/api/freemarker/template/class-use/Configuration.html
index 3444ef5..33455ff 100644
--- a/docs/api/freemarker/template/class-use/Configuration.html
+++ b/docs/api/freemarker/template/class-use/Configuration.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.Configuration (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.Configuration (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.Configuration (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.Configuration (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -121,6 +121,22 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </a>
 <h3>Uses of <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</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/cache/package-summary.html">freemarker.cache</a> that return <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</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="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateConfigurationFactory.html#getConfiguration--">getConfiguration</a></span>()</code>
+<div class="block">Returns the configuration this object belongs to, or <code>null</code> if it isn't yet bound to a
+ <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
 <caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> with parameters of type <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -129,12 +145,38 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Binds this <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> to a <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateCache.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">Use the <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> constructor.</span></div>
 </div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Calls <a href="../../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">MergingTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/MergingTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">FirstMatchTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">ConditionalTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/ConditionalTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
@@ -157,9 +199,21 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
              <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
              <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
              <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
-             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
+             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
+<div class="block">Same as
+ <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, TemplateLookupStrategy, TemplateNameFormat,
+ TemplateConfigurationFactory, Configuration)</code></a> with <code>null</code> for <code>templateConfigurations</code>-s.</div>
+</td>
 </tr>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
+             <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
+             <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
+             <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
+             <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>&nbsp;templateConfigurations,
+             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
              <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
 <div class="block">Same as <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> with a new <a href="../../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache"><code>SoftCacheStorage</code></a>
@@ -184,6 +238,12 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colFirst"><code><a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getConfiguration--">getConfiguration</a></span>()</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#getParentConfiguration--">getParentConfiguration</a></span>()</code>
+<div class="block">Returns the parent <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, or <code>null</code> if none was associated yet.</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -206,6 +266,13 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">Sets the value of a <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>-scope attribute in the given <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-">setParentConfiguration</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Associates this instance with a <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>; usually you don't call this, as it's called internally
+ when this instance is added to a <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -291,7 +358,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                     <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;sourceName,
                     <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;content,
                     <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
-<div class="block">Creates a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
+<div class="block">Creates (not "get"-s) a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -346,6 +413,17 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </td>
 </tr>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-freemarker.core.ParserConfiguration-java.lang.String-">Template</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;sourceName,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+        <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
+        <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>&nbsp;customParserConfiguration,
+        <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)</code>
+<div class="block">Same as <a href="../../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template.Template(String, String, Reader, Configuration, String)</code></a>, but also specifies a
+ <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-">Template</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;sourceName,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/DefaultArrayAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultArrayAdapter.html b/docs/api/freemarker/template/class-use/DefaultArrayAdapter.html
index dbd3841..71f0083 100644
--- a/docs/api/freemarker/template/class-use/DefaultArrayAdapter.html
+++ b/docs/api/freemarker/template/class-use/DefaultArrayAdapter.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.DefaultArrayAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.DefaultArrayAdapter (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.DefaultArrayAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultArrayAdapter (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/DefaultIteratorAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultIteratorAdapter.html b/docs/api/freemarker/template/class-use/DefaultIteratorAdapter.html
index fca5004..2acfb3c 100644
--- a/docs/api/freemarker/template/class-use/DefaultIteratorAdapter.html
+++ b/docs/api/freemarker/template/class-use/DefaultIteratorAdapter.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.DefaultIteratorAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.DefaultIteratorAdapter (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.DefaultIteratorAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultIteratorAdapter (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/DefaultListAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultListAdapter.html b/docs/api/freemarker/template/class-use/DefaultListAdapter.html
index d2c65bc..06b5ec6 100644
--- a/docs/api/freemarker/template/class-use/DefaultListAdapter.html
+++ b/docs/api/freemarker/template/class-use/DefaultListAdapter.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.DefaultListAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.DefaultListAdapter (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.DefaultListAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultListAdapter (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/DefaultMapAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultMapAdapter.html b/docs/api/freemarker/template/class-use/DefaultMapAdapter.html
index cf1fdb3..af8f432 100644
--- a/docs/api/freemarker/template/class-use/DefaultMapAdapter.html
+++ b/docs/api/freemarker/template/class-use/DefaultMapAdapter.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.DefaultMapAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.DefaultMapAdapter (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.DefaultMapAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultMapAdapter (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/DefaultNonListCollectionAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultNonListCollectionAdapter.html b/docs/api/freemarker/template/class-use/DefaultNonListCollectionAdapter.html
index ee2819d..ea40115 100644
--- a/docs/api/freemarker/template/class-use/DefaultNonListCollectionAdapter.html
+++ b/docs/api/freemarker/template/class-use/DefaultNonListCollectionAdapter.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.DefaultNonListCollectionAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.DefaultNonListCollectionAdapter (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.DefaultNonListCollectionAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultNonListCollectionAdapter (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/DefaultObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultObjectWrapper.html b/docs/api/freemarker/template/class-use/DefaultObjectWrapper.html
index 0d68187..a32da57 100644
--- a/docs/api/freemarker/template/class-use/DefaultObjectWrapper.html
+++ b/docs/api/freemarker/template/class-use/DefaultObjectWrapper.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.DefaultObjectWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.DefaultObjectWrapper (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.DefaultObjectWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultObjectWrapper (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/DefaultObjectWrapperBuilder.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultObjectWrapperBuilder.html b/docs/api/freemarker/template/class-use/DefaultObjectWrapperBuilder.html
index b3a0596..ccfd4e3 100644
--- a/docs/api/freemarker/template/class-use/DefaultObjectWrapperBuilder.html
+++ b/docs/api/freemarker/template/class-use/DefaultObjectWrapperBuilder.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.DefaultObjectWrapperBuilder (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.DefaultObjectWrapperBuilder (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.DefaultObjectWrapperBuilder (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultObjectWrapperBuilder (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/DefaultObjectWrapperConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/DefaultObjectWrapperConfiguration.html b/docs/api/freemarker/template/class-use/DefaultObjectWrapperConfiguration.html
index 93c70cb..9ef4f87 100644
--- a/docs/api/freemarker/template/class-use/DefaultObjectWrapperConfiguration.html
+++ b/docs/api/freemarker/template/class-use/DefaultObjectWrapperConfiguration.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.DefaultObjectWrapperConfiguration (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.DefaultObjectWrapperConfiguration (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.DefaultObjectWrapperConfiguration (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.DefaultObjectWrapperConfiguration (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/LocalizedString.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/LocalizedString.html b/docs/api/freemarker/template/class-use/LocalizedString.html
index c22c6f0..2a8444c 100644
--- a/docs/api/freemarker/template/class-use/LocalizedString.html
+++ b/docs/api/freemarker/template/class-use/LocalizedString.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.LocalizedString (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.LocalizedString (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.LocalizedString (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.LocalizedString (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/MalformedTemplateNameException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/MalformedTemplateNameException.html b/docs/api/freemarker/template/class-use/MalformedTemplateNameException.html
index a26365a..ceb06bd 100644
--- a/docs/api/freemarker/template/class-use/MalformedTemplateNameException.html
+++ b/docs/api/freemarker/template/class-use/MalformedTemplateNameException.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.MalformedTemplateNameException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.MalformedTemplateNameException (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.MalformedTemplateNameException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.MalformedTemplateNameException (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/ObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/ObjectWrapper.html b/docs/api/freemarker/template/class-use/ObjectWrapper.html
index e65f670..f89d210 100644
--- a/docs/api/freemarker/template/class-use/ObjectWrapper.html
+++ b/docs/api/freemarker/template/class-use/ObjectWrapper.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.ObjectWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.ObjectWrapper (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.ObjectWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.ObjectWrapper (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/ObjectWrapperAndUnwrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/ObjectWrapperAndUnwrapper.html b/docs/api/freemarker/template/class-use/ObjectWrapperAndUnwrapper.html
index 413ae46..1e87172 100644
--- a/docs/api/freemarker/template/class-use/ObjectWrapperAndUnwrapper.html
+++ b/docs/api/freemarker/template/class-use/ObjectWrapperAndUnwrapper.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.ObjectWrapperAndUnwrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.ObjectWrapperAndUnwrapper (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.ObjectWrapperAndUnwrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.ObjectWrapperAndUnwrapper (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/ResourceBundleLocalizedString.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/ResourceBundleLocalizedString.html b/docs/api/freemarker/template/class-use/ResourceBundleLocalizedString.html
index 82a3804..69c644a 100644
--- a/docs/api/freemarker/template/class-use/ResourceBundleLocalizedString.html
+++ b/docs/api/freemarker/template/class-use/ResourceBundleLocalizedString.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.ResourceBundleLocalizedString (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.ResourceBundleLocalizedString (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.ResourceBundleLocalizedString (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.ResourceBundleLocalizedString (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/SimpleCollection.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/SimpleCollection.html b/docs/api/freemarker/template/class-use/SimpleCollection.html
index 223d862..7d2ecec 100644
--- a/docs/api/freemarker/template/class-use/SimpleCollection.html
+++ b/docs/api/freemarker/template/class-use/SimpleCollection.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.SimpleCollection (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.SimpleCollection (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.SimpleCollection (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.SimpleCollection (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/SimpleDate.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/SimpleDate.html b/docs/api/freemarker/template/class-use/SimpleDate.html
index 9a9e374..aa02d7d 100644
--- a/docs/api/freemarker/template/class-use/SimpleDate.html
+++ b/docs/api/freemarker/template/class-use/SimpleDate.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.SimpleDate (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.SimpleDate (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.SimpleDate (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.SimpleDate (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/SimpleHash.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/SimpleHash.html b/docs/api/freemarker/template/class-use/SimpleHash.html
index 1c31d5a..1afa162 100644
--- a/docs/api/freemarker/template/class-use/SimpleHash.html
+++ b/docs/api/freemarker/template/class-use/SimpleHash.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.SimpleHash (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.SimpleHash (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.SimpleHash (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.SimpleHash (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/SimpleList.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/SimpleList.html b/docs/api/freemarker/template/class-use/SimpleList.html
index c142c2c..30539dd 100644
--- a/docs/api/freemarker/template/class-use/SimpleList.html
+++ b/docs/api/freemarker/template/class-use/SimpleList.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.SimpleList (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.SimpleList (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.SimpleList (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.SimpleList (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/SimpleNumber.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/SimpleNumber.html b/docs/api/freemarker/template/class-use/SimpleNumber.html
index 51043b3..e4063df 100644
--- a/docs/api/freemarker/template/class-use/SimpleNumber.html
+++ b/docs/api/freemarker/template/class-use/SimpleNumber.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.SimpleNumber (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.SimpleNumber (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.SimpleNumber (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.SimpleNumber (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/SimpleObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/SimpleObjectWrapper.html b/docs/api/freemarker/template/class-use/SimpleObjectWrapper.html
index bdc7dee..59a1834 100644
--- a/docs/api/freemarker/template/class-use/SimpleObjectWrapper.html
+++ b/docs/api/freemarker/template/class-use/SimpleObjectWrapper.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.SimpleObjectWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.SimpleObjectWrapper (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.SimpleObjectWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.SimpleObjectWrapper (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/SimpleScalar.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/SimpleScalar.html b/docs/api/freemarker/template/class-use/SimpleScalar.html
index d874601..194994e 100644
--- a/docs/api/freemarker/template/class-use/SimpleScalar.html
+++ b/docs/api/freemarker/template/class-use/SimpleScalar.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.SimpleScalar (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.SimpleScalar (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.SimpleScalar (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.SimpleScalar (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/SimpleSequence.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/SimpleSequence.html b/docs/api/freemarker/template/class-use/SimpleSequence.html
index f25f6ec..c3d1605 100644
--- a/docs/api/freemarker/template/class-use/SimpleSequence.html
+++ b/docs/api/freemarker/template/class-use/SimpleSequence.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.SimpleSequence (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.SimpleSequence (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.SimpleSequence (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.SimpleSequence (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/Template.WrongEncodingException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/Template.WrongEncodingException.html b/docs/api/freemarker/template/class-use/Template.WrongEncodingException.html
index 47f73bc..ee04a81 100644
--- a/docs/api/freemarker/template/class-use/Template.WrongEncodingException.html
+++ b/docs/api/freemarker/template/class-use/Template.WrongEncodingException.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.Template.WrongEncodingException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.Template.WrongEncodingException (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.Template.WrongEncodingException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.Template.WrongEncodingException (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/Template.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/Template.html b/docs/api/freemarker/template/class-use/Template.html
index 836ad71..401d138 100644
--- a/docs/api/freemarker/template/class-use/Template.html
+++ b/docs/api/freemarker/template/class-use/Template.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.Template (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.Template (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.Template (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.Template (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -188,8 +188,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateForImporting-java.lang.String-">getTemplateForImporting</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">Gets a template for importing; used with
- <a href="../../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-"><code>Environment.importLib(Template importedTemplate, String namespace)</code></a>.</div>
+<div class="block">Gets a template for importing; used with <a href="../../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-"><code>Environment.importLib(Template importedTemplate, String namespace)</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -198,7 +197,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                        <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">Same as <a href="../../../freemarker/core/Environment.html#getTemplateForInclusion-java.lang.String-java.lang.String-boolean-boolean-"><code>Environment.getTemplateForInclusion(String, String, boolean, boolean)</code></a> with <code>false</code>
- <code>ignoreMissign</code> argument.</div>
+ <code>ignoreMissing</code> argument.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -220,26 +219,33 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-">apply</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
+<div class="block">Sets the settings of the <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> which are not yet set in the <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> and are set in this
+ <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, leaves the other settings as is.</div>
+</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">CustomAttribute.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CustomAttribute.html#get-freemarker.template.Template-">get</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block">Gets the value of a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-scope attribute from the given <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <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-freemarker.template.Template-java.lang.String-">importLib</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;loadedTemplate,
          <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.</div>
 </td>
 </tr>
-<tr class="altColor">
+<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="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateClassResolver.html#resolve-java.lang.String-freemarker.core.Environment-freemarker.template.Template-">resolve</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;className,
        <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
@@ -247,27 +253,27 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">Gets a <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> based on the class name.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a></code></td>
 <td class="colLast"><span class="typeNameLabel">OptInTemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/OptInTemplateClassResolver.html#resolve-java.lang.String-freemarker.core.Environment-freemarker.template.Template-">resolve</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;className,
        <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
        <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <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">OptInTemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/OptInTemplateClassResolver.html#safeGetTemplateName-freemarker.template.Template-">safeGetTemplateName</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block">Extract the template name from the template object which will be matched
  against the trusted template names and pattern.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">CustomAttribute.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.template.Template-">set</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;value,
    <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block">Sets the value of a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-scope attribute in the given <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">FreeMarkerTree.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/FreeMarkerTree.html#setTemplate-freemarker.template.Template-">setTemplate</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
@@ -362,7 +368,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>process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -370,8 +376,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>process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
 </tbody>
@@ -403,7 +409,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                     <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;sourceName,
                     <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;content,
                     <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
-<div class="block">Creates a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
+<div class="block">Creates (not "get"-s) a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</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/TemplateBooleanModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateBooleanModel.html b/docs/api/freemarker/template/class-use/TemplateBooleanModel.html
index c2a6570..07405d1 100644
--- a/docs/api/freemarker/template/class-use/TemplateBooleanModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateBooleanModel.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.TemplateBooleanModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateBooleanModel (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.TemplateBooleanModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateBooleanModel (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/TemplateCollectionModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateCollectionModel.html b/docs/api/freemarker/template/class-use/TemplateCollectionModel.html
index 92bb499..0ca1f9e 100644
--- a/docs/api/freemarker/template/class-use/TemplateCollectionModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateCollectionModel.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.TemplateCollectionModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateCollectionModel (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.TemplateCollectionModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateCollectionModel (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/TemplateCollectionModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateCollectionModelEx.html b/docs/api/freemarker/template/class-use/TemplateCollectionModelEx.html
index 89b8870..cb87329 100644
--- a/docs/api/freemarker/template/class-use/TemplateCollectionModelEx.html
+++ b/docs/api/freemarker/template/class-use/TemplateCollectionModelEx.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.TemplateCollectionModelEx (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateCollectionModelEx (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.TemplateCollectionModelEx (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateCollectionModelEx (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/TemplateDateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateDateModel.html b/docs/api/freemarker/template/class-use/TemplateDateModel.html
index a3ed44e..4093e43 100644
--- a/docs/api/freemarker/template/class-use/TemplateDateModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateDateModel.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.TemplateDateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateDateModel (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.TemplateDateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateDateModel (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,7 +97,7 @@ 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.template">freemarker.template</a></td>
 <td class="colLast">
 <div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
@@ -104,6 +110,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/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</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/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</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">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="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>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>
+</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/TemplateDirectiveBody.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateDirectiveBody.html b/docs/api/freemarker/template/class-use/TemplateDirectiveBody.html
index 16248e9..12b2f75 100644
--- a/docs/api/freemarker/template/class-use/TemplateDirectiveBody.html
+++ b/docs/api/freemarker/template/class-use/TemplateDirectiveBody.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.TemplateDirectiveBody (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateDirectiveBody (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.TemplateDirectiveBody (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateDirectiveBody (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/TemplateDirectiveModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateDirectiveModel.html b/docs/api/freemarker/template/class-use/TemplateDirectiveModel.html
index da72d3c..889782f 100644
--- a/docs/api/freemarker/template/class-use/TemplateDirectiveModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateDirectiveModel.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.TemplateDirectiveModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateDirectiveModel (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.TemplateDirectiveModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateDirectiveModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -118,7 +118,11 @@ templates instead of JSP as the MVC View
 <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>


Mime
View raw message