freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [34/37] incubator-freemarker-site git commit: Site updates for 2.3.26.
Date Sun, 26 Mar 2017 11:15:00 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/ArithmeticEngine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/ArithmeticEngine.html b/docs/api/freemarker/core/ArithmeticEngine.html
index f421296..5bd9645 100644
--- a/docs/api/freemarker/core/ArithmeticEngine.html
+++ b/docs/api/freemarker/core/ArithmeticEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ArithmeticEngine (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>ArithmeticEngine (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="ArithmeticEngine (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="ArithmeticEngine (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/BugException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/BugException.html b/docs/api/freemarker/core/BugException.html
index f648481..0c50515 100644
--- a/docs/api/freemarker/core/BugException.html
+++ b/docs/api/freemarker/core/BugException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BugException (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>BugException (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="BugException (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="BugException (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -45,7 +45,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/ArithmeticEngine.ConservativeEngine.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/BuiltInForNodeEx.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/core/BugException.html" target="_top">Frames</a></li>
@@ -277,7 +277,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeExcep
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/ArithmeticEngine.ConservativeEngine.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/BuiltInForNodeEx.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/core/BugException.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/BuiltInForNodeEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/BuiltInForNodeEx.html b/docs/api/freemarker/core/BuiltInForNodeEx.html
new file mode 100644
index 0000000..8fb5832
--- /dev/null
+++ b/docs/api/freemarker/core/BuiltInForNodeEx.html
@@ -0,0 +1,557 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>BuiltInForNodeEx (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>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="BuiltInForNodeEx (FreeMarker 2.3.26-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/BuiltInForNodeEx.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/BugException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/core/BuiltInForNodeEx.html" target="_top">Frames</a></li>
+<li><a href="BuiltInForNodeEx.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">freemarker.core</div>
+<h2 title="Class BuiltInForNodeEx" class="title">Class BuiltInForNodeEx</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateObject</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.Expression</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.BuiltInForNodeEx</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">BuiltInForNodeEx</span>
+extends freemarker.core.Expression</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<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"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#key">key</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected freemarker.core.Expression</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#target">target</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#BuiltInForNodeEx--">BuiltInForNodeEx</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#checkMethodArgCount-int-int-">checkMethodArgCount</a></span>(int&nbsp;argCnt,
+                   int&nbsp;expectedCnt)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#checkMethodArgCount-int-int-int-">checkMethodArgCount</a></span>(int&nbsp;argCnt,
+                   int&nbsp;minCnt,
+                   int&nbsp;maxCnt)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#checkMethodArgCount-java.util.List-int-">checkMethodArgCount</a></span>(<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;args,
+                   int&nbsp;expectedCnt)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#checkMethodArgCount-java.util.List-int-int-">checkMethodArgCount</a></span>(<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;args,
+                   int&nbsp;minCnt,
+                   int&nbsp;maxCnt)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>protected freemarker.core.Expression</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#deepCloneWithIdentifierReplaced_inner-java.lang.String-freemarker.core.Expression-freemarker.core.Expression.ReplacemenetState-">deepCloneWithIdentifierReplaced_inner</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;replacedIdentifier,
+                                     freemarker.core.Expression&nbsp;replacement,
+                                     freemarker.core.Expression.ReplacemenetState&nbsp;replacementState)</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#getCanonicalForm--">getCanonicalForm</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#getNumberMethodArg-java.util.List-int-">getNumberMethodArg</a></span>(<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;args,
+                  int&nbsp;argIdx)</code>
+<div class="block">Gets a method argument and checks if it's a number; it does NOT check if <code>args</code> is big enough.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<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"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#getOptStringMethodArg-java.util.List-int-">getOptStringMethodArg</a></span>(<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;args,
+                     int&nbsp;argIdx)</code>
+<div class="block">Same as <a href="../../freemarker/core/BuiltInForNodeEx.html#getStringMethodArg-java.util.List-int-"><code>getStringMethodArg(java.util.List, int)</code></a>, but checks if <code>args</code> is big enough, and returns <code>null</code> if it
+ isn't.</div>
+</td>
+</tr>
+<tr id="i8" 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"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#getStringMethodArg-java.util.List-int-">getStringMethodArg</a></span>(<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;args,
+                  int&nbsp;argIdx)</code>
+<div class="block">Gets a method argument and checks if it's a string; it does NOT check if <code>args</code> is big enough.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>protected <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#newMethodArgInvalidValueException-int-java.lang.Object:A-">newMethodArgInvalidValueException</a></span>(int&nbsp;argIdx,
+                                 <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;details)</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>protected <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/BuiltInForNodeEx.html#newMethodArgsInvalidValueException-java.lang.Object:A-">newMethodArgsInvalidValueException</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;details)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.Expression">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.Expression</h3>
+<code>getAsTemplateModel</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.TemplateObject">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.TemplateObject</h3>
+<code>contains, getBeginColumn, getBeginLine, getEndColumn, getEndLine, getEndLocation, getEndLocationQuoted, getSource, getStartLocation, getStartLocationQuoted, getTemplate, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="target">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>target</h4>
+<pre>protected&nbsp;freemarker.core.Expression target</pre>
+</li>
+</ul>
+<a name="key">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>key</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> key</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="BuiltInForNodeEx--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>BuiltInForNodeEx</h4>
+<pre>public&nbsp;BuiltInForNodeEx()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getCanonicalForm--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCanonicalForm</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getCanonicalForm()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>getCanonicalForm</code>&nbsp;in class&nbsp;<code>freemarker.core.TemplateObject</code></dd>
+</dl>
+</li>
+</ul>
+<a name="checkMethodArgCount-java.util.List-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkMethodArgCount</h4>
+<pre>protected final&nbsp;void&nbsp;checkMethodArgCount(<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;args,
+                                         int&nbsp;expectedCnt)
+                                  throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<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>
+<a name="checkMethodArgCount-int-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkMethodArgCount</h4>
+<pre>protected final&nbsp;void&nbsp;checkMethodArgCount(int&nbsp;argCnt,
+                                         int&nbsp;expectedCnt)
+                                  throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<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>
+<a name="checkMethodArgCount-java.util.List-int-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkMethodArgCount</h4>
+<pre>protected final&nbsp;void&nbsp;checkMethodArgCount(<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;args,
+                                         int&nbsp;minCnt,
+                                         int&nbsp;maxCnt)
+                                  throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<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>
+<a name="checkMethodArgCount-int-int-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkMethodArgCount</h4>
+<pre>protected final&nbsp;void&nbsp;checkMethodArgCount(int&nbsp;argCnt,
+                                         int&nbsp;minCnt,
+                                         int&nbsp;maxCnt)
+                                  throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<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>
+<a name="getOptStringMethodArg-java.util.List-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOptStringMethodArg</h4>
+<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getOptStringMethodArg(<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;args,
+                                             int&nbsp;argIdx)
+                                      throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Same as <a href="../../freemarker/core/BuiltInForNodeEx.html#getStringMethodArg-java.util.List-int-"><code>getStringMethodArg(java.util.List, int)</code></a>, but checks if <code>args</code> is big enough, and returns <code>null</code> if it
+ isn't.</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>
+<a name="getStringMethodArg-java.util.List-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getStringMethodArg</h4>
+<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getStringMethodArg(<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;args,
+                                          int&nbsp;argIdx)
+                                   throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Gets a method argument and checks if it's a string; it does NOT check if <code>args</code> is big enough.</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>
+<a name="getNumberMethodArg-java.util.List-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNumberMethodArg</h4>
+<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;getNumberMethodArg(<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;args,
+                                          int&nbsp;argIdx)
+                                   throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Gets a method argument and checks if it's a number; it does NOT check if <code>args</code> is big enough.</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>
+<a name="newMethodArgInvalidValueException-int-java.lang.Object:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>newMethodArgInvalidValueException</h4>
+<pre>protected final&nbsp;<a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>&nbsp;newMethodArgInvalidValueException(int&nbsp;argIdx,
+                                                                         <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;details)</pre>
+</li>
+</ul>
+<a name="newMethodArgsInvalidValueException-java.lang.Object:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>newMethodArgsInvalidValueException</h4>
+<pre>protected final&nbsp;<a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>&nbsp;newMethodArgsInvalidValueException(<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;details)</pre>
+</li>
+</ul>
+<a name="deepCloneWithIdentifierReplaced_inner-java.lang.String-freemarker.core.Expression-freemarker.core.Expression.ReplacemenetState-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>deepCloneWithIdentifierReplaced_inner</h4>
+<pre>protected&nbsp;freemarker.core.Expression&nbsp;deepCloneWithIdentifierReplaced_inner(<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;replacedIdentifier,
+                                                                           freemarker.core.Expression&nbsp;replacement,
+                                                                           freemarker.core.Expression.ReplacemenetState&nbsp;replacementState)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>deepCloneWithIdentifierReplaced_inner</code>&nbsp;in class&nbsp;<code>freemarker.core.Expression</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/BuiltInForNodeEx.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/BugException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/core/BuiltInForNodeEx.html" target="_top">Frames</a></li>
+<li><a href="BuiltInForNodeEx.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/CSSOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CSSOutputFormat.html b/docs/api/freemarker/core/CSSOutputFormat.html
index 026140e..7865fca 100644
--- a/docs/api/freemarker/core/CSSOutputFormat.html
+++ b/docs/api/freemarker/core/CSSOutputFormat.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>CSSOutputFormat (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>CSSOutputFormat (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="CSSOutputFormat (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="CSSOutputFormat (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -251,7 +251,7 @@ extends <a href="../../freemarker/core/OutputFormat.html" title="class in freema
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
 <div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
- if this output format doesn't clearly corresponds to a specific MIME type.</div>
+ <code>null</code> if this output format doesn't clearly corresponds to a specific MIME type.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
@@ -268,12 +268,12 @@ extends <a href="../../freemarker/core/OutputFormat.html" title="class in freema
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
 <div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
  it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
- if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
- application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
- inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
- inserted value is made by escaping plain text and the target format is non-escaping, in which case format
- conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
- will be demand for that.)
+ if the surrounding output format was the same). This is usually a bad idea to allow, as such an event could
+ indicate application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to
+ assimilate the inserted value by converting its format to this format, which will currently (2.3.24) cause
+ exception, unless the inserted value is made by escaping plain text and the target format is non-escaping, in
+ which case format conversion is trivially possible. (It's not impossible that conversions will be extended beyond
+ this, if there will be demand for that.)
  
  <p>
  <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html b/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
index 72fd089..f2e00be 100644
--- a/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
+++ b/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>CallPlaceCustomDataInitializationException (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>CallPlaceCustomDataInitializationException (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="CallPlaceCustomDataInitializationException (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="CallPlaceCustomDataInitializationException (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -44,7 +44,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/BugException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/BuiltInForNodeEx.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -223,7 +223,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.ht
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/BugException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/BuiltInForNodeEx.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CombinedMarkupOutputFormat.html b/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
index b81d9b8..23e9a0b 100644
--- a/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
+++ b/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>CombinedMarkupOutputFormat (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>CombinedMarkupOutputFormat (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="CombinedMarkupOutputFormat (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="CombinedMarkupOutputFormat (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -334,7 +334,7 @@ extends <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
 <div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
- if this output format doesn't clearly corresponds to a specific MIME type.</div>
+ <code>null</code> if this output format doesn't clearly corresponds to a specific MIME type.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
@@ -430,12 +430,12 @@ extends <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
 <div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
  it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
- if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
- application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
- inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
- inserted value is made by escaping plain text and the target format is non-escaping, in which case format
- conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
- will be demand for that.)
+ if the surrounding output format was the same). This is usually a bad idea to allow, as such an event could
+ indicate application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to
+ assimilate the inserted value by converting its format to this format, which will currently (2.3.24) cause
+ exception, unless the inserted value is made by escaping plain text and the target format is non-escaping, in
+ which case format conversion is trivially possible. (It's not impossible that conversions will be extended beyond
+ this, if there will be demand for that.)
  
  <p>
  <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/CommonMarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CommonMarkupOutputFormat.html b/docs/api/freemarker/core/CommonMarkupOutputFormat.html
index f745082..d74a80c 100644
--- a/docs/api/freemarker/core/CommonMarkupOutputFormat.html
+++ b/docs/api/freemarker/core/CommonMarkupOutputFormat.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>CommonMarkupOutputFormat (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>CommonMarkupOutputFormat (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="CommonMarkupOutputFormat (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="CommonMarkupOutputFormat (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -487,12 +487,12 @@ extends <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
 <div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
  it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
- if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
- application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
- inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
- inserted value is made by escaping plain text and the target format is non-escaping, in which case format
- conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
- will be demand for that.)
+ if the surrounding output format was the same). This is usually a bad idea to allow, as such an event could
+ indicate application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to
+ assimilate the inserted value by converting its format to this format, which will currently (2.3.24) cause
+ exception, unless the inserted value is made by escaping plain text and the target format is non-escaping, in
+ which case format conversion is trivially possible. (It's not impossible that conversions will be extended beyond
+ this, if there will be demand for that.)
  
  <p>
  <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/Configurable.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/Configurable.html b/docs/api/freemarker/core/Configurable.html
index df40316..9fcd8f9 100644
--- a/docs/api/freemarker/core/Configurable.html
+++ b/docs/api/freemarker/core/Configurable.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Configurable (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>Configurable (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="Configurable (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="Configurable (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -830,8 +830,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <tr id="i20" class="altColor">
 <td class="colFirst"><code><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>&lt;<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>,? extends <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getCustomNumberFormatsWithoutFallback--">getCustomNumberFormatsWithoutFallback</a></span>()</code>
-<div class="block">Like <a href="../../freemarker/core/Configurable.html#getCustomNumberFormats--"><code>getCustomNumberFormats()</code></a>, but doesn't fall back to the parent <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>, nor does it
- provide a non-<code>null</code> default when called as the method of a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+<div class="block">Like <a href="../../freemarker/core/Configurable.html#getCustomNumberFormats--"><code>getCustomNumberFormats()</code></a>, but doesn't fall back to the parent <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>.</div>
 </td>
 </tr>
 <tr id="i21" class="rowColor">
@@ -865,8 +864,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <tr id="i26" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getLocale--">getLocale</a></span>()</code>
-<div class="block">Returns the assumed locale when searching for template files with no
- explicit requested locale.</div>
+<div class="block">Getter pair of <a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-"><code>setLocale(Locale)</code></a>.</div>
 </td>
 </tr>
 <tr id="i27" class="rowColor">
@@ -1272,7 +1270,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <tr id="i92" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-">setLocale</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
-<div class="block">Sets the default locale used for number and date formatting (among others), also the locale used for searching
+<div class="block">Sets the locale used for number and date formatting (among others), also the locale used for searching
  localized template variations when no locale was explicitly requested.</div>
 </td>
 </tr>
@@ -2723,8 +2721,10 @@ public&nbsp;Configurable()</pre>
 <li class="blockList">
 <h4>setLocale</h4>
 <pre>public&nbsp;void&nbsp;setLocale(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</pre>
-<div class="block">Sets the default locale used for number and date formatting (among others), also the locale used for searching
- localized template variations when no locale was explicitly requested.</div>
+<div class="block">Sets the locale used for number and date formatting (among others), also the locale used for searching
+ localized template variations when no locale was explicitly requested. On the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> level it
+ defaults to the default locale of system (of the JVM), for server-side application usually you should set it
+ explicitly in the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> to use the preferred locale of your application instead.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-"><code>Configuration.getTemplate(String, Locale)</code></a></dd>
@@ -2738,8 +2738,7 @@ public&nbsp;Configurable()</pre>
 <li class="blockList">
 <h4>getLocale</h4>
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;getLocale()</pre>
-<div class="block">Returns the assumed locale when searching for template files with no
- explicit requested locale. Defaults to system locale.</div>
+<div class="block">Getter pair of <a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-"><code>setLocale(Locale)</code></a>. Not <code>null</code>.</div>
 </li>
 </ul>
 <a name="isLocaleSet--">
@@ -2848,7 +2847,7 @@ public&nbsp;Configurable()</pre>
    <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Date.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Date</code></a> and <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Time.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Time</code></a>, and then if, for example,
    <code>time_zone</code> is GMT+00:00, the
    values from the earlier examples will be shown as 2014-07-11 (one day off) and 09:57:00 (2 hours off). While
-   those are the time zone correct renderings, those values probably was meant to shown "as is".
+   those are the time zone correct renderings, those values are probably meant to be shown "as is".
    
    <li>You may wonder why this setting isn't simply "SQL time zone", since the time zone related behavior of JDBC
    applies to <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Timestamp</code></a> too. FreeMarker assumes that you have set up your
@@ -2991,8 +2990,7 @@ public&nbsp;Configurable()</pre>
 <li class="blockList">
 <h4>getCustomNumberFormatsWithoutFallback</h4>
 <pre>public&nbsp;<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>&lt;<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>,? extends <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&gt;&nbsp;getCustomNumberFormatsWithoutFallback()</pre>
-<div class="block">Like <a href="../../freemarker/core/Configurable.html#getCustomNumberFormats--"><code>getCustomNumberFormats()</code></a>, but doesn't fall back to the parent <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>, nor does it
- provide a non-<code>null</code> default when called as the method of a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+<div class="block">Like <a href="../../freemarker/core/Configurable.html#getCustomNumberFormats--"><code>getCustomNumberFormats()</code></a>, but doesn't fall back to the parent <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>.</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.3.25</dd>
@@ -4186,7 +4184,8 @@ public&nbsp;Configurable()</pre>
  <ul>
    <li><p><code>"locale"</code>:
        See <a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-"><code>setLocale(Locale)</code></a>.
-       <br>String value: local codes with the usual format in Java, such as <code>"en_US"</code>.
+       <br>String value: local codes with the usual format in Java, such as <code>"en_US"</code>, or since 2.3.26,
+       "JVM default" (ignoring case) to use the default locale of the Java environment.
        
    <li><p><code>"classic_compatible"</code>:
        See <a href="../../freemarker/core/Configurable.html#setClassicCompatible-boolean-"><code>setClassicCompatible(boolean)</code></a> and <a href="../../freemarker/core/Configurable.html#setClassicCompatibleAsInt-int-"><code>setClassicCompatibleAsInt(int)</code></a>.
@@ -4373,7 +4372,8 @@ public&nbsp;Configurable()</pre>
        <code>"disable"</code> for <a href="../../freemarker/template/Configuration.html#DISABLE_AUTO_ESCAPING_POLICY"><code>Configuration.DISABLE_AUTO_ESCAPING_POLICY</code></a>.
        
    <li><p><code>"default_encoding"</code>:
-       See <a href="../../freemarker/template/Configuration.html#setDefaultEncoding-java.lang.String-"><code>Configuration.setDefaultEncoding(String)</code></a>.
+       See <a href="../../freemarker/template/Configuration.html#setDefaultEncoding-java.lang.String-"><code>Configuration.setDefaultEncoding(String)</code></a>; since 2.3.26 also accepts value "JVM default"
+       (not case sensitive) to set the Java environment default value.
        <br>As the default value is the system default, which can change
        from one server to another, <b>you should always set this!</b>
        
@@ -4464,7 +4464,7 @@ public&nbsp;Configurable()</pre>
    <li><p><code>"template_loader"</code>:
        See: <a href="../../freemarker/template/Configuration.html#setTemplateLoader-freemarker.cache.TemplateLoader-"><code>Configuration.setTemplateLoader(TemplateLoader)</code></a>.
        <br>String value: <code>"default"</code> (case insensitive) for the default, or else interpreted as an
-       <a href="#fm_obe">object builder expression</a>.
+       <a href="#fm_obe">object builder expression</a>. <code>"null"</code> is also allowed since 2.3.26.
        
    <li><p><code>"template_lookup_strategy"</code>:
        See: <a href="../../freemarker/template/Configuration.html#setTemplateLookupStrategy-freemarker.cache.TemplateLookupStrategy-"><code>Configuration.setTemplateLookupStrategy(freemarker.cache.TemplateLookupStrategy)</code></a>.

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/Environment.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/Environment.html b/docs/api/freemarker/core/Environment.html
index b3ddcf3..d24ffe4 100644
--- a/docs/api/freemarker/core/Environment.html
+++ b/docs/api/freemarker/core/Environment.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Environment (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>Environment (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="Environment (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="Environment (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -517,7 +517,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#include-java.lang.String-java.lang.String-boolean-">include</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
        boolean&nbsp;parse)</code>
-<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate root relative.</div>
+<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be template root relative.</div>
 </td>
 </tr>
 <tr id="i46" class="altColor">
@@ -582,7 +582,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <tr id="i55" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setLocale-java.util.Locale-">setLocale</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
-<div class="block">Sets the default locale used for number and date formatting (among others), also the locale used for searching
+<div class="block">Sets the locale used for number and date formatting (among others), also the locale used for searching
  localized template variations when no locale was explicitly requested.</div>
 </td>
 </tr>
@@ -893,8 +893,10 @@ public&nbsp;void&nbsp;visit(freemarker.core.TemplateElement&nbsp;element,
 <h4>setLocale</h4>
 <pre>public&nbsp;void&nbsp;setLocale(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-">Configurable</a></code></span></div>
-<div class="block">Sets the default locale used for number and date formatting (among others), also the locale used for searching
- localized template variations when no locale was explicitly requested.</div>
+<div class="block">Sets the locale used for number and date formatting (among others), also the locale used for searching
+ localized template variations when no locale was explicitly requested. On the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> level it
+ defaults to the default locale of system (of the JVM), for server-side application usually you should set it
+ explicitly in the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> to use the preferred locale of your application instead.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-">setLocale</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></code></dd>
@@ -975,7 +977,7 @@ public&nbsp;void&nbsp;visit(freemarker.core.TemplateElement&nbsp;element,
    <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Date.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Date</code></a> and <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Time.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Time</code></a>, and then if, for example,
    <code>time_zone</code> is GMT+00:00, the
    values from the earlier examples will be shown as 2014-07-11 (one day off) and 09:57:00 (2 hours off). While
-   those are the time zone correct renderings, those values probably was meant to shown "as is".
+   those are the time zone correct renderings, those values are probably meant to be shown "as is".
    
    <li>You may wonder why this setting isn't simply "SQL time zone", since the time zone related behavior of JDBC
    applies to <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Timestamp.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Timestamp</code></a> too. FreeMarker assumes that you have set up your
@@ -1839,7 +1841,7 @@ public&nbsp;void&nbsp;visit(freemarker.core.TemplateElement&nbsp;element,
                     boolean&nbsp;parse)
              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>,
                     <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></pre>
-<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate root relative.
+<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be template root relative.
 
  <p>
  It's the same as <code>include(getTemplateForInclusion(name, encoding, parse))</code>. But, you may want to
@@ -2054,12 +2056,13 @@ public&nbsp;void&nbsp;visit(freemarker.core.TemplateElement&nbsp;element,
  template refers to another template.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>baseName</code> - The name to which relative <code>targetName</code>-s are relative to. Maybe <code>null</code>, which usually
-            means that the base is the root "directory". Assuming <a href="../../freemarker/cache/TemplateNameFormat.html#DEFAULT_2_3_0"><code>TemplateNameFormat.DEFAULT_2_3_0</code></a> or
+<dd><code>baseName</code> - The name to which relative <code>targetName</code>-s are relative to. Maybe <code>null</code> (happens when
+            resolving names in nameless templates), which means that the base is the root "directory", and so the
+            <code>targetName</code> is returned without change. Assuming <a href="../../freemarker/cache/TemplateNameFormat.html#DEFAULT_2_3_0"><code>TemplateNameFormat.DEFAULT_2_3_0</code></a> or
             <a href="../../freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0"><code>TemplateNameFormat.DEFAULT_2_4_0</code></a>, the rules are as follows. If you want to specify a base
             directory here, it must end with <code>"/"</code>. If it doesn't end with <code>"/"</code>, it's parent
             directory will be used as the base path. Might starts with a scheme part (like <code>"foo://"</code>, or
-            with <a href="../../freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0"><code>TemplateNameFormat.DEFAULT_2_4_0</code></a> even just <code>"foo:"</code>).</dd>
+            with <a href="../../freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0"><code>TemplateNameFormat.DEFAULT_2_4_0</code></a> even just with <code>"foo:"</code>).</dd>
 <dd><code>targetName</code> - The name of the template, which is either a relative or absolute name. Assuming
             <a href="../../freemarker/cache/TemplateNameFormat.html#DEFAULT_2_3_0"><code>TemplateNameFormat.DEFAULT_2_3_0</code></a> or <a href="../../freemarker/cache/TemplateNameFormat.html#DEFAULT_2_4_0"><code>TemplateNameFormat.DEFAULT_2_4_0</code></a>, the rules are as
             follows. If it starts with <code>"/"</code> or contains a scheme part separator (<code>"://"</code>, also, with

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/core/HTMLOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/HTMLOutputFormat.html b/docs/api/freemarker/core/HTMLOutputFormat.html
index 3766bf0..78b8e40 100644
--- a/docs/api/freemarker/core/HTMLOutputFormat.html
+++ b/docs/api/freemarker/core/HTMLOutputFormat.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:02 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:38 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>HTMLOutputFormat (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>HTMLOutputFormat (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="HTMLOutputFormat (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="HTMLOutputFormat (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -292,7 +292,7 @@ extends <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="cla
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
 <div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
- if this output format doesn't clearly corresponds to a specific MIME type.</div>
+ <code>null</code> if this output format doesn't clearly corresponds to a specific MIME type.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>

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

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



Mime
View raw message