You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/26 11:14:48 UTC

[22/37] incubator-freemarker-site git commit: Site updates for 2.3.26.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html b/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html
index beec613..e24ae51 100644
--- a/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html
+++ b/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ObjectWrapperAndUnwrapper (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>ObjectWrapperAndUnwrapper (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="ObjectWrapperAndUnwrapper (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="ObjectWrapperAndUnwrapper (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -181,7 +181,7 @@ extends <a href="../../freemarker/template/ObjectWrapper.html" title="interface
 <tr id="i0" 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"><code><span class="memberNameLink"><a href="../../freemarker/template/ObjectWrapperAndUnwrapper.html#tryUnwrapTo-freemarker.template.TemplateModel-java.lang.Class-">tryUnwrapTo</a></span>(<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;tm,
-           <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>&nbsp;targetClass)</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>&lt;?&gt;&nbsp;targetClass)</code>
 <div class="block">Attempts to unwrap a <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> to a plain Java object that's the instance of the given class (or is
  <code>null</code>).</div>
 </td>
@@ -269,7 +269,7 @@ extends <a href="../../freemarker/template/ObjectWrapper.html" title="interface
 <li class="blockList">
 <h4>tryUnwrapTo</h4>
 <pre><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;tryUnwrapTo(<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;tm,
-                   <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>&nbsp;targetClass)
+                   <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>&lt;?&gt;&nbsp;targetClass)
             throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
 <div class="block">Attempts to unwrap a <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> to a plain Java object that's the instance of the given class (or is
  <code>null</code>).</div>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/ResourceBundleLocalizedString.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/ResourceBundleLocalizedString.html b/docs/api/freemarker/template/ResourceBundleLocalizedString.html
index fc2deea..8a24d08 100644
--- a/docs/api/freemarker/template/ResourceBundleLocalizedString.html
+++ b/docs/api/freemarker/template/ResourceBundleLocalizedString.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ResourceBundleLocalizedString (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>ResourceBundleLocalizedString (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="ResourceBundleLocalizedString (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="ResourceBundleLocalizedString (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/SimpleCollection.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleCollection.html b/docs/api/freemarker/template/SimpleCollection.html
index dd2e364..6cc368c 100644
--- a/docs/api/freemarker/template/SimpleCollection.html
+++ b/docs/api/freemarker/template/SimpleCollection.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleCollection (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>SimpleCollection (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="SimpleCollection (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="SimpleCollection (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/SimpleDate.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleDate.html b/docs/api/freemarker/template/SimpleDate.html
index da469d3..6364f09 100644
--- a/docs/api/freemarker/template/SimpleDate.html
+++ b/docs/api/freemarker/template/SimpleDate.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleDate (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>SimpleDate (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="SimpleDate (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="SimpleDate (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/SimpleHash.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleHash.html b/docs/api/freemarker/template/SimpleHash.html
index 9be1a09..d1cb6f7 100644
--- a/docs/api/freemarker/template/SimpleHash.html
+++ b/docs/api/freemarker/template/SimpleHash.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleHash (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>SimpleHash (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="SimpleHash (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="SimpleHash (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -152,15 +152,13 @@ implements <a href="../../freemarker/template/TemplateHashModelEx2.html" title="
  to which it had to be passed adapted to a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a>).
  
  <p>
- If regardless of which of the above two cases stand, you just need to (or more convenient to) create the hash from a
- <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> (via <a href="../../freemarker/template/SimpleHash.html#SimpleHash-java.util.Map-freemarker.template.ObjectWrapper-"><code>SimpleHash(Map, ObjectWrapper)</code></a> or
- <a href="../../freemarker/template/SimpleHash.html#SimpleHash-java.util.Map-freemarker.template.ObjectWrapper-"><code>SimpleHash(Map, ObjectWrapper)</code></a>), which will be the faster depends on how many times will the
- <em>same</em> <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> entry be read from the template(s) later, on average. If, on average, you read each entry
- for more than 4 times, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> will be most certainly faster, but if for 2 times or less (and especially
- if not at all) then <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template"><code>DefaultMapAdapter</code></a> will be. Before choosing based on performance though, pay attention to
- the behavioral differences; <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> will shallow-copy the original <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> at construction time, so
- key order will be lost in some cases, and it won't reflect <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> content changes after the <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a>
- construction, also <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> can't be unwrapped to the original <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> instance.</div>
+ It also matters if for how many times will the <em>same</em> <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> entry be read from the template(s) later, on
+ average. If, on average, you read each entry for more than 4 times, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> will be most certainly faster,
+ but if for 2 times or less (and especially if not at all) then <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template"><code>DefaultMapAdapter</code></a> will be faster. Before 
+ choosing based on performance though, pay attention to the behavioral differences; <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> will 
+ shallow-copy the original <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> at construction time, so key order will be lost in some cases, and it won't 
+ reflect <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> content changes after the <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> construction, also <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> can't be 
+ unwrapped to the original <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a> instance.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template"><code>DefaultMapAdapter</code></a>, 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/SimpleList.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleList.html b/docs/api/freemarker/template/SimpleList.html
index 434337d..4b2178e 100644
--- a/docs/api/freemarker/template/SimpleList.html
+++ b/docs/api/freemarker/template/SimpleList.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleList (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>SimpleList (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="SimpleList (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="SimpleList (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/SimpleNumber.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleNumber.html b/docs/api/freemarker/template/SimpleNumber.html
index 452dd71..0200dc2 100644
--- a/docs/api/freemarker/template/SimpleNumber.html
+++ b/docs/api/freemarker/template/SimpleNumber.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleNumber (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>SimpleNumber (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="SimpleNumber (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="SimpleNumber (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/SimpleObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleObjectWrapper.html b/docs/api/freemarker/template/SimpleObjectWrapper.html
index ad72ac5..b5a19dd 100644
--- a/docs/api/freemarker/template/SimpleObjectWrapper.html
+++ b/docs/api/freemarker/template/SimpleObjectWrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleObjectWrapper (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>SimpleObjectWrapper (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="SimpleObjectWrapper (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="SimpleObjectWrapper (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -240,7 +240,7 @@ extends <a href="../../freemarker/template/DefaultObjectWrapper.html" title="cla
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;freemarker.ext.beans.<a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans">BeansWrapper</a></h3>
-<code><a href="../../freemarker/ext/beans/BeansWrapper.html#checkModifiable--">checkModifiable</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#clearClassIntrospecitonCache--">clearClassIntrospecitonCache</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#coerceBigDecimal-java.math.BigDecimal-java.lang.Class-">coerceBigDecimal</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#coerceBigDecimals-java.lang.reflect.AccessibleObject-java.lang.Object:A-">coerceBigDecimals</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#coerceBigDecimals-java.lang.Class:A-java.lang.Object:A-">coerceBigDecimals</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#finalizeConstruction-boolean-">finalizeConstruction</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#finetuneMethodAppearance-java.lang.Class-java.lang.reflect.Method-freemarker.ext.beans.BeansWrapper.MethodAppearanceDecision-">finetuneMethodAppearance</a>, <a href="../../freemarker/ext/beans/Be
 ansWrapper.html#getDefaultDateType--">getDefaultDateType</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getDefaultInstance--">getDefaultInstance</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getEnumModels--">getEnumModels</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getExposureLevel--">getExposureLevel</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getIncompatibleImprovements--">getIncompatibleImprovements</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getInstance-java.lang.Object-freemarker.ext.util.ModelFactory-">getInstance</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getMethodAppearanceFineTuner--">getMethodAppearanceFineTuner</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getModelFactory-java.lang.Class-">getModelFactory</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getOuterIdentity--">getOuterIdentity</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getStaticModels--
 ">getStaticModels</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getUseCache--">getUseCache</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isClassIntrospectionCacheRestricted--">isClassIntrospectionCacheRestricted</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isExposeFields--">isExposeFields</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isSimpleMapWrapper--">isSimpleMapWrapper</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isStrict--">isStrict</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isWriteProtected--">isWriteProtected</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#newInstance-java.lang.Class-java.util.List-">newInstance</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#removeFromClassIntrospectionCache-java.lang.Class-">removeFromClassIntrospectionCache</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setDefaultDateType-int-">setDefaultDateType</a>, <a href="../../freemar
 ker/ext/beans/BeansWrapper.html#setExposeFields-boolean-">setExposeFields</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setExposureLevel-int-">setExposureLevel</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setMethodAppearanceFineTuner-freemarker.ext.beans.MethodAppearanceFineTuner-">setMethodAppearanceFineTuner</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setMethodsShadowItems-boolean-">setMethodsShadowItems</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setNullModel-freemarker.template.TemplateModel-">setNullModel</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setOuterIdentity-freemarker.template.ObjectWrapper-">setOuterIdentity</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setSimpleMapWrapper-boolean-">setSimpleMapWrapper</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setStrict-boolean-">setStrict</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setUseCache-boolean-">setUseCache</a>,
  <a href="../../freemarker/ext/beans/BeansWrapper.html#toString--">toString</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#tryUnwrapTo-freemarker.template.TemplateModel-java.lang.Class-">tryUnwrapTo</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#unwrap-freemarker.template.TemplateModel-">unwrap</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#unwrap-freemarker.template.TemplateModel-java.lang.Class-">unwrap</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#wrap-java.lang.Object-java.lang.reflect.Method-">wrap</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#writeProtect--">writeProtect</a></code></li>
+<code><a href="../../freemarker/ext/beans/BeansWrapper.html#checkModifiable--">checkModifiable</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#clearClassIntrospecitonCache--">clearClassIntrospecitonCache</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#coerceBigDecimal-java.math.BigDecimal-java.lang.Class-">coerceBigDecimal</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#coerceBigDecimals-java.lang.reflect.AccessibleObject-java.lang.Object:A-">coerceBigDecimals</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#coerceBigDecimals-java.lang.Class:A-java.lang.Object:A-">coerceBigDecimals</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#finalizeConstruction-boolean-">finalizeConstruction</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#finetuneMethodAppearance-java.lang.Class-java.lang.reflect.Method-freemarker.ext.beans.BeansWrapper.MethodAppearanceDecision-">finetuneMethodAppearance</a>, <a href="../../freemarker/ext/beans/Be
 ansWrapper.html#getDefaultDateType--">getDefaultDateType</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getDefaultInstance--">getDefaultInstance</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getEnumModels--">getEnumModels</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getExposureLevel--">getExposureLevel</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getIncompatibleImprovements--">getIncompatibleImprovements</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getInstance-java.lang.Object-freemarker.ext.util.ModelFactory-">getInstance</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getMethodAppearanceFineTuner--">getMethodAppearanceFineTuner</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getModelFactory-java.lang.Class-">getModelFactory</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getOuterIdentity--">getOuterIdentity</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getStaticModels--
 ">getStaticModels</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getTreatDefaultMethodsAsBeanMembers--">getTreatDefaultMethodsAsBeanMembers</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#getUseCache--">getUseCache</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isClassIntrospectionCacheRestricted--">isClassIntrospectionCacheRestricted</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isExposeFields--">isExposeFields</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isSimpleMapWrapper--">isSimpleMapWrapper</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isStrict--">isStrict</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#isWriteProtected--">isWriteProtected</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#newInstance-java.lang.Class-java.util.List-">newInstance</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#removeFromClassIntrospectionCache-java.lang.Class-">removeFromClassIntrospectionCa
 che</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setDefaultDateType-int-">setDefaultDateType</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setExposeFields-boolean-">setExposeFields</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setExposureLevel-int-">setExposureLevel</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setMethodAppearanceFineTuner-freemarker.ext.beans.MethodAppearanceFineTuner-">setMethodAppearanceFineTuner</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setMethodsShadowItems-boolean-">setMethodsShadowItems</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setNullModel-freemarker.template.TemplateModel-">setNullModel</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setOuterIdentity-freemarker.template.ObjectWrapper-">setOuterIdentity</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setSimpleMapWrapper-boolean-">setSimpleMapWrapper</a>, <a href="../../freemarker/ext/beans/BeansWrappe
 r.html#setStrict-boolean-">setStrict</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setTreatDefaultMethodsAsBeanMembers-boolean-">setTreatDefaultMethodsAsBeanMembers</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#setUseCache-boolean-">setUseCache</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#toString--">toString</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#tryUnwrapTo-freemarker.template.TemplateModel-java.lang.Class-">tryUnwrapTo</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#unwrap-freemarker.template.TemplateModel-">unwrap</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#unwrap-freemarker.template.TemplateModel-java.lang.Class-">unwrap</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#wrap-java.lang.Object-java.lang.reflect.Method-">wrap</a>, <a href="../../freemarker/ext/beans/BeansWrapper.html#writeProtect--">writeProtect</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/SimpleScalar.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleScalar.html b/docs/api/freemarker/template/SimpleScalar.html
index 442495e..db6be2a 100644
--- a/docs/api/freemarker/template/SimpleScalar.html
+++ b/docs/api/freemarker/template/SimpleScalar.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleScalar (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>SimpleScalar (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="SimpleScalar (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="SimpleScalar (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/SimpleSequence.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleSequence.html b/docs/api/freemarker/template/SimpleSequence.html
index 0ccbb85..c846b71 100644
--- a/docs/api/freemarker/template/SimpleSequence.html
+++ b/docs/api/freemarker/template/SimpleSequence.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleSequence (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>SimpleSequence (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="SimpleSequence (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="SimpleSequence (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -151,15 +151,13 @@ implements <a href="../../freemarker/template/TemplateSequenceModel.html" title=
  from a plain Java method to which it had to be passed adapted to a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a>).
  
  <p>
- If regardless of which of the above two cases stand, you just need to (or more convenient to) create the sequence
- from a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> (via <a href="../../freemarker/template/DefaultListAdapter.html#adapt-java.util.List-freemarker.template.utility.RichObjectWrapper-"><code>DefaultListAdapter.adapt(List, freemarker.template.utility.RichObjectWrapper)</code></a> or
- <a href="../../freemarker/template/SimpleSequence.html#SimpleSequence-java.util.Collection-"><code>SimpleSequence(Collection)</code></a>), which will be the faster depends on how many times will the
- <em>same</em> <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> entry be read from the template(s) later, on average. If, on average, you read each entry
- for more than 4 times, <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a> will be most certainly faster, but if for 2 times or less (and
- especially if not at all) then <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template"><code>DefaultMapAdapter</code></a> will be. Before choosing based on performance though, pay
- attention to the behavioral differences; <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a> will shallow-copy the original <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> at
- construction time, so it won't reflect <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> content changes after the <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a> construction,
- also <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a> can't be unwrapped to the original wrapped instance.</div>
+ It also matters if for how many times will the <em>same</em> <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> entry be read from the template(s) later,
+ on average. If, on average, you read each entry for more than 4 times, <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a> will be most
+ certainly faster, but if for 2 times or less (and especially if not at all) then <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template"><code>DefaultMapAdapter</code></a> will
+ be faster. Before choosing based on performance though, pay attention to the behavioral differences;
+ <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a> will shallow-copy the original <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> at construction time, so it won't reflect
+ <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> content changes after the <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a> construction, also <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template"><code>SimpleSequence</code></a> can't be
+ unwrapped to the original wrapped instance.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template"><code>DefaultListAdapter</code></a>, 
@@ -470,7 +468,7 @@ public&nbsp;SimpleSequence(<a href="http://docs.oracle.com/javase/8/docs/api/jav
  using <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template"><code>DefaultListAdapter</code></a> instead.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>collection</code> - The collection containing the initial items of this sequence. A shalow copy of this collection is made
+<dd><code>collection</code> - The collection containing the initial items of the sequence. A shallow copy of this collection is made
             immediately for internal use (thus, later modification on the parameter collection won't be visible in
             the resulting sequence). The items however, will be only wrapped with the <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>
             lazily, when first needed.</dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/Template.WrongEncodingException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/Template.WrongEncodingException.html b/docs/api/freemarker/template/Template.WrongEncodingException.html
index 392c52d..d6bcfca 100644
--- a/docs/api/freemarker/template/Template.WrongEncodingException.html
+++ b/docs/api/freemarker/template/Template.WrongEncodingException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Template.WrongEncodingException (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>Template.WrongEncodingException (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="Template.WrongEncodingException (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="Template.WrongEncodingException (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/Template.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/Template.html b/docs/api/freemarker/template/Template.html
index 31e039f..99eaa31 100644
--- a/docs/api/freemarker/template/Template.html
+++ b/docs/api/freemarker/template/Template.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Template (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>Template (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="Template (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="Template (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -233,10 +233,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
         <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="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"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">In most applications, use <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, Reader, Configuration)</code></a> instead, which doesn't
-             specify the encoding.</span></div>
-</div>
+<div class="block">Convenience constructor for <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template(name, null,
+ reader, cfg, encoding)</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -271,10 +269,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
         <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="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"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">In most applications, use <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, String, Reader, Configuration)</code></a> instead, which
-             doesn't specify the encoding.</span></div>
-</div>
+<div class="block">Same as <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, String, Reader, Configuration)</code></a>, but also specifies the template's encoding (not
+ recommended).</div>
 </td>
 </tr>
 </table>
@@ -634,14 +630,11 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>Template</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public&nbsp;Template(<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/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="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)
-                      throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">In most applications, use <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, Reader, Configuration)</code></a> instead, which doesn't
-             specify the encoding.</span></div>
+<pre>public&nbsp;Template(<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/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="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)
+         throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Convenience constructor for <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template(name, null,
  reader, cfg, encoding)</code></a>.</div>
 <dl>
@@ -681,7 +674,10 @@ public&nbsp;Template(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang
             "physically" means).</dd>
 <dd><code>sourceName</code> - See <a href="../../freemarker/template/Template.html#getSourceName--"><code>getSourceName()</code></a> for the meaning. Can be <code>null</code>, in which case
             <a href="../../freemarker/template/Template.html#getSourceName--"><code>getSourceName()</code></a> will return the same as <a href="../../freemarker/template/Template.html#getName--"><code>getName()</code></a>.</dd>
-<dd><code>reader</code> - The character stream to read from. It will always be closed (<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true#close--" title="class or interface in java.io"><code>Reader.close()</code></a>) by this method.</dd>
+<dd><code>reader</code> - The character stream to read from. It will always be closed (<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true#close--" title="class or interface in java.io"><code>Reader.close()</code></a>) by
+            this method (this is for backward compatibility; later major versions may discontinue this behavior).
+            The <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a> need not be buffered, because this method ensures that it will be read in few
+            kilobyte chunks, not byte by byte.</dd>
 <dd><code>cfg</code> - The Configuration object that this Template is associated with. If this is <code>null</code>, the "default"
             <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> object is used, which is highly discouraged, because it can easily lead to
             erroneous, unpredictable behavior. (See more <a href="../../freemarker/template/Configuration.html#getDefaultConfiguration--"><code>here...</code></a>)</dd>
@@ -698,26 +694,24 @@ public&nbsp;Template(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 <ul class="blockList">
 <li class="blockList">
 <h4>Template</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public&nbsp;Template(<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="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)
-                      throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">In most applications, use <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, String, Reader, Configuration)</code></a> instead, which
-             doesn't specify the encoding.</span></div>
+<pre>public&nbsp;Template(<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="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)
+         throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Same as <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, String, Reader, Configuration)</code></a>, but also specifies the template's encoding (not
  recommended).</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>encoding</code> - This is the encoding that we are supposed to be using. But it's not really necessary because we have a
-            <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a> which is already decoded, but it's kept as meta-info. It also has an impact when
-            <code>#include</code>-ing/<code>#import</code>-ing another template from this template, as its default encoding
-            will be this. But this behavior of said directives is considered to be harmful, and will be probably
-            phased out. Until that, it's better to leave this on <code>null</code>, so that the encoding will come from
-            the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>. Note that if this is non-<code>null</code> and there's an <code>#ftl</code> header
-            with encoding, they must match, or else a <a href="../../freemarker/template/Template.WrongEncodingException.html" title="class in freemarker.template"><code>Template.WrongEncodingException</code></a> is thrown.</dd>
+<dd><code>encoding</code> - This is the encoding that we are supposed to be using. At the first glance it's unnecessary because we
+            already have a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a> (so decoding with the charset has already happened), however, if this is
+            non-<code>null</code> and there's an <code>#ftl</code> header with <code>encoding</code> parameter, they must match,
+            or else a <a href="../../freemarker/template/Template.WrongEncodingException.html" title="class in freemarker.template"><code>Template.WrongEncodingException</code></a> is thrown. Thus, it should be set if to decode the template,
+            we were using an encoding (a charset), otherwise it should be <code>null</code>. It's also kept as
+            meta-info (returned by <a href="../../freemarker/template/Template.html#getEncoding--"><code>getEncoding()</code></a>). It also has an impact when <code>#include</code>-ing or
+            <code>#import</code>-ing another template from this template, as its default encoding will be this. But
+            this behavior of said directives is considered to be harmful, and will be probably phased out.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
 <dt><span class="simpleTagLabel">Since:</span></dt>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateBooleanModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateBooleanModel.html b/docs/api/freemarker/template/TemplateBooleanModel.html
index 98680d5..41892ad 100644
--- a/docs/api/freemarker/template/TemplateBooleanModel.html
+++ b/docs/api/freemarker/template/TemplateBooleanModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateBooleanModel (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateBooleanModel (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateBooleanModel (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateBooleanModel (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateCollectionModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateCollectionModel.html b/docs/api/freemarker/template/TemplateCollectionModel.html
index 04d9599..7326d5b 100644
--- a/docs/api/freemarker/template/TemplateCollectionModel.html
+++ b/docs/api/freemarker/template/TemplateCollectionModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateCollectionModel (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateCollectionModel (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateCollectionModel (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateCollectionModel (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../freemarker/ext/beans/ArrayModel.html" title="class in freemarker.ext.beans">ArrayModel</a>, <a href="../../freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a>, <a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a>, <a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/ext/beans/EnumerationModel.html" title="class in freemarker.ext.beans">EnumerationModel</a>, <a href="../../freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a>, <a href="../../freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a>, <a hr
 ef="../../freemarker/ext/jdom/NodeListModel.html" title="class in freemarker.ext.jdom">NodeListModel</a>, <a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a></dd>
+<dd><a href="../../freemarker/ext/beans/ArrayModel.html" title="class in freemarker.ext.beans">ArrayModel</a>, <a href="../../freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a>, <a href="../../freemarker/template/DefaultEnumerationAdapter.html" title="class in freemarker.template">DefaultEnumerationAdapter</a>, <a href="../../freemarker/template/DefaultIterableAdapter.html" title="class in freemarker.template">DefaultIterableAdapter</a>, <a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/ext/beans/EnumerationModel.html" title="class in freemarker.ext.beans">EnumerationModel</a>, <a href="../../freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a
 >, <a href="../../freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a>, <a href="../../freemarker/ext/jdom/NodeListModel.html" title="class in freemarker.ext.jdom">NodeListModel</a>, <a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateCollectionModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateCollectionModelEx.html b/docs/api/freemarker/template/TemplateCollectionModelEx.html
index bc5c4cf..dc04bbb 100644
--- a/docs/api/freemarker/template/TemplateCollectionModelEx.html
+++ b/docs/api/freemarker/template/TemplateCollectionModelEx.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateCollectionModelEx (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateCollectionModelEx (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateCollectionModelEx (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateCollectionModelEx (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6};
+var methods = {"i0":6,"i1":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -112,13 +112,9 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public interface <span class="typeNameLabel">TemplateCollectionModelEx</span>
 extends <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a></pre>
-<div class="block"><b>Experimental - subject to change:</b> "extended collection" template language data type: Adds size/emptiness
- querybility and "contains" test to <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>. The added extra operations is provided by all
- Java <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a>-s, and this interface was added to make that accessible for templates too.
- 
- <p>
- <b>Experimental status warning:</b> This interface is subject to change on non-backward compatible ways, hence, it
- shouldn't be implemented outside FreeMarker yet.</div>
+<div class="block">"extended collection" template language data type: Adds size/emptiness querybility and "contains" test to
+ <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a>. The added extra operations is provided by all Java <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a>-s, and this
+ interface was added to make that accessible for templates too.</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.3.22</dd>
@@ -158,17 +154,11 @@ extends <a href="../../freemarker/template/TemplateCollectionModel.html" title="
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/TemplateCollectionModelEx.html#contains-freemarker.template.TemplateModel-">contains</a></span>(<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;item)</code>
-<div class="block">Tells if a given value occurs in the collection, accodring the rules of the wrapped collection.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/TemplateCollectionModelEx.html#isEmpty--">isEmpty</a></span>()</code>
 <div class="block">Returns if the collection contains any elements.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/TemplateCollectionModelEx.html#size--">size</a></span>()</code>
 <div class="block">Returns the number items in this collection, or <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true#MAX_VALUE" title="class or interface in java.lang"><code>Integer.MAX_VALUE</code></a>, if there are more than
@@ -216,7 +206,7 @@ extends <a href="../../freemarker/template/TemplateCollectionModel.html" title="
 <a name="isEmpty--">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
 <h4>isEmpty</h4>
 <pre>boolean&nbsp;isEmpty()
@@ -229,24 +219,6 @@ extends <a href="../../freemarker/template/TemplateCollectionModel.html" title="
 </dl>
 </li>
 </ul>
-<a name="contains-freemarker.template.TemplateModel-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>contains</h4>
-<pre>boolean&nbsp;contains(<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;item)
-          throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
-<div class="block">Tells if a given value occurs in the collection, accodring the rules of the wrapped collection. As of 2.3.22,
- this interface is not yet utilized by FTL, and certainly it won't be earlier than 2.4.0. The usefulness of this
- method is questionable, as the equality rules of Java differs from that of FTL, hence, calling this won't be
- equivalent with <code>?seq_contains(e)</code>.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
-</dl>
-</li>
-</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateDateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateDateModel.html b/docs/api/freemarker/template/TemplateDateModel.html
index b9d89ea..34bf411 100644
--- a/docs/api/freemarker/template/TemplateDateModel.html
+++ b/docs/api/freemarker/template/TemplateDateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateDateModel (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateDateModel (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateDateModel (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateDateModel (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateDirectiveBody.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateDirectiveBody.html b/docs/api/freemarker/template/TemplateDirectiveBody.html
index 71eaa7d..f3d4f41 100644
--- a/docs/api/freemarker/template/TemplateDirectiveBody.html
+++ b/docs/api/freemarker/template/TemplateDirectiveBody.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateDirectiveBody (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateDirectiveBody (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateDirectiveBody (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateDirectiveBody (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateDirectiveModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateDirectiveModel.html b/docs/api/freemarker/template/TemplateDirectiveModel.html
index b7b486d..1a43f8f 100644
--- a/docs/api/freemarker/template/TemplateDirectiveModel.html
+++ b/docs/api/freemarker/template/TemplateDirectiveModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateDirectiveModel (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateDirectiveModel (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateDirectiveModel (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateDirectiveModel (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateException.html b/docs/api/freemarker/template/TemplateException.html
index e6e756f..74252e0 100644
--- a/docs/api/freemarker/template/TemplateException.html
+++ b/docs/api/freemarker/template/TemplateException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateException (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateException (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateException (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateException (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateExceptionHandler.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateExceptionHandler.html b/docs/api/freemarker/template/TemplateExceptionHandler.html
index 657cfde..2005090 100644
--- a/docs/api/freemarker/template/TemplateExceptionHandler.html
+++ b/docs/api/freemarker/template/TemplateExceptionHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateExceptionHandler (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateExceptionHandler (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateExceptionHandler (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateExceptionHandler (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModel.html b/docs/api/freemarker/template/TemplateHashModel.html
index 73c0614..908367f 100644
--- a/docs/api/freemarker/template/TemplateHashModel.html
+++ b/docs/api/freemarker/template/TemplateHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateHashModel (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateHashModel (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateHashModel (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateHashModel (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateHashModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModelEx.html b/docs/api/freemarker/template/TemplateHashModelEx.html
index 2af80c4..216a77b 100644
--- a/docs/api/freemarker/template/TemplateHashModelEx.html
+++ b/docs/api/freemarker/template/TemplateHashModelEx.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateHashModelEx (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateHashModelEx (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateHashModelEx (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateHashModelEx (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePair.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePair.html b/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePair.html
index a74e1bf..0d9ffca 100644
--- a/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePair.html
+++ b/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePair.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateHashModelEx2.KeyValuePair (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateHashModelEx2.KeyValuePair (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateHashModelEx2.KeyValuePair (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateHashModelEx2.KeyValuePair (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html b/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html
index 49a0050..5130e51 100644
--- a/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html
+++ b/docs/api/freemarker/template/TemplateHashModelEx2.KeyValuePairIterator.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateHashModelEx2.KeyValuePairIterator (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateHashModelEx2.KeyValuePairIterator (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateHashModelEx2.KeyValuePairIterator (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateHashModelEx2.KeyValuePairIterator (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateHashModelEx2.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModelEx2.html b/docs/api/freemarker/template/TemplateHashModelEx2.html
index 1b5df8f..7721804 100644
--- a/docs/api/freemarker/template/TemplateHashModelEx2.html
+++ b/docs/api/freemarker/template/TemplateHashModelEx2.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateHashModelEx2 (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateHashModelEx2 (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateHashModelEx2 (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateHashModelEx2 (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateMethodModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateMethodModel.html b/docs/api/freemarker/template/TemplateMethodModel.html
index a05988e..c8d9c65 100644
--- a/docs/api/freemarker/template/TemplateMethodModel.html
+++ b/docs/api/freemarker/template/TemplateMethodModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateMethodModel (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateMethodModel (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateMethodModel (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateMethodModel (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/template/TemplateMethodModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateMethodModelEx.html b/docs/api/freemarker/template/TemplateMethodModelEx.html
index 902e747..782151d 100644
--- a/docs/api/freemarker/template/TemplateMethodModelEx.html
+++ b/docs/api/freemarker/template/TemplateMethodModelEx.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:03 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:39 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateMethodModelEx (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateMethodModelEx (FreeMarker 2.3.26-incubating API)</title>
+<meta name="date" content="2017-03-25">
 <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="TemplateMethodModelEx (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateMethodModelEx (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {