freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [36/37] incubator-freemarker-site git commit: Site updates for 2.3.26.
Date Sun, 26 Mar 2017 11:15:02 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/ByteArrayTemplateLoader.html b/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
index c8bf737..166ec1b 100644
--- a/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
+++ b/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:01 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:37 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ByteArrayTemplateLoader (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>ByteArrayTemplateLoader (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="ByteArrayTemplateLoader (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="ByteArrayTemplateLoader (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -188,19 +188,27 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ByteArrayTemplateLoader.html#putTemplate-java.lang.String-byte:A-">putTemplate</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,
-           byte[]&nbsp;templateSource)</code>
-<div class="block">Puts a template into the loader.</div>
+           byte[]&nbsp;templateContent)</code>
+<div class="block">Adds a template to this template loader; see <a href="../../freemarker/cache/StringTemplateLoader.html#putTemplate-java.lang.String-java.lang.String-"><code>StringTemplateLoader.putTemplate(String, String)</code></a> for more.</div>
 </td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ByteArrayTemplateLoader.html#putTemplate-java.lang.String-byte:A-long-">putTemplate</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,
-           byte[]&nbsp;templateSource,
+           byte[]&nbsp;templateContent,
            long&nbsp;lastModified)</code>
-<div class="block">Puts a template into the loader.</div>
+<div class="block">Adds a template to this template loader; see <a href="../../freemarker/cache/StringTemplateLoader.html#putTemplate-java.lang.String-java.lang.String-long-"><code>StringTemplateLoader.putTemplate(String, String, long)</code></a> for
+ more.</div>
 </td>
 </tr>
 <tr id="i6" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ByteArrayTemplateLoader.html#removeTemplate-java.lang.String-">removeTemplate</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Removes the template with the specified name if it was added earlier.; see
+ <a href="../../freemarker/cache/StringTemplateLoader.html#removeTemplate-java.lang.String-"><code>StringTemplateLoader.removeTemplate(String)</code></a> for more details.</div>
+</td>
+</tr>
+<tr id="i7" 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/cache/ByteArrayTemplateLoader.html#toString--">toString</a></span>()</code>
 <div class="block">Show class name and some details that are useful in template-not-found errors.</div>
@@ -252,15 +260,8 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <li class="blockList">
 <h4>putTemplate</h4>
 <pre>public&nbsp;void&nbsp;putTemplate(<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,
-                        byte[]&nbsp;templateSource)</pre>
-<div class="block">Puts a template into the loader. A call to this method is identical to 
- the call to the three-arg <a href="../../freemarker/cache/ByteArrayTemplateLoader.html#putTemplate-java.lang.String-byte:A-long-"><code>putTemplate(String, byte[], long)</code></a> 
- passing <tt>System.currentTimeMillis()</tt> as the third argument.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the name of the template.</dd>
-<dd><code>templateSource</code> - the source code of the template.</dd>
-</dl>
+                        byte[]&nbsp;templateContent)</pre>
+<div class="block">Adds a template to this template loader; see <a href="../../freemarker/cache/StringTemplateLoader.html#putTemplate-java.lang.String-java.lang.String-"><code>StringTemplateLoader.putTemplate(String, String)</code></a> for more.</div>
 </li>
 </ul>
 <a name="putTemplate-java.lang.String-byte:A-long-">
@@ -270,23 +271,24 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <li class="blockList">
 <h4>putTemplate</h4>
 <pre>public&nbsp;void&nbsp;putTemplate(<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,
-                        byte[]&nbsp;templateSource,
+                        byte[]&nbsp;templateContent,
                         long&nbsp;lastModified)</pre>
-<div class="block">Puts a template into the loader. The name can contain slashes to denote
- logical directory structure, but must not start with a slash. If the 
- method is called multiple times for the same name and with different
- last modified time, the configuration's template cache will reload the 
- template according to its own refresh settings (note that if the refresh 
- is disabled in the template cache, the template will not be reloaded).
- Also, since the cache uses lastModified to trigger reloads, calling the
- method with different source and identical timestamp won't trigger
- reloading.</div>
+<div class="block">Adds a template to this template loader; see <a href="../../freemarker/cache/StringTemplateLoader.html#putTemplate-java.lang.String-java.lang.String-long-"><code>StringTemplateLoader.putTemplate(String, String, long)</code></a> for
+ more.</div>
+</li>
+</ul>
+<a name="removeTemplate-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeTemplate</h4>
+<pre>public&nbsp;boolean&nbsp;removeTemplate(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
+<div class="block">Removes the template with the specified name if it was added earlier.; see
+ <a href="../../freemarker/cache/StringTemplateLoader.html#removeTemplate-java.lang.String-"><code>StringTemplateLoader.removeTemplate(String)</code></a> for more details.</div>
 <dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - the name of the template.</dd>
-<dd><code>templateSource</code> - the source code of the template.</dd>
-<dd><code>lastModified</code> - the time of last modification of the template in 
- terms of <tt>System.currentTimeMillis()</tt></dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.26</dd>
 </dl>
 </li>
 </ul>
@@ -324,12 +326,12 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - The name of the template, already localized and normalized by the
-            <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
+            the <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
             interpret the name, however it should expect to receive hierarchical paths where path components are
             separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
             not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, be throwing and
+            passing to this method, so it's up to the template loader to handle them (say, by throwing an
             exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
             typical mistake of Windows users). The passed names are always considered relative to some
             loader-defined root location (often referred as the "template root directory"), and will never start

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/cache/ClassTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/ClassTemplateLoader.html b/docs/api/freemarker/cache/ClassTemplateLoader.html
index ed0cfa4..086d9cc 100644
--- a/docs/api/freemarker/cache/ClassTemplateLoader.html
+++ b/docs/api/freemarker/cache/ClassTemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:01 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:37 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ClassTemplateLoader (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>ClassTemplateLoader (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="ClassTemplateLoader (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="ClassTemplateLoader (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -150,7 +150,7 @@ extends <a href="../../freemarker/cache/URLTemplateLoader.html" title="class in
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.Class-">ClassTemplateLoader</a></span>(<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;resourceLoaderClass)</code>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.Class-">ClassTemplateLoader</a></span>(<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;resourceLoaderClass)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">It's confusing that the base path is <code>""</code>; use <a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.Class-java.lang.String-"><code>ClassTemplateLoader(Class, String)</code></a>
              instead.</span></div>
@@ -158,17 +158,17 @@ extends <a href="../../freemarker/cache/URLTemplateLoader.html" title="class in
 </td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.ClassLoader-java.lang.String-">ClassTemplateLoader</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassLoader.html?is-external=true" title="class or interface in java.lang">ClassLoader</a>&nbsp;classLoader,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.Class-java.lang.String-">ClassTemplateLoader</a></span>(<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;resourceLoaderClass,
                    <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;basePackagePath)</code>
-<div class="block">Similar to <a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.Class-java.lang.String-"><code>ClassTemplateLoader(Class, String)</code></a>, but instead of <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true#getResource-java.lang.String-" title="class or interface in java.lang"><code>Class.getResource(String)</code></a> it uses
- <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassLoader.html?is-external=true#getResource-java.lang.String-" title="class or interface in java.lang"><code>ClassLoader.getResource(String)</code></a>.</div>
+<div class="block">Creates a template loader that will use the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true#getResource-java.lang.String-" title="class or interface in java.lang"><code>Class.getResource(String)</code></a> method of the specified class to
+ load the resources, and the specified base package path (absolute or relative).</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.Class-java.lang.String-">ClassTemplateLoader</a></span>(<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;resourceLoaderClass,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.ClassLoader-java.lang.String-">ClassTemplateLoader</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassLoader.html?is-external=true" title="class or interface in java.lang">ClassLoader</a>&nbsp;classLoader,
                    <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;basePackagePath)</code>
-<div class="block">Creates a template loader that will use the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true#getResource-java.lang.String-" title="class or interface in java.lang"><code>Class.getResource(String)</code></a> method of the specified class to
- load the resources, and the specified base package path (absolute or relative).</div>
+<div class="block">Similar to <a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.Class-java.lang.String-"><code>ClassTemplateLoader(Class, String)</code></a>, but instead of <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true#getResource-java.lang.String-" title="class or interface in java.lang"><code>Class.getResource(String)</code></a> it uses
+ <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassLoader.html?is-external=true#getResource-java.lang.String-" title="class or interface in java.lang"><code>ClassLoader.getResource(String)</code></a>.</div>
 </td>
 </tr>
 </table>
@@ -277,7 +277,7 @@ public&nbsp;ClassTemplateLoader()</pre>
 <li class="blockList">
 <h4>ClassTemplateLoader</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;ClassTemplateLoader(<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;resourceLoaderClass)</pre>
+public&nbsp;ClassTemplateLoader(<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;resourceLoaderClass)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">It's confusing that the base path is <code>""</code>; use <a href="../../freemarker/cache/ClassTemplateLoader.html#ClassTemplateLoader-java.lang.Class-java.lang.String-"><code>ClassTemplateLoader(Class, String)</code></a>
              instead.</span></div>
 <div class="block">Creates a template loader that will use the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true#getResource-java.lang.String-" title="class or interface in java.lang"><code>Class.getResource(String)</code></a> method of the specified class to
@@ -295,7 +295,7 @@ public&nbsp;ClassTemplateLoader(<a href="http://docs.oracle.com/javase/8/docs/ap
 <ul class="blockList">
 <li class="blockList">
 <h4>ClassTemplateLoader</h4>
-<pre>public&nbsp;ClassTemplateLoader(<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;resourceLoaderClass,
+<pre>public&nbsp;ClassTemplateLoader(<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;resourceLoaderClass,
                            <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;basePackagePath)</pre>
 <div class="block">Creates a template loader that will use the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true#getResource-java.lang.String-" title="class or interface in java.lang"><code>Class.getResource(String)</code></a> method of the specified class to
  load the resources, and the specified base package path (absolute or relative).
@@ -366,8 +366,7 @@ public&nbsp;ClassTemplateLoader(<a href="http://docs.oracle.com/javase/8/docs/ap
 <dd><code>name</code> - the name of the sought template, including the locale
  decorations.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>an URL that points to the template source, or null if it can
- determine that the template source does not exist.</dd>
+<dd>an URL that points to the template source, or <code>null</code> if the template does not exist.</dd>
 </dl>
 </li>
 </ul>

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/cache/FileTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/FileTemplateLoader.html b/docs/api/freemarker/cache/FileTemplateLoader.html
index 4650c82..1612c57 100644
--- a/docs/api/freemarker/cache/FileTemplateLoader.html
+++ b/docs/api/freemarker/cache/FileTemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:01 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:37 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>FileTemplateLoader (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>FileTemplateLoader (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="FileTemplateLoader (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="FileTemplateLoader (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -398,12 +398,12 @@ public&nbsp;FileTemplateLoader()
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - The name of the template, already localized and normalized by the
-            <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
+            the <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
             interpret the name, however it should expect to receive hierarchical paths where path components are
             separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
             not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, be throwing and
+            passing to this method, so it's up to the template loader to handle them (say, by throwing an
             exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
             typical mistake of Windows users). The passed names are always considered relative to some
             loader-defined root location (often referred as the "template root directory"), and will never start

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/cache/MultiTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/MultiTemplateLoader.html b/docs/api/freemarker/cache/MultiTemplateLoader.html
index c1bbda2..9fab069 100644
--- a/docs/api/freemarker/cache/MultiTemplateLoader.html
+++ b/docs/api/freemarker/cache/MultiTemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:01 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:37 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MultiTemplateLoader (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>MultiTemplateLoader (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="MultiTemplateLoader (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="MultiTemplateLoader (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -142,8 +142,8 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/MultiTemplateLoader.html#MultiTemplateLoader-freemarker.cache.TemplateLoader:A-">MultiTemplateLoader</a></span>(<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>[]&nbsp;loaders)</code>
-<div class="block">Creates a new multi template Loader that will use the specified loaders.</div>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/MultiTemplateLoader.html#MultiTemplateLoader-freemarker.cache.TemplateLoader:A-">MultiTemplateLoader</a></span>(<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>[]&nbsp;templateLoaders)</code>
+<div class="block">Creates a new instance that will use the specified template loaders.</div>
 </td>
 </tr>
 </table>
@@ -202,17 +202,22 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/MultiTemplateLoader.html#isSticky--">isSticky</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/MultiTemplateLoader.html#isSticky--">isSticky</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/cache/MultiTemplateLoader.html#setSticky-boolean-"><code>setSticky(boolean)</code></a>.</div>
+</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/MultiTemplateLoader.html#resetState--">resetState</a></span>()</code>
-<div class="block">Clears the soft affinity memory, also resets all enclosed <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache"><code>StatefulTemplateLoader</code></a>-s.</div>
+<div class="block">Clears the sickiness memory, also resets the state of all enclosed <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache"><code>StatefulTemplateLoader</code></a>-s.</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/MultiTemplateLoader.html#setSticky-boolean-">setSticky</a></span>(boolean&nbsp;sticky)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/MultiTemplateLoader.html#setSticky-boolean-">setSticky</a></span>(boolean&nbsp;sticky)</code>
+<div class="block">Sets if for a name that was already loaded earlier the same <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> will be tried first, or
+ we always try the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-s strictly in the order as it was specified in the constructor.</div>
+</td>
 </tr>
 <tr id="i9" 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>
@@ -248,11 +253,12 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MultiTemplateLoader</h4>
-<pre>public&nbsp;MultiTemplateLoader(<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>[]&nbsp;loaders)</pre>
-<div class="block">Creates a new multi template Loader that will use the specified loaders.</div>
+<pre>public&nbsp;MultiTemplateLoader(<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>[]&nbsp;templateLoaders)</pre>
+<div class="block">Creates a new instance that will use the specified template loaders.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>loaders</code> - the loaders that are used to load templates.</dd>
+<dd><code>templateLoaders</code> - the template loaders that are used to load templates, in the order as they will be searched
+            (except where <a href="../../freemarker/cache/MultiTemplateLoader.html#setSticky-boolean-">stickiness</a> says otherwise).</dd>
 </dl>
 </li>
 </ul>
@@ -279,12 +285,12 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - The name of the template, already localized and normalized by the
-            <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
+            the <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
             interpret the name, however it should expect to receive hierarchical paths where path components are
             separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
             not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, be throwing and
+            passing to this method, so it's up to the template loader to handle them (say, by throwing an
             exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
             typical mistake of Windows users). The passed names are always considered relative to some
             loader-defined root location (often referred as the "template root directory"), and will never start
@@ -407,7 +413,7 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 <li class="blockList">
 <h4>resetState</h4>
 <pre>public&nbsp;void&nbsp;resetState()</pre>
-<div class="block">Clears the soft affinity memory, also resets all enclosed <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache"><code>StatefulTemplateLoader</code></a>-s.</div>
+<div class="block">Clears the sickiness memory, also resets the state of all enclosed <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache"><code>StatefulTemplateLoader</code></a>-s.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/cache/StatefulTemplateLoader.html#resetState--">resetState</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache">StatefulTemplateLoader</a></code></dd>
@@ -465,6 +471,7 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 <li class="blockList">
 <h4>isSticky</h4>
 <pre>public&nbsp;boolean&nbsp;isSticky()</pre>
+<div class="block">Getter pair of <a href="../../freemarker/cache/MultiTemplateLoader.html#setSticky-boolean-"><code>setSticky(boolean)</code></a>.</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.3.24</dd>
@@ -478,6 +485,9 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 <li class="blockList">
 <h4>setSticky</h4>
 <pre>public&nbsp;void&nbsp;setSticky(boolean&nbsp;sticky)</pre>
+<div class="block">Sets if for a name that was already loaded earlier the same <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> will be tried first, or
+ we always try the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-s strictly in the order as it was specified in the constructor.
+ The default is <code>true</code>.</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.3.24</dd>

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/cache/StringTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/StringTemplateLoader.html b/docs/api/freemarker/cache/StringTemplateLoader.html
index ad1861e..d233618 100644
--- a/docs/api/freemarker/cache/StringTemplateLoader.html
+++ b/docs/api/freemarker/cache/StringTemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:01 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:37 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StringTemplateLoader (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>StringTemplateLoader (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="StringTemplateLoader (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="StringTemplateLoader (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -120,7 +120,7 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <div class="block">A <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses 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> with <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang"><code>String</code></a>-s as its source of 
  templates.
 
- In most case the regular way of loading templates from files will be fine.
+ <p>In most case the regular way of loading templates from files will be fine.
  However, there can be situations where you don't want to or can't load a
  template from a file, e.g. if you have to deploy a single jar for 
  JavaWebStart or if they are contained within a database.
@@ -131,21 +131,21 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
    Template t = new Template("name", new StringReader(templateStr),
                new Configuration());
  </pre>
- If, however, you want to create templates from strings which import other 
+ <p>If, however, you want to create templates from strings which import other 
  templates this method doesn't work.
 
- In that case you can create a StringTemplateLoader and add each template to 
+ <p>In that case you can create a StringTemplateLoader and add each template to 
  it:
  <pre>
    StringTemplateLoader stringLoader = new StringTemplateLoader();
    stringLoader.putTemplate("greetTemplate", "&lt;#macro greet&gt;Hello&lt;/#macro&gt;");
    stringLoader.putTemplate("myTemplate", "&lt;#include \"greetTemplate\"&gt;&lt;@greet/&gt; World!");
  </pre>
- Then you tell your Configuration object to use it:
+ <p>Then you tell your Configuration object to use it:
  <pre>
    cfg.setTemplateLoader(stringLoader);
  </pre>
- After that you should be able to use the templates as usual. Often you will
+ <p>After that you should be able to use the templates as usual. Often you will
  want to combine a <tt>StringTemplateLoader</tt> with another loader. You can
  do so using a <a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><code>MultiTemplateLoader</code></a>.</div>
 </li>
@@ -213,14 +213,14 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/StringTemplateLoader.html#putTemplate-java.lang.String-java.lang.String-">putTemplate</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;templateSource)</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>&nbsp;templateContent)</code>
 <div class="block">Puts a template into the loader.</div>
 </td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/StringTemplateLoader.html#putTemplate-java.lang.String-java.lang.String-long-">putTemplate</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;templateSource,
+           <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;templateContent,
            long&nbsp;lastModified)</code>
 <div class="block">Puts a template into the loader.</div>
 </td>
@@ -283,14 +283,17 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <li class="blockList">
 <h4>putTemplate</h4>
 <pre>public&nbsp;void&nbsp;putTemplate(<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;templateSource)</pre>
+                        <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;templateContent)</pre>
 <div class="block">Puts a template into the loader. A call to this method is identical to 
  the call to the three-arg <a href="../../freemarker/cache/StringTemplateLoader.html#putTemplate-java.lang.String-java.lang.String-long-"><code>putTemplate(String, String, long)</code></a> 
- passing <tt>System.currentTimeMillis()</tt> as the third argument.</div>
+ passing <tt>System.currentTimeMillis()</tt> as the third argument.
+ 
+ <p>Note that this method is not thread safe! Don't call it after FreeMarker has started using this template
+ loader.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>name</code> - the name of the template.</dd>
-<dd><code>templateSource</code> - the source code of the template.</dd>
+<dd><code>templateContent</code> - the source code of the template.</dd>
 </dl>
 </li>
 </ul>
@@ -301,7 +304,7 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <li class="blockList">
 <h4>putTemplate</h4>
 <pre>public&nbsp;void&nbsp;putTemplate(<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;templateSource,
+                        <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;templateContent,
                         long&nbsp;lastModified)</pre>
 <div class="block">Puts a template into the loader. The name can contain slashes to denote
  logical directory structure, but must not start with a slash. If the 
@@ -311,11 +314,14 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
  is disabled in the template cache, the template will not be reloaded).
  Also, since the cache uses lastModified to trigger reloads, calling the
  method with different source and identical timestamp won't trigger
- reloading.</div>
+ reloading.
+ 
+ <p>Note that this method is not thread safe! Don't call it after FreeMarker has started using this template
+ loader.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>name</code> - the name of the template.</dd>
-<dd><code>templateSource</code> - the source code of the template.</dd>
+<dd><code>templateContent</code> - the source code of the template.</dd>
 <dd><code>lastModified</code> - the time of last modification of the template in 
  terms of <tt>System.currentTimeMillis()</tt></dd>
 </dl>
@@ -328,7 +334,10 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <li class="blockList">
 <h4>removeTemplate</h4>
 <pre>public&nbsp;boolean&nbsp;removeTemplate(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</pre>
-<div class="block">Removes the template with the specified name if it was added earlier.</div>
+<div class="block">Removes the template with the specified name if it was added earlier.
+ 
+ <p>Note that this method is not thread safe! Don't call it after FreeMarker has started using this template
+ loader.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>name</code> - Exactly the key with which the template was added.</dd>
@@ -373,12 +382,12 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-">findTemplateSource</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - The name of the template, already localized and normalized by the
-            <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
+            the <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
             interpret the name, however it should expect to receive hierarchical paths where path components are
             separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
             not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, be throwing and
+            passing to this method, so it's up to the template loader to handle them (say, by throwing an
             exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
             typical mistake of Windows users). The passed names are always considered relative to some
             loader-defined root location (often referred as the "template root directory"), and will never start

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/cache/TemplateCache.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateCache.html b/docs/api/freemarker/cache/TemplateCache.html
index 7e26e9e..cb2f576 100644
--- a/docs/api/freemarker/cache/TemplateCache.html
+++ b/docs/api/freemarker/cache/TemplateCache.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:01 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:37 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateCache (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateCache (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="TemplateCache (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateCache (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -529,7 +529,8 @@ public&nbsp;TemplateCache(<a href="../../freemarker/cache/TemplateLoader.html" t
                      <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>templateLoader</code> - The <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> to use. Can't be <code>null</code>.</dd>
+<dd><code>templateLoader</code> - The <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> to use. Can be <code>null</code>, though then every request will result in
+            <a href="../../freemarker/template/TemplateNotFoundException.html" title="class in freemarker.template"><code>TemplateNotFoundException</code></a>.</dd>
 <dd><code>cacheStorage</code> - The <a href="../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache"><code>CacheStorage</code></a> to use. Can't be <code>null</code>.</dd>
 <dd><code>templateLookupStrategy</code> - The <a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache"><code>TemplateLookupStrategy</code></a> to use. Can't be <code>null</code>.</dd>
 <dd><code>templateNameFormat</code> - The <a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache"><code>TemplateNameFormat</code></a> to use. Can't be <code>null</code>.</dd>

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/cache/TemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateLoader.html b/docs/api/freemarker/cache/TemplateLoader.html
index 798131f..1c2ba2c 100644
--- a/docs/api/freemarker/cache/TemplateLoader.html
+++ b/docs/api/freemarker/cache/TemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:01 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:37 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateLoader (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateLoader (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="TemplateLoader (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateLoader (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -203,12 +203,12 @@ var activeTableTab = "activeTableTab";
  template can be loaded from. See the return value for more information.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - The name of the template, already localized and normalized by the
-            <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
+<dd><code>name</code> - The name (template root directory relative path) of the template, already localized and normalized by
+            the <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>cache</code></a>. It is completely up to the loader implementation to
             interpret the name, however it should expect to receive hierarchical paths where path components are
             separated by a slash (not backslash). Backslashes (or any other OS specific separator character) are
             not considered as separators by FreeMarker, and thus they will not be replaced with slash before
-            passing to this method, so it's up to the template loader to handle them (say, be throwing and
+            passing to this method, so it's up to the template loader to handle them (say, by throwing an
             exception that tells the user that the path (s)he has entered is invalid, as (s)he must use slash --
             typical mistake of Windows users). The passed names are always considered relative to some
             loader-defined root location (often referred as the "template root directory"), and will never start

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/0e8012e0/docs/api/freemarker/cache/TemplateLookupContext.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateLookupContext.html b/docs/api/freemarker/cache/TemplateLookupContext.html
index 5f04eb2..a599d45 100644
--- a/docs/api/freemarker/cache/TemplateLookupContext.html
+++ b/docs/api/freemarker/cache/TemplateLookupContext.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_66) on Tue Jul 05 21:19:01 CEST 2016 -->
+<!-- Generated by javadoc (1.8.0_66) on Sat Mar 25 11:54:37 CET 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateLookupContext (FreeMarker 2.3.25-incubating API)</title>
-<meta name="date" content="2016-07-05">
+<title>TemplateLookupContext (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="TemplateLookupContext (FreeMarker 2.3.25-incubating API)";
+            parent.document.title="TemplateLookupContext (FreeMarker 2.3.26-incubating API)";
         }
     }
     catch(err) {
@@ -214,8 +214,9 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>templateName</code> - Must be a normalized name, like <code>"foo/bar/baaz.ftl"</code>. A name is not normalized when, among
-            others, it starts with <code>/</code>, or contains <code>.</code> or <code>..</code> paths steps, or it uses
-            backslash (<code>\</code>) instead of <code>/</code>. A normalized name might contains "*" steps.</dd>
+            others, it starts with <code>/</code>, or contains <code>.</code> or <code>..</code> path steps, or it uses
+            backslash (<code>\</code>) instead of <code>/</code>. A normalized name might contains "*" path steps
+            (acquisition).</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>The result of the lookup. Not <code>null</code>; check <a href="../../freemarker/cache/TemplateLookupResult.html#isPositive--"><code>TemplateLookupResult.isPositive()</code></a> to see if the
          lookup has found anything.</dd>

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

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

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



Mime
View raw message