freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [41/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.
Date Mon, 28 Mar 2016 15:27:29 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/TemplateLookupResult.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateLookupResult.html b/docs/api/freemarker/cache/class-use/TemplateLookupResult.html
index 506a993..190fef1 100644
--- a/docs/api/freemarker/cache/class-use/TemplateLookupResult.html
+++ b/docs/api/freemarker/cache/class-use/TemplateLookupResult.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.cache.TemplateLookupResult (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.TemplateLookupResult (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.cache.TemplateLookupResult (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.TemplateLookupResult (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/TemplateLookupStrategy.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateLookupStrategy.html b/docs/api/freemarker/cache/class-use/TemplateLookupStrategy.html
index a0344bf..56dd090 100644
--- a/docs/api/freemarker/cache/class-use/TemplateLookupStrategy.html
+++ b/docs/api/freemarker/cache/class-use/TemplateLookupStrategy.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.cache.TemplateLookupStrategy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.TemplateLookupStrategy (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.cache.TemplateLookupStrategy (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.TemplateLookupStrategy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -146,6 +146,18 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
              <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
              <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
              <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
+             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
+<div class="block">Same as
+ <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, TemplateLookupStrategy, TemplateNameFormat,
+ TemplateConfigurationFactory, Configuration)</code></a> with <code>null</code> for <code>templateConfigurations</code>-s.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
+             <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
+             <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
+             <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
+             <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>&nbsp;templateConfigurations,
              <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/TemplateNameFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateNameFormat.html b/docs/api/freemarker/cache/class-use/TemplateNameFormat.html
index 89f1256..27d7370 100644
--- a/docs/api/freemarker/cache/class-use/TemplateNameFormat.html
+++ b/docs/api/freemarker/cache/class-use/TemplateNameFormat.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.cache.TemplateNameFormat (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.TemplateNameFormat (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.cache.TemplateNameFormat (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.TemplateNameFormat (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -153,6 +153,18 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
              <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
              <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
              <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
+             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
+<div class="block">Same as
+ <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, TemplateLookupStrategy, TemplateNameFormat,
+ TemplateConfigurationFactory, Configuration)</code></a> with <code>null</code> for <code>templateConfigurations</code>-s.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
+             <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
+             <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
+             <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
+             <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>&nbsp;templateConfigurations,
              <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/TemplateSourceMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateSourceMatcher.html b/docs/api/freemarker/cache/class-use/TemplateSourceMatcher.html
new file mode 100644
index 0000000..afb8c16
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/TemplateSourceMatcher.html
@@ -0,0 +1,231 @@
+<!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 Mon Mar 28 17:23:05 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.cache.TemplateSourceMatcher (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class freemarker.cache.TemplateSourceMatcher (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</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><a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">Class</a></li>
+<li class="navBarCell1Rev">Use</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>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?freemarker/cache/class-use/TemplateSourceMatcher.html" target="_top">Frames</a></li>
+<li><a href="TemplateSourceMatcher.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>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class freemarker.cache.TemplateSourceMatcher" class="title">Uses of Class<br>freemarker.cache.TemplateSourceMatcher</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#freemarker.cache">freemarker.cache</a></td>
+<td class="colLast">
+<div class="block">Template <em>loading</em> and caching.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.cache">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/AndMatcher.html" title="class in freemarker.cache">AndMatcher</a></span></code>
+<div class="block">Logical "and" operation among the given matchers.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></span></code>
+<div class="block">Matches the file extension; unlike other matchers, by default case <em>insensitive</em>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></span></code>
+<div class="block">As opposed to <a href="../../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><code>PathGlobMatcher</code></a>, it only compares the "file name" part (the part after the last <code>/</code>) of
+ the source name with the given glob.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/NotMatcher.html" title="class in freemarker.cache">NotMatcher</a></span></code>
+<div class="block">Logical "not" operation on the given matcher.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/OrMatcher.html" title="class in freemarker.cache">OrMatcher</a></span></code>
+<div class="block">Logical "or" operation among the given matchers.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></span></code>
+<div class="block">Matches the whole template source name (also known as template source path) with the given glob.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache">PathRegexMatcher</a></span></code>
+<div class="block">Matches the whole template source name (also known as template source path) with the given regular expression.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
+<caption><span>Constructors in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> with parameters of type <a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/AndMatcher.html#AndMatcher-freemarker.cache.TemplateSourceMatcher...-">AndMatcher</a></span>(<a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a>...&nbsp;matchers)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/ConditionalTemplateConfigurationFactory.html#ConditionalTemplateConfigurationFactory-freemarker.cache.TemplateSourceMatcher-freemarker.core.TemplateConfiguration-">ConditionalTemplateConfigurationFactory</a></span>(<a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a>&nbsp;matcher,
+                                       <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;templateConfiguration)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/ConditionalTemplateConfigurationFactory.html#ConditionalTemplateConfigurationFactory-freemarker.cache.TemplateSourceMatcher-freemarker.cache.TemplateConfigurationFactory-">ConditionalTemplateConfigurationFactory</a></span>(<a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a>&nbsp;matcher,
+                                       <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>&nbsp;templateConfigurationFactory)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/NotMatcher.html#NotMatcher-freemarker.cache.TemplateSourceMatcher-">NotMatcher</a></span>(<a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a>&nbsp;matcher)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/OrMatcher.html#OrMatcher-freemarker.cache.TemplateSourceMatcher...-">OrMatcher</a></span>(<a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a>...&nbsp;matchers)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= 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><a href="../../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">Class</a></li>
+<li class="navBarCell1Rev">Use</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>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?freemarker/cache/class-use/TemplateSourceMatcher.html" target="_top">Frames</a></li>
+<li><a href="TemplateSourceMatcher.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>
+<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/6c6020ec/docs/api/freemarker/cache/class-use/URLTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/URLTemplateLoader.html b/docs/api/freemarker/cache/class-use/URLTemplateLoader.html
index 90b9c76..b2ded26 100644
--- a/docs/api/freemarker/cache/class-use/URLTemplateLoader.html
+++ b/docs/api/freemarker/cache/class-use/URLTemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.cache.URLTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.URLTemplateLoader (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.cache.URLTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.URLTemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/package-frame.html b/docs/api/freemarker/cache/package-frame.html
index 1d8f61f..0d6b493 100644
--- a/docs/api/freemarker/cache/package-frame.html
+++ b/docs/api/freemarker/cache/package-frame.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:57 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>freemarker.cache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.cache (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -22,23 +22,40 @@
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
+<li><a href="AndMatcher.html" title="class in freemarker.cache" target="classFrame">AndMatcher</a></li>
+<li><a href="ByteArrayTemplateLoader.html" title="class in freemarker.cache" target="classFrame">ByteArrayTemplateLoader</a></li>
 <li><a href="ClassTemplateLoader.html" title="class in freemarker.cache" target="classFrame">ClassTemplateLoader</a></li>
+<li><a href="ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache" target="classFrame">ConditionalTemplateConfigurationFactory</a></li>
+<li><a href="FileExtensionMatcher.html" title="class in freemarker.cache" target="classFrame">FileExtensionMatcher</a></li>
+<li><a href="FileNameGlobMatcher.html" title="class in freemarker.cache" target="classFrame">FileNameGlobMatcher</a></li>
 <li><a href="FileTemplateLoader.html" title="class in freemarker.cache" target="classFrame">FileTemplateLoader</a></li>
+<li><a href="FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache" target="classFrame">FirstMatchTemplateConfigurationFactory</a></li>
+<li><a href="MergingTemplateConfigurationFactory.html" title="class in freemarker.cache" target="classFrame">MergingTemplateConfigurationFactory</a></li>
 <li><a href="MruCacheStorage.html" title="class in freemarker.cache" target="classFrame">MruCacheStorage</a></li>
 <li><a href="MultiTemplateLoader.html" title="class in freemarker.cache" target="classFrame">MultiTemplateLoader</a></li>
+<li><a href="NotMatcher.html" title="class in freemarker.cache" target="classFrame">NotMatcher</a></li>
 <li><a href="NullCacheStorage.html" title="class in freemarker.cache" target="classFrame">NullCacheStorage</a></li>
+<li><a href="OrMatcher.html" title="class in freemarker.cache" target="classFrame">OrMatcher</a></li>
+<li><a href="PathGlobMatcher.html" title="class in freemarker.cache" target="classFrame">PathGlobMatcher</a></li>
+<li><a href="PathRegexMatcher.html" title="class in freemarker.cache" target="classFrame">PathRegexMatcher</a></li>
 <li><a href="SoftCacheStorage.html" title="class in freemarker.cache" target="classFrame">SoftCacheStorage</a></li>
 <li><a href="StringTemplateLoader.html" title="class in freemarker.cache" target="classFrame">StringTemplateLoader</a></li>
 <li><a href="StrongCacheStorage.html" title="class in freemarker.cache" target="classFrame">StrongCacheStorage</a></li>
 <li><a href="TemplateCache.html" title="class in freemarker.cache" target="classFrame">TemplateCache</a></li>
 <li><a href="TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache" target="classFrame">TemplateCache.MaybeMissingTemplate</a></li>
+<li><a href="TemplateConfigurationFactory.html" title="class in freemarker.cache" target="classFrame">TemplateConfigurationFactory</a></li>
 <li><a href="TemplateLookupContext.html" title="class in freemarker.cache" target="classFrame">TemplateLookupContext</a></li>
 <li><a href="TemplateLookupResult.html" title="class in freemarker.cache" target="classFrame">TemplateLookupResult</a></li>
 <li><a href="TemplateLookupStrategy.html" title="class in freemarker.cache" target="classFrame">TemplateLookupStrategy</a></li>
 <li><a href="TemplateNameFormat.html" title="class in freemarker.cache" target="classFrame">TemplateNameFormat</a></li>
+<li><a href="TemplateSourceMatcher.html" title="class in freemarker.cache" target="classFrame">TemplateSourceMatcher</a></li>
 <li><a href="URLTemplateLoader.html" title="class in freemarker.cache" target="classFrame">URLTemplateLoader</a></li>
 <li><a href="WebappTemplateLoader.html" title="class in freemarker.cache" target="classFrame">WebappTemplateLoader</a></li>
 </ul>
+<h2 title="Exceptions">Exceptions</h2>
+<ul title="Exceptions">
+<li><a href="TemplateConfigurationFactoryException.html" title="class in freemarker.cache" target="classFrame">TemplateConfigurationFactoryException</a></li>
+</ul>
 </div>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/package-summary.html b/docs/api/freemarker/cache/package-summary.html
index e7fcbc0..e22b494 100644
--- a/docs/api/freemarker/cache/package-summary.html
+++ b/docs/api/freemarker/cache/package-summary.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:57 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>freemarker.cache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.cache (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="freemarker.cache (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.cache (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -110,7 +110,7 @@
 <tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache">StatefulTemplateLoader</a></td>
 <td class="colLast">
-<div class="block">Interface that can be implemented by template loaders that maintain some 
+<div class="block">Interface that can be implemented by <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-s that maintain some 
  sort of internal state (i.e.</div>
 </td>
 </tr>
@@ -134,29 +134,79 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/cache/AndMatcher.html" title="class in freemarker.cache">AndMatcher</a></td>
+<td class="colLast">
+<div class="block">Logical "and" operation among the given matchers.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></td>
+<td class="colLast">
+<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 <code>byte[]</code> as its source of templates.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache">ClassTemplateLoader</a></td>
 <td class="colLast">
 <div class="block">A <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that can load templates from the "classpath".</div>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache">ConditionalTemplateConfigurationFactory</a></td>
+<td class="colLast">
+<div class="block">Returns the given <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> directly, or another <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a>'s result, when
+ the specified matcher matches the template source.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></td>
+<td class="colLast">
+<div class="block">Matches the file extension; unlike other matchers, by default case <em>insensitive</em>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></td>
+<td class="colLast">
+<div class="block">As opposed to <a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><code>PathGlobMatcher</code></a>, it only compares the "file name" part (the part after the last <code>/</code>) of
+ the source name with the given glob.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></td>
 <td class="colLast">
 <div class="block">A <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses files inside a specified directory as the source of templates.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></td>
+<td class="colLast">
+<div class="block">Returns the first non-<code>null</code> result of the child factories, ignoring all further child factories.</div>
+</td>
+</tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache">MergingTemplateConfigurationFactory</a></td>
+<td class="colLast">
+<div class="block">Returns the merged results of all the child factories.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache">MruCacheStorage</a></td>
 <td class="colLast">
 <div class="block">A cache storage that implements a two-level Most Recently Used cache.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a></td>
 <td class="colLast">
 <div class="block">A <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses a set of other loaders to load the templates.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/cache/NotMatcher.html" title="class in freemarker.cache">NotMatcher</a></td>
+<td class="colLast">
+<div class="block">Logical "not" operation on the given matcher.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache">NullCacheStorage</a></td>
 <td class="colLast">
@@ -164,39 +214,61 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache">SoftCacheStorage</a></td>
+<td class="colFirst"><a href="../../freemarker/cache/OrMatcher.html" title="class in freemarker.cache">OrMatcher</a></td>
+<td class="colLast">
+<div class="block">Logical "or" operation among the given matchers.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></td>
+<td class="colLast">
+<div class="block">Matches the whole template source name (also known as template source path) with the given glob.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache">PathRegexMatcher</a></td>
 <td class="colLast">
-<div class="block">Soft cache storage is a cache storage that uses <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ref/SoftReference.html?is-external=true" title="class or interface in java.lang.ref"><code>SoftReference</code></a> 
- objects to hold the objects it was passed, therefore allows the garbage
- collector to purge the cache when it determines that it wants to free up
- memory.</div>
+<div class="block">Matches the whole template source name (also known as template source path) with the given regular expression.</div>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache">SoftCacheStorage</a></td>
+<td class="colLast">
+<div class="block">Soft cache storage is a cache storage that uses <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ref/SoftReference.html?is-external=true" title="class or interface in java.lang.ref"><code>SoftReference</code></a> objects to hold the objects it was passed,
+ therefore allows the garbage collector to purge the cache when it determines that it wants to free up memory.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/cache/StringTemplateLoader.html" title="class in freemarker.cache">StringTemplateLoader</a></td>
 <td class="colLast">
-<div class="block">A <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses a Map with Strings as its source of 
+<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.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/StrongCacheStorage.html" title="class in freemarker.cache">StrongCacheStorage</a></td>
 <td class="colLast">
 <div class="block">Strong cache storage is a cache storage that simply wraps 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>.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache">TemplateCache</a></td>
 <td class="colLast">
 <div class="block">Performs caching and on-demand loading of the templates.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache">TemplateCache.MaybeMissingTemplate</a></td>
 <td class="colLast">
 <div class="block">Used for the return value of <a href="../../freemarker/cache/TemplateCache.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-"><code>TemplateCache.getTemplate(String, Locale, Object, String, boolean)</code></a>.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></td>
+<td class="colLast">
+<div class="block">Creates (or returns) <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>-s for template sources.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/TemplateLookupContext.html" title="class in freemarker.cache">TemplateLookupContext</a></td>
 <td class="colLast">
@@ -212,7 +284,7 @@
 <tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a></td>
 <td class="colLast">
-<div class="block">Finds the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-level (storage-level) template source for the template name witch which the template
+<div class="block">Finds the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-level (storage-level) template source for the template name with which the template
  was requested (as in <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a>).</div>
 </td>
 </tr>
@@ -223,13 +295,17 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache">URLTemplateLoader</a></td>
 <td class="colLast">
 <div class="block">This is an abstract template loader that can load templates whose
  location can be described by an URL.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache">WebappTemplateLoader</a></td>
 <td class="colLast">
 <div class="block">A <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> that uses streams reachable through <code>ServletContext.getResource(String)</code> as its source
@@ -239,6 +315,23 @@
 </tbody>
 </table>
 </li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
+<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Exception</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></td>
+<td class="colLast">
+<div class="block">Non-I/O exception thrown by <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a>-s.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
 </ul>
 <a name="package.description">
 <!--   -->

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/package-tree.html b/docs/api/freemarker/cache/package-tree.html
index 59007a7..2821f85 100644
--- a/docs/api/freemarker/cache/package-tree.html
+++ b/docs/api/freemarker/cache/package-tree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:57 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:05 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>freemarker.cache Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.cache Class Hierarchy (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="freemarker.cache Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.cache Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -82,6 +82,7 @@
 <ul>
 <li type="circle">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"><span class="typeNameLink">Object</span></a>
 <ul>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">ByteArrayTemplateLoader</span></a> (implements freemarker.cache.<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>)</li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">FileTemplateLoader</span></a> (implements freemarker.cache.<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>)</li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">MruCacheStorage</span></a> (implements freemarker.cache.<a href="../../freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache">CacheStorageWithGetSize</a>)</li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">MultiTemplateLoader</span></a> (implements freemarker.cache.<a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache">StatefulTemplateLoader</a>)</li>
@@ -91,10 +92,37 @@
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/StrongCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">StrongCacheStorage</span></a> (implements freemarker.cache.<a href="../../freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache">CacheStorageWithGetSize</a>, freemarker.cache.<a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a>)</li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateCache</span></a></li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateCache.MaybeMissingTemplate</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateConfigurationFactory</span></a>
+<ul>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">ConditionalTemplateConfigurationFactory</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">FirstMatchTemplateConfigurationFactory</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">MergingTemplateConfigurationFactory</span></a></li>
+</ul>
+</li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateLookupContext.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateLookupContext</span></a></li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateLookupResult.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateLookupResult</span></a></li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateLookupStrategy</span></a></li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateNameFormat</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateSourceMatcher</span></a>
+<ul>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/AndMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">AndMatcher</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">FileExtensionMatcher</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">FileNameGlobMatcher</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/NotMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">NotMatcher</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/OrMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">OrMatcher</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">PathGlobMatcher</span></a></li>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">PathRegexMatcher</span></a></li>
+</ul>
+</li>
+<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Throwable</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
+<ul>
+<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Exception</span></a>
+<ul>
+<li type="circle">freemarker.cache.<a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateConfigurationFactoryException</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">URLTemplateLoader</span></a> (implements freemarker.cache.<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>)
 <ul>
 <li type="circle">freemarker.cache.<a href="../../freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">ClassTemplateLoader</span></a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/package-use.html b/docs/api/freemarker/cache/package-use.html
index 5555c70..4b76df2 100644
--- a/docs/api/freemarker/cache/package-use.html
+++ b/docs/api/freemarker/cache/package-use.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package freemarker.cache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.cache (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package freemarker.cache (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.cache (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -135,13 +135,34 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/cache/class-use/FileExtensionMatcher.html#freemarker.cache">FileExtensionMatcher</a>
+<div class="block">Matches the file extension; unlike other matchers, by default case <em>insensitive</em>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/cache/class-use/FileNameGlobMatcher.html#freemarker.cache">FileNameGlobMatcher</a>
+<div class="block">As opposed to <a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><code>PathGlobMatcher</code></a>, it only compares the "file name" part (the part after the last <code>/</code>) of
+ the source name with the given glob.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/cache/class-use/FirstMatchTemplateConfigurationFactory.html#freemarker.cache">FirstMatchTemplateConfigurationFactory</a>
+<div class="block">Returns the first non-<code>null</code> result of the child factories, ignoring all further child factories.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/cache/class-use/NullCacheStorage.html#freemarker.cache">NullCacheStorage</a>
 <div class="block">A cache storage that doesn't store anything.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/cache/class-use/PathGlobMatcher.html#freemarker.cache">PathGlobMatcher</a>
+<div class="block">Matches the whole template source name (also known as template source path) with the given glob.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colOne"><a href="../../freemarker/cache/class-use/StatefulTemplateLoader.html#freemarker.cache">StatefulTemplateLoader</a>
-<div class="block">Interface that can be implemented by template loaders that maintain some 
+<div class="block">Interface that can be implemented by <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-s that maintain some 
  sort of internal state (i.e.</div>
 </td>
 </tr>
@@ -151,6 +172,16 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a href="../../freemarker/cache/class-use/TemplateConfigurationFactory.html#freemarker.cache">TemplateConfigurationFactory</a>
+<div class="block">Creates (or returns) <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>-s for template sources.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/cache/class-use/TemplateConfigurationFactoryException.html#freemarker.cache">TemplateConfigurationFactoryException</a>
+<div class="block">Non-I/O exception thrown by <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a>-s.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/cache/class-use/TemplateLoader.html#freemarker.cache">TemplateLoader</a>
 <div class="block">FreeMarker loads template "files" through objects that implement this interface,
  thus the templates need not be real files, and can come from any kind of data source
@@ -169,7 +200,7 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/cache/class-use/TemplateLookupStrategy.html#freemarker.cache">TemplateLookupStrategy</a>
-<div class="block">Finds the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-level (storage-level) template source for the template name witch which the template
+<div class="block">Finds the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-level (storage-level) template source for the template name with which the template
  was requested (as in <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a>).</div>
 </td>
 </tr>
@@ -179,6 +210,9 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/cache/class-use/TemplateSourceMatcher.html#freemarker.cache">TemplateSourceMatcher</a>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/cache/class-use/URLTemplateLoader.html#freemarker.cache">URLTemplateLoader</a>
 <div class="block">This is an abstract template loader that can load templates whose
  location can be described by an URL.</div>
@@ -222,19 +256,24 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/cache/class-use/TemplateConfigurationFactory.html#freemarker.template">TemplateConfigurationFactory</a>
+<div class="block">Creates (or returns) <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>-s for template sources.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/cache/class-use/TemplateLoader.html#freemarker.template">TemplateLoader</a>
 <div class="block">FreeMarker loads template "files" through objects that implement this interface,
  thus the templates need not be real files, and can come from any kind of data source
  (like classpath, servlet context, database, etc).</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/cache/class-use/TemplateLookupStrategy.html#freemarker.template">TemplateLookupStrategy</a>
-<div class="block">Finds the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-level (storage-level) template source for the template name witch which the template
+<div class="block">Finds the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-level (storage-level) template source for the template name with which the template
  was requested (as in <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a>).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/cache/class-use/TemplateNameFormat.html#freemarker.template">TemplateNameFormat</a>
 <div class="block">Symbolized template name format.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/AliasTemplateDateFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/AliasTemplateDateFormatFactory.html b/docs/api/freemarker/core/AliasTemplateDateFormatFactory.html
new file mode 100644
index 0000000..c9ea952
--- /dev/null
+++ b/docs/api/freemarker/core/AliasTemplateDateFormatFactory.html
@@ -0,0 +1,373 @@
+<!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 Mon Mar 28 17:23:03 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>AliasTemplateDateFormatFactory (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="AliasTemplateDateFormatFactory (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":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/AliasTemplateDateFormatFactory.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>Prev&nbsp;Class</li>
+<li><a href="../../freemarker/core/AliasTemplateNumberFormatFactory.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/AliasTemplateDateFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="AliasTemplateDateFormatFactory.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>Field&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>Field&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 AliasTemplateDateFormatFactory" class="title">Class AliasTemplateDateFormatFactory</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><a href="../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatFactory</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">freemarker.core.TemplateDateFormatFactory</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.AliasTemplateDateFormatFactory</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">AliasTemplateDateFormatFactory</span>
+extends <a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></pre>
+<div class="block">Creates an alias to another format, so that the format can be referred to with a simple name in the template, rather
+ than as a concrete pattern or other kind of format string.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== 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/AliasTemplateDateFormatFactory.html#AliasTemplateDateFormatFactory-java.lang.String-">AliasTemplateDateFormatFactory</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;targetFormatString)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/AliasTemplateDateFormatFactory.html#AliasTemplateDateFormatFactory-java.lang.String-java.util.Map-">AliasTemplateDateFormatFactory</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;defaultTargetFormatString,
+                              <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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;localizedTargetFormatStrings)</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><a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/AliasTemplateDateFormatFactory.html#get-java.lang.String-int-java.util.Locale-java.util.TimeZone-boolean-freemarker.core.Environment-">get</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;params,
+   int&nbsp;dateType,
+   <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,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a>&nbsp;timeZone,
+   boolean&nbsp;zonelessInput,
+   <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>
+<div class="block">Returns a formatter for the given parameters.</div>
+</td>
+</tr>
+</table>
+<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#toString--" title="class or interface in java.lang">toString</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">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="AliasTemplateDateFormatFactory-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>AliasTemplateDateFormatFactory</h4>
+<pre>public&nbsp;AliasTemplateDateFormatFactory(<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;targetFormatString)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>targetFormatString</code> - The format string this format will be an alias to.</dd>
+</dl>
+</li>
+</ul>
+<a name="AliasTemplateDateFormatFactory-java.lang.String-java.util.Map-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AliasTemplateDateFormatFactory</h4>
+<pre>public&nbsp;AliasTemplateDateFormatFactory(<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;defaultTargetFormatString,
+                                      <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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;localizedTargetFormatStrings)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>defaultTargetFormatString</code> - The format string this format will be an alias to if there's no locale-specific format string for the
+            requested locale in <code>localizedTargetFormatStrings</code></dd>
+<dd><code>localizedTargetFormatStrings</code> - Maps <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util"><code>Locale</code></a>-s to format strings. If the desired locale doesn't occur in the map, a less
+            specific locale is tried, repeatedly until only the language part remains. For example, if locale is
+            <code>new Locale("en", "US", "Linux")</code>, then these keys will be attempted untol a match is found, in
+            this order: <code>new Locale("en", "US", "Linux")</code>, <code>new Locale("en", "US")</code>,
+            <code>new Locale("en")</code>. If there's still no matching key, the value of the
+            <code>targetFormatString</code> will be used.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="get-java.lang.String-int-java.util.Locale-java.util.TimeZone-boolean-freemarker.core.Environment-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>get</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a>&nbsp;get(<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;params,
+                              int&nbsp;dateType,
+                              <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,
+                              <a href="http://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html?is-external=true" title="class or interface in java.util">TimeZone</a>&nbsp;timeZone,
+                              boolean&nbsp;zonelessInput,
+                              <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)
+                       throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/TemplateDateFormatFactory.html#get-java.lang.String-int-java.util.Locale-java.util.TimeZone-boolean-freemarker.core.Environment-">TemplateDateFormatFactory</a></code></span></div>
+<div class="block">Returns a formatter for the given parameters.
+ 
+ <p>
+ The returned formatter can be a new instance or a reused (cached) instance. Note that <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> itself
+ caches the returned instances, though that cache is lost with the <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> (i.e., when the top-level
+ template execution ends), also it might flushes lot of entries if the locale or time zone is changed during
+ template execution. So caching on the factory level is still useful, unless creating the formatters is
+ sufficiently cheap.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateDateFormatFactory.html#get-java.lang.String-int-java.util.Locale-java.util.TimeZone-boolean-freemarker.core.Environment-">get</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>params</code> - The string that further describes how the format should look. For example, when the
+            <a href="../../freemarker/core/Configurable.html#getDateFormat--"><code>dateFormat</code></a> is <code>"@fooBar 1, 2"</code>, then it will be
+            <code>"1, 2"</code> (and <code>"@fooBar"</code> selects the factory). The format of this string is up to the
+            <a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core"><code>TemplateDateFormatFactory</code></a> implementation. Not <code>null</code>, often an empty string.</dd>
+<dd><code>dateType</code> - <a href="../../freemarker/template/TemplateDateModel.html#DATE"><code>TemplateDateModel.DATE</code></a>, <a href="../../freemarker/template/TemplateDateModel.html#TIME"><code>TemplateDateModel.TIME</code></a>, <a href="../../freemarker/template/TemplateDateModel.html#DATETIME"><code>TemplateDateModel.DATETIME</code></a> or
+            <a href="../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>. Supporting <a href="../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a> is not necessary, in
+            which case the method should throw an <a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core"><code>UnknownDateTypeFormattingUnsupportedException</code></a> exception.</dd>
+<dd><code>locale</code> - The locale to format for. Not <code>null</code>. The resulting format should be bound to this locale
+            forever (i.e. locale changes in the <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> must not be followed).</dd>
+<dd><code>timeZone</code> - The time zone to format for. Not <code>null</code>. The resulting format must be bound to this time zone
+            forever (i.e. time zone changes in the <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> must not be followed).</dd>
+<dd><code>zonelessInput</code> - Indicates that the input Java <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> is not from a time zone aware source. When this is
+            <code>true</code>, the formatters shouldn't override the time zone provided to its constructor (most
+            formatters don't do that anyway), and it shouldn't show the time zone, if it can hide it (like a
+            <a href="http://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html?is-external=true" title="class or interface in java.text"><code>SimpleDateFormat</code></a> pattern-based formatter may can't do that, as the pattern prescribes what to
+            show).
+            <p>
+            As of FreeMarker 2.3.21, this is <code>true</code> exactly when the date is an SQL "date without time of
+            the day" (i.e., a <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>) or an SQL "time of the day" value (i.e., a
+            <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>, although this rule can change in future, depending on
+            configuration settings and such, so you shouldn't rely on this rule, just accept what this parameter
+            says.</dd>
+<dd><code>env</code> - The runtime environment from which the formatting was called. This is mostly meant to be used for
+            <a href="../../freemarker/core/Environment.html#setCustomState-java.lang.Object-java.lang.Object-"><code>Environment.setCustomState(Object, Object)</code></a>/<a href="../../freemarker/core/Environment.html#getCustomState-java.lang.Object-"><code>Environment.getCustomState(Object)</code></a>.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></code> - If any problem occurs while parsing/getting the format. Notable subclasses:
+             <a href="../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core"><code>InvalidFormatParametersException</code></a> if <code>params</code> is malformed;
+             <a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core"><code>UnknownDateTypeFormattingUnsupportedException</code></a> if <code>dateType</code> is
+             <a href="../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a> and that's unsupported by this factory.</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/AliasTemplateDateFormatFactory.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>Prev&nbsp;Class</li>
+<li><a href="../../freemarker/core/AliasTemplateNumberFormatFactory.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/AliasTemplateDateFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="AliasTemplateDateFormatFactory.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>Field&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>Field&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>


Mime
View raw message