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

[01/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/asf-site 872b15803 -> 6c6020ec3


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/detailed-toc.html
----------------------------------------------------------------------
diff --git a/docs/detailed-toc.html b/docs/detailed-toc.html
index 2083c04..5d43371 100644
--- a/docs/detailed-toc.html
+++ b/docs/detailed-toc.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-docgen-detailed-toc">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>FreeMarker Manual</title>
+<title>Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
-<meta property="og:title" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
+<meta property="og:title" content="Apache FreeMarker Manual">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/index.html">
-<link rel="canoical" href="http://freemarker.org/docs/index.html">
+<link rel="canonical" href="http://freemarker.org/docs/index.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,9 +25,8 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -39,42 +39,40 @@ ga('send', 'pageview');
       <script src="docgen-resources/main.min.js"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><span class="paging-arrow disabled previous"><span>Previous</span></span><a class="paging-arrow next" href="dgui.html"><span>Next</span></a></div><div class="title-wrapper">
-<h1 class="content-header header-book" id="autoid_1" itemprop="headline">FreeMarker Manual <span class="subtitle productname">For Freemarker 2.3.23</span>
+<h1 class="content-header header-book" id="autoid_1" itemprop="headline">Apache FreeMarker Manual <span class="subtitle productname">For Freemarker 2.3.24</span>
 </h1>
 </div></div><div class="page-menu">
-<ul><li><a class="page-menu-link" href="dgui.html" data-menu-target="dgui">Template Author&#39;s Guide</a><ul><li><a class="page-menu-link" href="dgui_quickstart.html" data-menu-target="dgui_quickstart">Getting Started</a><ul><li><a class="page-menu-link" href="dgui_quickstart_basics.html" data-menu-target="dgui_quickstart_basics">Template + data-model = output</a></li><li><a class="page-menu-link" href="dgui_quickstart_datamodel.html" data-menu-target="dgui_quickstart_datamodel">The data-model at a glance</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html" data-menu-target="dgui_quickstart_template">The template at a glance</a><ul><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_2" data-menu-target="autoid_2">Some basic directives</a><ul><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_3" data-menu-target="autoid_3">The if directive</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid
 _4" data-menu-target="autoid_4">The list directive</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_5" data-menu-target="autoid_5">The include directive</a></li></ul></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_6" data-menu-target="autoid_6">Using directives together</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_7" data-menu-target="autoid_7">Using built-ins</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_8" data-menu-target="autoid_8">Dealing with missing variables</a></li></ul></li></ul></li><li><a class="page-menu-link" href="dgui_datamodel.html" data-menu-target="dgui_datamodel">Values, Types</a><ul><li><a class="page-menu-link" href="dgui_datamodel_basics.html" data-menu-target="dgui_datamodel_basics">Basics</a><ul><li><a class="page-menu-link" href="dgui_datamodel_basics.html#topic.value" data-menu-target="topic.value">What is a value?</a></li><l
 i><a class="page-menu-link" href="dgui_datamodel_basics.html#autoid_9" data-menu-target="autoid_9">What is type?</a></li><li><a class="page-menu-link" href="dgui_datamodel_basics.html#autoid_10" data-menu-target="autoid_10">The data-model is a hash</a></li></ul></li><li><a class="page-menu-link" href="dgui_datamodel_types.html" data-menu-target="dgui_datamodel_types">The types</a><ul><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_scalar" data-menu-target="dgui_datamodel_scalar">Scalars</a></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_container" data-menu-target="dgui_datamodel_container">Containers</a></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#autoid_11" data-menu-target="autoid_11">Subroutines</a><ul><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_method" data-menu-target="dgui_datamodel_method">Methods and functions</a></li><li><a class="page-menu-link" href="dgui
 _datamodel_types.html#dgui_datamodel_userdefdir" data-menu-target="dgui_datamodel_userdefdir">User-defined directives</a></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#autoid_12" data-menu-target="autoid_12">Function/method versus user-defined directive</a></li></ul></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#autoid_13" data-menu-target="autoid_13">Miscellaneous</a><ul><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_node" data-menu-target="dgui_datamodel_node">Nodes</a></li></ul></li></ul></li></ul></li><li><a class="page-menu-link" href="dgui_template.html" data-menu-target="dgui_template">The Template</a><ul><li><a class="page-menu-link" href="dgui_template_overallstructure.html" data-menu-target="dgui_template_overallstructure">Overall structure</a></li><li><a class="page-menu-link" href="dgui_template_directives.html" data-menu-target="dgui_template_directives">Directives</a></li><li><a class="page-menu-link
 " href="dgui_template_exp.html" data-menu-target="dgui_template_exp">Expressions</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#exp_cheatsheet" data-menu-target="exp_cheatsheet">Quick overview (cheat sheet)</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct" data-menu-target="dgui_template_exp_direct">Specify values directly</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_string" data-menu-target="dgui_template_exp_direct_string">Strings</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_number" data-menu-target="dgui_template_exp_direct_number">Numbers</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_boolean" data-menu-target="dgui_template_exp_direct_boolean">Booleans</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_seuqence" data-menu-target="dgui_templa
 te_exp_direct_seuqence">Sequences</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_ranges" data-menu-target="dgui_template_exp_direct_ranges">Ranges</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_hash" data-menu-target="dgui_template_exp_direct_hash">Hashes</a></li></ul></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_var" data-menu-target="dgui_template_exp_var">Retrieving variables</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_var_toplevel" data-menu-target="dgui_template_exp_var_toplevel">Top-level variables</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_var_hash" data-menu-target="dgui_template_exp_var_hash">Retrieving data from a hash</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_var_sequence" data-menu-target="dgui_template_exp_var_sequence">Ret
 rieving data from a sequence</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_var_special" data-menu-target="dgui_template_exp_var_special">Special variables</a></li></ul></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_stringop" data-menu-target="dgui_template_exp_stringop">String operations</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation" data-menu-target="dgui_template_exp_stringop_interpolation">Interpolation (or concatenation)</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_get_character" data-menu-target="dgui_template_exp_get_character">Getting a character</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_stringop_slice" data-menu-target="dgui_template_exp_stringop_slice">String slicing (substrings)</a></li></ul></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui
 _template_exp_sequenceop" data-menu-target="dgui_template_exp_sequenceop">Sequence operations</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_sequenceop_cat" data-menu-target="dgui_template_exp_sequenceop_cat">Concatenation</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_seqenceop_slice" data-menu-target="dgui_template_exp_seqenceop_slice">Sequence slicing</a></li></ul></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_hashop" data-menu-target="dgui_template_exp_hashop">Hash operations</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_hashop_cat" data-menu-target="dgui_template_exp_hashop_cat">Concatenation</a></li></ul></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_arit" data-menu-target="dgui_template_exp_arit">Arithmetical calculations</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_tem
 plate_exp_comparison" data-menu-target="dgui_template_exp_comparison">Comparison</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_logicalop" data-menu-target="dgui_template_exp_logicalop">Logical operations</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_builtin" data-menu-target="dgui_template_exp_builtin">Built-ins</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_methodcall" data-menu-target="dgui_template_exp_methodcall">Method call</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_missing" data-menu-target="dgui_template_exp_missing">Handling missing values</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_missing_default" data-menu-target="dgui_template_exp_missing_default">Default value operator</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_missing_test" data-menu
 -target="dgui_template_exp_missing_test">Missing value test operator</a></li></ul></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_assignment" data-menu-target="dgui_template_exp_assignment">Assignment Operators</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_parentheses" data-menu-target="dgui_template_exp_parentheses">Parentheses</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_whitespace" data-menu-target="dgui_template_exp_whitespace">White-space in expressions</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_precedence" data-menu-target="dgui_template_exp_precedence">Operator precedence</a></li></ul></li><li><a class="page-menu-link" href="dgui_template_valueinsertion.html" data-menu-target="dgui_template_valueinsertion">Interpolations</a><ul><li><a class="page-menu-link" href="dgui_template_valueinsertion.html#autoid_14" data-menu-target
 ="autoid_14">Overview</a></li><li><a class="page-menu-link" href="dgui_template_valueinsertion.html#autoid_15" data-menu-target="autoid_15">Guide to inserting strings; don&#39;t forget escaping!</a></li><li><a class="page-menu-link" href="dgui_template_valueinsertion.html#autoid_16" data-menu-target="autoid_16">Guide to inserting numerical values</a></li><li><a class="page-menu-link" href="dgui_template_valueinsertion.html#dgui_template_valueinserion_universal_date" data-menu-target="dgui_template_valueinserion_universal_date">Guide to inserting date/time/date-time values</a></li><li><a class="page-menu-link" href="dgui_template_valueinsertion.html#autoid_17" data-menu-target="autoid_17">Guide to inserting boolean values</a></li><li><a class="page-menu-link" href="dgui_template_valueinsertion.html#autoid_18" data-menu-target="autoid_18">Exact conversion rules</a></li></ul></li></ul></li><li><a class="page-menu-link" href="dgui_misc.html" data-menu-target="dgui_misc">Miscellaneous</a
 ><ul><li><a class="page-menu-link" href="dgui_misc_userdefdir.html" data-menu-target="dgui_misc_userdefdir">Defining your own directives</a><ul><li><a class="page-menu-link" href="dgui_misc_userdefdir.html#autoid_19" data-menu-target="autoid_19">Basics</a></li><li><a class="page-menu-link" href="dgui_misc_userdefdir.html#autoid_20" data-menu-target="autoid_20">Parameters</a></li><li><a class="page-menu-link" href="dgui_misc_userdefdir.html#autoid_21" data-menu-target="autoid_21">Nested content</a></li><li><a class="page-menu-link" href="dgui_misc_userdefdir.html#dgui_misc_userdefdir_loopvar" data-menu-target="dgui_misc_userdefdir_loopvar">Macros with loop variables</a></li><li><a class="page-menu-link" href="dgui_misc_userdefdir.html#autoid_22" data-menu-target="autoid_22">More about user-defined directives and macros</a></li></ul></li><li><a class="page-menu-link" href="dgui_misc_var.html" data-menu-target="dgui_misc_var">Defining variables in the template</a></li><li><a class="pag
 e-menu-link" href="dgui_misc_namespace.html" data-menu-target="dgui_misc_namespace">Namespaces</a><ul><li><a class="page-menu-link" href="dgui_misc_namespace.html#autoid_23" data-menu-target="autoid_23">Creating a library</a></li><li><a class="page-menu-link" href="dgui_misc_namespace.html#autoid_24" data-menu-target="autoid_24">Writing the variables of imported namespaces</a></li><li><a class="page-menu-link" href="dgui_misc_namespace.html#autoid_25" data-menu-target="autoid_25">Namespaces and data-model</a></li><li><a class="page-menu-link" href="dgui_misc_namespace.html#autoid_26" data-menu-target="autoid_26">The life-cycle of namespaces</a></li><li><a class="page-menu-link" href="dgui_misc_namespace.html#autoid_27" data-menu-target="autoid_27">Writing libraries for other people</a></li></ul></li><li><a class="page-menu-link" href="dgui_misc_whitespace.html" data-menu-target="dgui_misc_whitespace">White-space handling</a><ul><li><a class="page-menu-link" href="dgui_misc_whitespac
 e.html#dgui_misc_whitespace_stripping" data-menu-target="dgui_misc_whitespace_stripping">White-space stripping</a></li><li><a class="page-menu-link" href="dgui_misc_whitespace.html#autoid_28" data-menu-target="autoid_28">Using compress directive</a></li></ul></li><li><a class="page-menu-link" href="dgui_misc_alternativesyntax.html" data-menu-target="dgui_misc_alternativesyntax">Alternative (square bracket) syntax</a></li></ul></li></ul></li><li><a class="page-menu-link" href="pgui.html" data-menu-target="pgui">Programmer&#39;s Guide</a><ul><li><a class="page-menu-link" href="pgui_quickstart.html" data-menu-target="pgui_quickstart">Getting Started</a><ul><li><a class="page-menu-link" href="pgui_quickstart_createconfiguration.html" data-menu-target="pgui_quickstart_createconfiguration">Create a configuration instance</a></li><li><a class="page-menu-link" href="pgui_quickstart_createdatamodel.html" data-menu-target="pgui_quickstart_createdatamodel">Create a data-model</a></li><li><a cl
 ass="page-menu-link" href="pgui_quickstart_gettemplate.html" data-menu-target="pgui_quickstart_gettemplate">Get the template</a></li><li><a class="page-menu-link" href="pgui_quickstart_merge.html" data-menu-target="pgui_quickstart_merge">Merging the template with the data-model</a></li><li><a class="page-menu-link" href="pgui_quickstart_all.html" data-menu-target="pgui_quickstart_all">Putting all together</a></li></ul></li><li><a class="page-menu-link" href="pgui_datamodel.html" data-menu-target="pgui_datamodel">The Data Model</a><ul><li><a class="page-menu-link" href="pgui_datamodel_basics.html" data-menu-target="pgui_datamodel_basics">Basics</a></li><li><a class="page-menu-link" href="pgui_datamodel_scalar.html" data-menu-target="pgui_datamodel_scalar">Scalars</a><ul><li><a class="page-menu-link" href="pgui_datamodel_scalar.html#autoid_29" data-menu-target="autoid_29">Difficulties with the "date-like" types</a></li></ul></li><li><a class="page-menu-link" href="pgui_datamodel_paren
 t.html" data-menu-target="pgui_datamodel_parent">Containers</a><ul><li><a class="page-menu-link" href="pgui_datamodel_parent.html#autoid_30" data-menu-target="autoid_30">Hashes</a></li><li><a class="page-menu-link" href="pgui_datamodel_parent.html#autoid_31" data-menu-target="autoid_31">Sequences</a></li><li><a class="page-menu-link" href="pgui_datamodel_parent.html#autoid_32" data-menu-target="autoid_32">Collections</a></li></ul></li><li><a class="page-menu-link" href="pgui_datamodel_method.html" data-menu-target="pgui_datamodel_method">Methods</a></li><li><a class="page-menu-link" href="pgui_datamodel_directive.html" data-menu-target="pgui_datamodel_directive">Directives</a><ul><li><a class="page-menu-link" href="pgui_datamodel_directive.html#autoid_33" data-menu-target="autoid_33">Example 1</a></li><li><a class="page-menu-link" href="pgui_datamodel_directive.html#autoid_34" data-menu-target="autoid_34">Example 2</a></li><li><a class="page-menu-link" href="pgui_datamodel_directive
 .html#autoid_35" data-menu-target="autoid_35">Notices</a></li></ul></li><li><a class="page-menu-link" href="pgui_datamodel_node.html" data-menu-target="pgui_datamodel_node">Node variables</a></li><li><a class="page-menu-link" href="pgui_datamodel_objectWrapper.html" data-menu-target="pgui_datamodel_objectWrapper">Object wrappers</a><ul><li><a class="page-menu-link" href="pgui_datamodel_objectWrapper.html#pgui_datamodel_defaultObjectWrapper" data-menu-target="pgui_datamodel_defaultObjectWrapper">The default object wrapper</a></li><li><a class="page-menu-link" href="pgui_datamodel_objectWrapper.html#pgui_datamodel_customObjectWrappingExample" data-menu-target="pgui_datamodel_customObjectWrappingExample">Custom object wrapping example</a></li></ul></li></ul></li><li><a class="page-menu-link" href="pgui_config.html" data-menu-target="pgui_config">The Configuration</a><ul><li><a class="page-menu-link" href="pgui_config_basics.html" data-menu-target="pgui_config_basics">Basics</a></li><li
 ><a class="page-menu-link" href="pgui_config_sharedvariables.html" data-menu-target="pgui_config_sharedvariables">Shared variables</a></li><li><a class="page-menu-link" href="pgui_config_settings.html" data-menu-target="pgui_config_settings">Settings</a></li><li><a class="page-menu-link" href="pgui_config_templateloading.html" data-menu-target="pgui_config_templateloading">Template loading</a><ul><li><a class="page-menu-link" href="pgui_config_templateloading.html#autoid_36" data-menu-target="autoid_36">Template loaders</a><ul><li><a class="page-menu-link" href="pgui_config_templateloading.html#autoid_37" data-menu-target="autoid_37">Built-in template loaders</a></li><li><a class="page-menu-link" href="pgui_config_templateloading.html#autoid_38" data-menu-target="autoid_38">Loading templates from multiple locations</a></li><li><a class="page-menu-link" href="pgui_config_templateloading.html#autoid_39" data-menu-target="autoid_39">Loading templates from other sources</a></li><li><a c
 lass="page-menu-link" href="pgui_config_templateloading.html#autoid_40" data-menu-target="autoid_40">The template name (template path)</a></li></ul></li><li><a class="page-menu-link" href="pgui_config_templateloading.html#pgui_config_templateloading_caching" data-menu-target="pgui_config_templateloading_caching">Template caching</a></li></ul></li><li><a class="page-menu-link" href="pgui_config_errorhandling.html" data-menu-target="pgui_config_errorhandling">Error handling</a><ul><li><a class="page-menu-link" href="pgui_config_errorhandling.html#autoid_41" data-menu-target="autoid_41">The possible exceptions</a></li><li><a class="page-menu-link" href="pgui_config_errorhandling.html#autoid_42" data-menu-target="autoid_42">Customizing the behavior regarding TemplatException-s</a></li><li><a class="page-menu-link" href="pgui_config_errorhandling.html#autoid_43" data-menu-target="autoid_43">Explicit error handling in templates</a></li></ul></li><li><a class="page-menu-link" href="pgui_co
 nfig_incompatible_improvements.html" data-menu-target="pgui_config_incompatible_improvements">The &quot;incompatible improvements&quot; setting</a><ul><li><a class="page-menu-link" href="pgui_config_incompatible_improvements.html#autoid_44" data-menu-target="autoid_44">What does it do</a></li><li><a class="page-menu-link" href="pgui_config_incompatible_improvements.html#pgui_config_incompatible_improvements_how_to_set" data-menu-target="pgui_config_incompatible_improvements_how_to_set">How to set it</a></li></ul></li></ul></li><li><a class="page-menu-link" href="pgui_misc.html" data-menu-target="pgui_misc">Miscellaneous</a><ul><li><a class="page-menu-link" href="pgui_misc_var.html" data-menu-target="pgui_misc_var">Variables, scopes</a></li><li><a class="page-menu-link" href="pgui_misc_charset.html" data-menu-target="pgui_misc_charset">Charset issues</a><ul><li><a class="page-menu-link" href="pgui_misc_charset.html#autoid_45" data-menu-target="autoid_45">The charset of the input</a><
 /li><li><a class="page-menu-link" href="pgui_misc_charset.html#autoid_46" data-menu-target="autoid_46">The charset of the output</a></li></ul></li><li><a class="page-menu-link" href="pgui_misc_multithreading.html" data-menu-target="pgui_misc_multithreading">Multithreading</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html" data-menu-target="pgui_misc_beanwrapper">Bean wrapper</a><ul><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#beanswrapper_hash" data-menu-target="beanswrapper_hash">TemplateHashModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#autoid_47" data-menu-target="autoid_47">A word on security</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#autoid_48" data-menu-target="autoid_48">TemplateScalarModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#autoid_49" data-menu-target="autoid_49">TemplateNumberModel functionality</a></li><li><a class
 ="page-menu-link" href="pgui_misc_beanwrapper.html#autoid_50" data-menu-target="autoid_50">TemplateCollectionModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#autoid_51" data-menu-target="autoid_51">TemplateSequenceModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#beanswrapper_method" data-menu-target="beanswrapper_method">TemplateMethodModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#autoid_52" data-menu-target="autoid_52">Unwrapping rules</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#autoid_53" data-menu-target="autoid_53">Accessing static methods</a></li><li><a class="page-menu-link" href="pgui_misc_beanwrapper.html#jdk_15_enums" data-menu-target="jdk_15_enums">Accessing enums</a></li></ul></li><li><a class="page-menu-link" href="pgui_misc_logging.html" data-menu-target="pgui_misc_logging">Logging</a><ul><li><a class="page-menu-link"
  href="pgui_misc_logging.html#autoid_54" data-menu-target="autoid_54">Logging library selection</a></li><li><a class="page-menu-link" href="pgui_misc_logging.html#autoid_55" data-menu-target="autoid_55">Logging categories</a></li></ul></li><li><a class="page-menu-link" href="pgui_misc_servlet.html" data-menu-target="pgui_misc_servlet">Using FreeMarker with servlets</a><ul><li><a class="page-menu-link" href="pgui_misc_servlet.html#pgui_misc_servlet_model2" data-menu-target="pgui_misc_servlet_model2">Using FreeMarker for ``Model 2&#39;&#39;</a></li><li><a class="page-menu-link" href="pgui_misc_servlet.html#pgui_misc_servlet_include" data-menu-target="pgui_misc_servlet_include">Including content from other web application
-resources</a></li><li><a class="page-menu-link" href="pgui_misc_servlet.html#autoid_56" data-menu-target="autoid_56">Using JSP custom tags in FTL</a></li><li><a class="page-menu-link" href="pgui_misc_servlet.html#autoid_57" data-menu-target="autoid_57">Embed FTL into JSP pages</a></li></ul></li><li><a class="page-menu-link" href="pgui_misc_secureenv.html" data-menu-target="pgui_misc_secureenv">Configuring security policy for FreeMarker</a></li><li><a class="page-menu-link" href="pgui_misc_xml_legacy.html" data-menu-target="pgui_misc_xml_legacy">Legacy XML wrapper implementation</a><ul><li><a class="page-menu-link" href="pgui_misc_xml_legacy.html#autoid_58" data-menu-target="autoid_58">TemplateScalarModel</a></li><li><a class="page-menu-link" href="pgui_misc_xml_legacy.html#autoid_59" data-menu-target="autoid_59">TemplateCollectionModel</a></li><li><a class="page-menu-link" href="pgui_misc_xml_legacy.html#autoid_60" data-menu-target="autoid_60">TemplateSequenceModel</a></li><li><a cl
 ass="page-menu-link" href="pgui_misc_xml_legacy.html#autoid_61" data-menu-target="autoid_61">TemplateHashModel</a></li><li><a class="page-menu-link" href="pgui_misc_xml_legacy.html#autoid_62" data-menu-target="autoid_62">TemplateMethodModel</a></li><li><a class="page-menu-link" href="pgui_misc_xml_legacy.html#autoid_63" data-menu-target="autoid_63">Namespace handling</a></li></ul></li><li><a class="page-menu-link" href="pgui_misc_ant.html" data-menu-target="pgui_misc_ant">Using FreeMarker with Ant</a></li><li><a class="page-menu-link" href="pgui_misc_jythonwrapper.html" data-menu-target="pgui_misc_jythonwrapper">Jython wrapper</a><ul><li><a class="page-menu-link" href="pgui_misc_jythonwrapper.html#autoid_64" data-menu-target="autoid_64">TemplateHashModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_jythonwrapper.html#autoid_65" data-menu-target="autoid_65">TemplateScalarModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_jythonwrapper.htm
 l#autoid_66" data-menu-target="autoid_66">TemplateBooleanModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_jythonwrapper.html#autoid_67" data-menu-target="autoid_67">TemplateNumberModel functionality</a></li><li><a class="page-menu-link" href="pgui_misc_jythonwrapper.html#autoid_68" data-menu-target="autoid_68">TemplateSequenceModel functionality</a></li></ul></li></ul></li></ul></li><li><a class="page-menu-link" href="ref.html" data-menu-target="ref">Template Language Reference</a><ul><li><a class="page-menu-link" href="ref_builtins.html" data-menu-target="ref_builtins">Built-in Reference</a><ul><li><a class="page-menu-link" href="ref_builtins_alphaidx.html" data-menu-target="ref_builtins_alphaidx">Alphabetical index</a></li><li><a class="page-menu-link" href="ref_builtins_string.html" data-menu-target="ref_builtins_string">Built-ins for strings</a><ul><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_boolean" data-menu-target="ref_bui
 ltin_boolean">boolean</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_cap_first" data-menu-target="ref_builtin_cap_first">cap_first</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_capitalize" data-menu-target="ref_builtin_capitalize">capitalize</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_chop_linebreak" data-menu-target="ref_builtin_chop_linebreak">chop_linebreak</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_contains" data-menu-target="ref_builtin_contains">contains</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_string_date" data-menu-target="ref_builtin_string_date">date, time, datetime</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_ends_with" data-menu-target="ref_builtin_ends_with">ends_with</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_ensure
 _ends_with" data-menu-target="ref_builtin_ensure_ends_with">ensure_ends_with</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_ensure_starts_with" data-menu-target="ref_builtin_ensure_starts_with">ensure_starts_with</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_groups" data-menu-target="ref_builtin_groups">groups</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_html" data-menu-target="ref_builtin_html">html</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_index_of" data-menu-target="ref_builtin_index_of">index_of</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_j_string" data-menu-target="ref_builtin_j_string">j_string</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_js_string" data-menu-target="ref_builtin_js_string">js_string</a></li><li><a class="page-menu-link" href="ref_builtins_string.h
 tml#ref_builtin_json_string" data-menu-target="ref_builtin_json_string">json_string</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_keep_after" data-menu-target="ref_builtin_keep_after">keep_after</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_keep_after_last" data-menu-target="ref_builtin_keep_after_last">keep_after_last</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_keep_before" data-menu-target="ref_builtin_keep_before">keep_before</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_keep_before_last" data-menu-target="ref_builtin_keep_before_last">keep_before_last</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_last_index_of" data-menu-target="ref_builtin_last_index_of">last_index_of</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_left_pad" data-menu-target="ref_builtin_left_pad">left_pa
 d</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_length" data-menu-target="ref_builtin_length">length</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_lower_case" data-menu-target="ref_builtin_lower_case">lower_case</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_matches" data-menu-target="ref_builtin_matches">matches</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_number" data-menu-target="ref_builtin_number">number</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_replace" data-menu-target="ref_builtin_replace">replace</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_right_pad" data-menu-target="ref_builtin_right_pad">right_pad</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_remove_beginning" data-menu-target="ref_builtin_remove_beginning">remove_beginning<
 /a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_remove_ending" data-menu-target="ref_builtin_remove_ending">remove_ending</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_rtf" data-menu-target="ref_builtin_rtf">rtf</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_split" data-menu-target="ref_builtin_split">split</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_starts_with" data-menu-target="ref_builtin_starts_with">starts_with</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_string_for_string" data-menu-target="ref_builtin_string_for_string">string (when used with a string value)</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_substring" data-menu-target="ref_builtin_substring">substring (deprecated)</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_trim" data-m
 enu-target="ref_builtin_trim">trim</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_uncap_first" data-menu-target="ref_builtin_uncap_first">uncap_first</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_upper_case" data-menu-target="ref_builtin_upper_case">upper_case</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_url" data-menu-target="ref_builtin_url">url</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_url_path" data-menu-target="ref_builtin_url_path">url_path</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_word_list" data-menu-target="ref_builtin_word_list">word_list</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_xhtml" data-menu-target="ref_builtin_xhtml">xhtml</a></li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_xml" data-menu-target="ref_builtin_xml">xml</a>
 </li><li><a class="page-menu-link" href="ref_builtins_string.html#ref_builtin_string_flags" data-menu-target="ref_builtin_string_flags">Common flags</a></li></ul></li><li><a class="page-menu-link" href="ref_builtins_number.html" data-menu-target="ref_builtins_number">Built-ins for numbers</a><ul><li><a class="page-menu-link" href="ref_builtins_number.html#ref_builtin_abs" data-menu-target="ref_builtin_abs">abs</a></li><li><a class="page-menu-link" href="ref_builtins_number.html#ref_builtin_c" data-menu-target="ref_builtin_c">c (when used with numerical value)</a></li><li><a class="page-menu-link" href="ref_builtins_number.html#ref_builtin_is_infinite" data-menu-target="ref_builtin_is_infinite">is_infinite</a></li><li><a class="page-menu-link" href="ref_builtins_number.html#ref_builtin_is_nan" data-menu-target="ref_builtin_is_nan">is_nan</a></li><li><a class="page-menu-link" href="ref_builtins_number.html#ref_builtin_lower_abc" data-menu-target="ref_builtin_lower_abc">lower_abc</a></
 li><li><a class="page-menu-link" href="ref_builtins_number.html#ref_builtin_rounding" data-menu-target="ref_builtin_rounding">round, floor, ceiling</a></li><li><a class="page-menu-link" href="ref_builtins_number.html#ref_builtin_string_for_number" data-menu-target="ref_builtin_string_for_number">string (when used with a numerical value)</a></li><li><a class="page-menu-link" href="ref_builtins_number.html#ref_builtin_upper_abc" data-menu-target="ref_builtin_upper_abc">upper_abc</a></li></ul></li><li><a class="page-menu-link" href="ref_builtins_date.html" data-menu-target="ref_builtins_date">Built-ins for date/time/date-time values</a><ul><li><a class="page-menu-link" href="ref_builtins_date.html#ref_builtin_date_datetype" data-menu-target="ref_builtin_date_datetype">date, time, datetime (when used with a date/time/date-time
-value)</a></li><li><a class="page-menu-link" href="ref_builtins_date.html#ref_builtin_date_if_unknown" data-menu-target="ref_builtin_date_if_unknown">date_if_unknown, time_if_unknown, datetime_if_unknown</a></li><li><a class="page-menu-link" href="ref_builtins_date.html#ref_builtin_date_iso" data-menu-target="ref_builtin_date_iso">iso_...</a></li><li><a class="page-menu-link" href="ref_builtins_date.html#ref_builtin_string_for_date" data-menu-target="ref_builtin_string_for_date">string (when used with a date/time/date-time value)</a></li></ul></li><li><a class="page-menu-link" href="ref_builtins_boolean.html" data-menu-target="ref_builtins_boolean">Built-ins for booleans</a><ul><li><a class="page-menu-link" href="ref_builtins_boolean.html#ref_builtin_c_boolean" data-menu-target="ref_builtin_c_boolean">c (when used with boolean)</a></li><li><a class="page-menu-link" href="ref_builtins_boolean.html#ref_builtin_string_for_boolean" data-menu-target="ref_builtin_string_for_boolean">strin
 g (when used with a boolean value)</a></li><li><a class="page-menu-link" href="ref_builtins_boolean.html#ref_builtin_then" data-menu-target="ref_builtin_then">then</a></li></ul></li><li><a class="page-menu-link" href="ref_builtins_sequence.html" data-menu-target="ref_builtins_sequence">Built-ins for sequences</a><ul><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_chunk" data-menu-target="ref_builtin_chunk">chunk</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_first" data-menu-target="ref_builtin_first">first</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_join" data-menu-target="ref_builtin_join">join</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_last" data-menu-target="ref_builtin_last">last</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_reverse" data-menu-target="ref_builtin_reverse">reverse</a></li><li><a class="
 page-menu-link" href="ref_builtins_sequence.html#ref_builtin_seq_contains" data-menu-target="ref_builtin_seq_contains">seq_contains</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_seq_index_of" data-menu-target="ref_builtin_seq_index_of">seq_index_of</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_seq_last_index_of" data-menu-target="ref_builtin_seq_last_index_of">seq_last_index_of</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_size" data-menu-target="ref_builtin_size">size</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_sort" data-menu-target="ref_builtin_sort">sort</a></li><li><a class="page-menu-link" href="ref_builtins_sequence.html#ref_builtin_sort_by" data-menu-target="ref_builtin_sort_by">sort_by</a></li></ul></li><li><a class="page-menu-link" href="ref_builtins_hash.html" data-menu-target="ref_builtins_hash">Built-ins for hashes</a><ul>
 <li><a class="page-menu-link" href="ref_builtins_hash.html#ref_builtin_keys" data-menu-target="ref_builtin_keys">keys</a></li><li><a class="page-menu-link" href="ref_builtins_hash.html#ref_builtin_values" data-menu-target="ref_builtin_values">values</a></li></ul></li><li><a class="page-menu-link" href="ref_builtins_node.html" data-menu-target="ref_builtins_node">Built-ins for nodes (for XML)</a><ul><li><a class="page-menu-link" href="ref_builtins_node.html#ref_builtin_ancestors" data-menu-target="ref_builtin_ancestors">ancestors</a></li><li><a class="page-menu-link" href="ref_builtins_node.html#ref_builtin_children" data-menu-target="ref_builtin_children">children</a></li><li><a class="page-menu-link" href="ref_builtins_node.html#ref_builtin_node_name" data-menu-target="ref_builtin_node_name">node_name</a></li><li><a class="page-menu-link" href="ref_builtins_node.html#ref_builtin_node_namespace" data-menu-target="ref_builtin_node_namespace">node_namespace</a></li><li><a class="page-
 menu-link" href="ref_builtins_node.html#ref_builtin_node_type" data-menu-target="ref_builtin_node_type">node_type</a></li><li><a class="page-menu-link" href="ref_builtins_node.html#ref_builtin_parent" data-menu-target="ref_builtin_parent">parent</a></li><li><a class="page-menu-link" href="ref_builtins_node.html#ref_builtin_root" data-menu-target="ref_builtin_root">root</a></li></ul></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html" data-menu-target="ref_builtins_loop_var">Loop variable built-ins</a><ul><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_counter" data-menu-target="ref_builtin_counter">counter</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_has_next" data-menu-target="ref_builtin_has_next">has_next</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_index" data-menu-target="ref_builtin_index">index</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var
 .html#ref_builtin_is_even_item" data-menu-target="ref_builtin_is_even_item">is_even_item</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_is_first" data-menu-target="ref_builtin_is_first">is_first</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_is_last" data-menu-target="ref_builtin_is_last">is_last</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_is_odd_item" data-menu-target="ref_builtin_is_odd_item">is_odd_item</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_item_cycle" data-menu-target="ref_builtin_item_cycle">item_cycle</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_item_parity" data-menu-target="ref_builtin_item_parity">item_parity</a></li><li><a class="page-menu-link" href="ref_builtins_loop_var.html#ref_builtin_item_parity_cap" data-menu-target="ref_builtin_item_parity_cap">item_parity_cap</a></li></ul><
 /li><li><a class="page-menu-link" href="ref_builtins_type_independent.html" data-menu-target="ref_builtins_type_independent">Type independent built-ins</a><ul><li><a class="page-menu-link" href="ref_builtins_type_independent.html#ref_builtin_switch" data-menu-target="ref_builtin_switch">switch</a></li></ul></li><li><a class="page-menu-link" href="ref_builtins_expert.html" data-menu-target="ref_builtins_expert">Seldom used and expert built-ins</a><ul><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_buitin_api_and_has_api" data-menu-target="ref_buitin_api_and_has_api">api, has_api</a></li><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_builtin_numType" data-menu-target="ref_builtin_numType">byte, double, float, int, long, short</a></li><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_builtin_eval" data-menu-target="ref_builtin_eval">eval</a></li><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_builtin_has_content" data-m
 enu-target="ref_builtin_has_content">has_content</a></li><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_builtin_interpret" data-menu-target="ref_builtin_interpret">interpret</a></li><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_builtin_isType" data-menu-target="ref_builtin_isType">is_...</a></li><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_builtin_namespace" data-menu-target="ref_builtin_namespace">namespace</a></li><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_builtin_new" data-menu-target="ref_builtin_new">new</a></li><li><a class="page-menu-link" href="ref_builtins_expert.html#ref_builtin_numToDate" data-menu-target="ref_builtin_numToDate">number_to_date, number_to_time, number_to_datetime</a></li></ul></li></ul></li><li><a class="page-menu-link" href="ref_directives.html" data-menu-target="ref_directives">Directive Reference</a><ul><li><a class="page-menu-link" href="ref_directive_alphaidx.html" data-men
 u-target="ref_directive_alphaidx">Alphabetical index</a></li><li><a class="page-menu-link" href="ref_directive_assign.html" data-menu-target="ref_directive_assign">assign</a><ul><li><a class="page-menu-link" href="ref_directive_assign.html#autoid_69" data-menu-target="autoid_69">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_assign.html#autoid_70" data-menu-target="autoid_70">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_attempt.html" data-menu-target="ref_directive_attempt">attempt, recover</a><ul><li><a class="page-menu-link" href="ref_directive_attempt.html#autoid_71" data-menu-target="autoid_71">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_attempt.html#autoid_72" data-menu-target="autoid_72">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_compress.html" data-menu-target="ref_directive_compress">compress</a><ul><li><a class="page-menu-link" href="ref_directive_compress.html
 #autoid_73" data-menu-target="autoid_73">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_compress.html#autoid_74" data-menu-target="autoid_74">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_escape.html" data-menu-target="ref_directive_escape">escape, noescape</a><ul><li><a class="page-menu-link" href="ref_directive_escape.html#autoid_75" data-menu-target="autoid_75">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_escape.html#autoid_76" data-menu-target="autoid_76">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_flush.html" data-menu-target="ref_directive_flush">flush</a><ul><li><a class="page-menu-link" href="ref_directive_flush.html#autoid_77" data-menu-target="autoid_77">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_flush.html#autoid_78" data-menu-target="autoid_78">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_ftl.html" data
 -menu-target="ref_directive_ftl">ftl</a><ul><li><a class="page-menu-link" href="ref_directive_ftl.html#autoid_79" data-menu-target="autoid_79">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_ftl.html#autoid_80" data-menu-target="autoid_80">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_function.html" data-menu-target="ref_directive_function">function, return</a><ul><li><a class="page-menu-link" href="ref_directive_function.html#autoid_81" data-menu-target="autoid_81">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_function.html#autoid_82" data-menu-target="autoid_82">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_global.html" data-menu-target="ref_directive_global">global</a><ul><li><a class="page-menu-link" href="ref_directive_global.html#autoid_83" data-menu-target="autoid_83">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_global.html#autoid_84" data-menu-tar
 get="autoid_84">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_if.html" data-menu-target="ref_directive_if">if, else, elseif</a><ul><li><a class="page-menu-link" href="ref_directive_if.html#autoid_85" data-menu-target="autoid_85">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_if.html#autoid_86" data-menu-target="autoid_86">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_import.html" data-menu-target="ref_directive_import">import</a><ul><li><a class="page-menu-link" href="ref_directive_import.html#autoid_87" data-menu-target="autoid_87">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_import.html#autoid_88" data-menu-target="autoid_88">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_include.html" data-menu-target="ref_directive_include">include</a><ul><li><a class="page-menu-link" href="ref_directive_include.html#autoid_89" data-menu-target="autoid_89
 ">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_include.html#autoid_90" data-menu-target="autoid_90">Description</a><ul><li><a class="page-menu-link" href="ref_directive_include.html#ref_directive_include_acquisition" data-menu-target="ref_directive_include_acquisition">Using acquisition</a></li><li><a class="page-menu-link" href="ref_directive_include.html#ref_directive_include_localized" data-menu-target="ref_directive_include_localized">Localized lookup</a></li></ul></li></ul></li><li><a class="page-menu-link" href="ref_directive_list.html" data-menu-target="ref_directive_list">list, else, items, sep, break</a><ul><li><a class="page-menu-link" href="ref_directive_list.html#autoid_91" data-menu-target="autoid_91">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_list.html#autoid_92" data-menu-target="autoid_92">Description</a><ul><li><a class="page-menu-link" href="ref_directive_list.html#autoid_93" data-menu-target="autoid_93">Simplest form</
 a></li><li><a class="page-menu-link" href="ref_directive_list.html#autoid_94" data-menu-target="autoid_94">else directive</a></li><li><a class="page-menu-link" href="ref_directive_list.html#autoid_95" data-menu-target="autoid_95">items directive</a></li><li><a class="page-menu-link" href="ref_directive_list.html#autoid_96" data-menu-target="autoid_96">sep directive</a></li><li><a class="page-menu-link" href="ref_directive_list.html#autoid_97" data-menu-target="autoid_97">break directive</a></li><li><a class="page-menu-link" href="ref_directive_list.html#autoid_98" data-menu-target="autoid_98">Accessing iteration state</a></li><li><a class="page-menu-link" href="ref_directive_list.html#autoid_99" data-menu-target="autoid_99">Nesting loops into each other</a></li><li><a class="page-menu-link" href="ref_directive_list.html#autoid_100" data-menu-target="autoid_100">Notes for Java programmers</a></li></ul></li></ul></li><li><a class="page-menu-link" href="ref_directive_local.html" data-m
 enu-target="ref_directive_local">local</a><ul><li><a class="page-menu-link" href="ref_directive_local.html#autoid_101" data-menu-target="autoid_101">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_local.html#autoid_102" data-menu-target="autoid_102">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_macro.html" data-menu-target="ref_directive_macro">macro, nested, return</a><ul><li><a class="page-menu-link" href="ref_directive_macro.html#autoid_103" data-menu-target="autoid_103">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_macro.html#autoid_104" data-menu-target="autoid_104">Description</a><ul><li><a class="page-menu-link" href="ref_directive_macro.html#autoid_105" data-menu-target="autoid_105">nested</a></li><li><a class="page-menu-link" href="ref_directive_macro.html#autoid_106" data-menu-target="autoid_106">return</a></li></ul></li></ul></li><li><a class="page-menu-link" href="ref_directive_noparse.html" data-m
 enu-target="ref_directive_noparse">noparse</a><ul><li><a class="page-menu-link" href="ref_directive_noparse.html#autoid_107" data-menu-target="autoid_107">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_noparse.html#autoid_108" data-menu-target="autoid_108">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_nt.html" data-menu-target="ref_directive_nt">nt</a><ul><li><a class="page-menu-link" href="ref_directive_nt.html#autoid_109" data-menu-target="autoid_109">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_nt.html#autoid_110" data-menu-target="autoid_110">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_setting.html" data-menu-target="ref_directive_setting">setting</a><ul><li><a class="page-menu-link" href="ref_directive_setting.html#autoid_111" data-menu-target="autoid_111">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_setting.html#autoid_112" data-menu-target="aut
 oid_112">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_stop.html" data-menu-target="ref_directive_stop">stop</a><ul><li><a class="page-menu-link" href="ref_directive_stop.html#autoid_113" data-menu-target="autoid_113">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_stop.html#autoid_114" data-menu-target="autoid_114">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_switch.html" data-menu-target="ref_directive_switch">switch, case, default, break</a><ul><li><a class="page-menu-link" href="ref_directive_switch.html#autoid_115" data-menu-target="autoid_115">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_switch.html#autoid_116" data-menu-target="autoid_116">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_t.html" data-menu-target="ref_directive_t">t, lt, rt</a><ul><li><a class="page-menu-link" href="ref_directive_t.html#autoid_117" data-menu-target="autoi
 d_117">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_t.html#autoid_118" data-menu-target="autoid_118">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_directive_userDefined.html" data-menu-target="ref_directive_userDefined">User-defined directive (&lt;@...&gt;)</a><ul><li><a class="page-menu-link" href="ref_directive_userDefined.html#autoid_119" data-menu-target="autoid_119">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_userDefined.html#autoid_120" data-menu-target="autoid_120">Description</a><ul><li><a class="page-menu-link" href="ref_directive_userDefined.html#ref_directive_userDefined_entTag" data-menu-target="ref_directive_userDefined_entTag">End-tag</a></li><li><a class="page-menu-link" href="ref_directive_userDefined.html#ref_directive_userDefined_loopVar" data-menu-target="ref_directive_userDefined_loopVar">Loop variables</a></li><li><a class="page-menu-link" href="ref_directive_userDefined.html#ref_directive_user
 Defined_positionalParam" data-menu-target="ref_directive_userDefined_positionalParam">Positional parameter passing</a></li></ul></li></ul></li><li><a class="page-menu-link" href="ref_directive_visit.html" data-menu-target="ref_directive_visit">visit, recurse, fallback</a><ul><li><a class="page-menu-link" href="ref_directive_visit.html#autoid_121" data-menu-target="autoid_121">Synopsis</a></li><li><a class="page-menu-link" href="ref_directive_visit.html#autoid_122" data-menu-target="autoid_122">Description</a><ul><li><a class="page-menu-link" href="ref_directive_visit.html#autoid_123" data-menu-target="autoid_123">Visit</a></li><li><a class="page-menu-link" href="ref_directive_visit.html#autoid_124" data-menu-target="autoid_124">Recurse</a></li><li><a class="page-menu-link" href="ref_directive_visit.html#autoid_125" data-menu-target="autoid_125">Fallback</a></li></ul></li></ul></li></ul></li><li><a class="page-menu-link" href="ref_specvar.html" data-menu-target="ref_specvar">Special 
 Variable Reference</a></li><li><a class="page-menu-link" href="ref_reservednames.html" data-menu-target="ref_reservednames">Reserved names in FTL</a></li><li><a class="page-menu-link" href="ref_deprecated.html" data-menu-target="ref_deprecated">Deprecated FTL constructs</a><ul><li><a class="page-menu-link" href="ref_depr_directive.html" data-menu-target="ref_depr_directive">List of deprecated directives</a></li><li><a class="page-menu-link" href="ref_depr_builtin.html" data-menu-target="ref_depr_builtin">List of deprecated built-ins</a></li><li><a class="page-menu-link" href="ref_depr_oldmacro.html" data-menu-target="ref_depr_oldmacro">Old-style macro and call directives</a><ul><li><a class="page-menu-link" href="ref_depr_oldmacro.html#autoid_126" data-menu-target="autoid_126">Synopsis</a></li><li><a class="page-menu-link" href="ref_depr_oldmacro.html#autoid_127" data-menu-target="autoid_127">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_depr_transform.html" 
 data-menu-target="ref_depr_transform">Transform directive</a><ul><li><a class="page-menu-link" href="ref_depr_transform.html#autoid_128" data-menu-target="autoid_128">Synopsis</a></li><li><a class="page-menu-link" href="ref_depr_transform.html#autoid_129" data-menu-target="autoid_129">Description</a></li></ul></li><li><a class="page-menu-link" href="ref_depr_oldsyntax.html" data-menu-target="ref_depr_oldsyntax">Old FTL syntax</a></li><li><a class="page-menu-link" href="ref_depr_numerical_interpolation.html" data-menu-target="ref_depr_numerical_interpolation">#{...}: Numerical interpolation</a><ul><li><a class="page-menu-link" href="ref_depr_numerical_interpolation.html#autoid_130" data-menu-target="autoid_130">Synopsis</a></li><li><a class="page-menu-link" href="ref_depr_numerical_interpolation.html#autoid_131" data-menu-target="autoid_131">Description</a></li></ul></li></ul></li></ul></li><li><a class="page-menu-link" href="xgui.html" data-menu-target="xgui">XML Processing Guide</a
 ><ul><li><a class="page-menu-link" href="xgui_preface.html" data-menu-target="xgui_preface">Preface</a></li><li><a class="page-menu-link" href="xgui_expose.html" data-menu-target="xgui_expose">Exposing XML documents</a><ul><li><a class="page-menu-link" href="xgui_expose_dom.html" data-menu-target="xgui_expose_dom">The DOM tree</a></li><li><a class="page-menu-link" href="xgui_expose_put.html" data-menu-target="xgui_expose_put">Putting the XML into the data-model</a></li></ul></li><li><a class="page-menu-link" href="xgui_imperative.html" data-menu-target="xgui_imperative">Imperative XML processing</a><ul><li><a class="page-menu-link" href="xgui_imperative_learn.html" data-menu-target="xgui_imperative_learn">Basics</a><ul><li><a class="page-menu-link" href="xgui_imperative_learn.html#autoid_132" data-menu-target="autoid_132">Accessing elements by name</a></li><li><a class="page-menu-link" href="xgui_imperative_learn.html#autoid_133" data-menu-target="autoid_133">Accessing attributes</a
 ></li><li><a class="page-menu-link" href="xgui_imperative_learn.html#autoid_134" data-menu-target="autoid_134">Exploring the tree</a></li><li><a class="page-menu-link" href="xgui_imperative_learn.html#autoid_135" data-menu-target="autoid_135">Using XPath expressions</a></li><li><a class="page-menu-link" href="xgui_imperative_learn.html#autoid_136" data-menu-target="autoid_136">XML namespaces</a></li><li><a class="page-menu-link" href="xgui_imperative_learn.html#autoid_137" data-menu-target="autoid_137">Don&#39;t forget escaping!</a></li></ul></li><li><a class="page-menu-link" href="xgui_imperative_formal.html" data-menu-target="xgui_imperative_formal">Details</a><ul><li><a class="page-menu-link" href="xgui_imperative_formal.html#autoid_138" data-menu-target="autoid_138">Node sequences</a></li></ul></li></ul></li><li><a class="page-menu-link" href="xgui_declarative.html" data-menu-target="xgui_declarative">Declarative XML processing</a><ul><li><a class="page-menu-link" href="xgui_dec
 larative_basics.html" data-menu-target="xgui_declarative_basics">Basics</a></li><li><a class="page-menu-link" href="xgui_declarative_details.html" data-menu-target="xgui_declarative_details">Details</a><ul><li><a class="page-menu-link" href="xgui_declarative_details.html#autoid_139" data-menu-target="autoid_139">Default handlers</a></li><li><a class="page-menu-link" href="xgui_declarative_details.html#autoid_140" data-menu-target="autoid_140">Visiting a single node</a></li><li><a class="page-menu-link" href="xgui_declarative_details.html#autoid_141" data-menu-target="autoid_141">XML namespaces</a></li></ul></li></ul></li></ul></li><li><a class="page-menu-link" href="app.html" data-menu-target="app">Appendixes</a><ul><li><a class="page-menu-link" href="app_faq.html" data-menu-target="app_faq">FAQ</a></li><li><a class="page-menu-link" href="app_versions.html" data-menu-target="app_versions">Version history</a><ul><li><a class="page-menu-link" href="versions_2_3_23.html" data-menu-targ
 et="versions_2_3_23">2.3.23</a><ul><li><a class="page-menu-link" href="versions_2_3_23.html#autoid_142" data-menu-target="autoid_142">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_23.html#autoid_143" data-menu-target="autoid_143">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_23.html#autoid_144" data-menu-target="autoid_144">Other changes</a></li><li><a class="page-menu-link" href="versions_2_3_23.html#autoid_145" data-menu-target="autoid_145">Notes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_22.html" data-menu-target="versions_2_3_22">2.3.22</a><ul><li><a class="page-menu-link" href="versions_2_3_22.html#autoid_146" data-menu-target="autoid_146">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_22.html#autoid_147" data-menu-target="autoid_147">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_22.html#autoid_148" data-menu-target
 ="autoid_148">Notes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_21.html" data-menu-target="versions_2_3_21">2.3.21</a><ul><li><a class="page-menu-link" href="versions_2_3_21.html#autoid_149" data-menu-target="autoid_149">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_21.html#autoid_150" data-menu-target="autoid_150">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_21.html#autoid_151" data-menu-target="autoid_151">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_20.html" data-menu-target="versions_2_3_20">2.3.20</a><ul><li><a class="page-menu-link" href="versions_2_3_20.html#autoid_152" data-menu-target="autoid_152">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_20.html#autoid_153" data-menu-target="autoid_153">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_20.html#autoid_154" data-menu-target="a
 utoid_154">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_19.html" data-menu-target="versions_2_3_19">2.3.19</a><ul><li><a class="page-menu-link" href="versions_2_3_19.html#autoid_155" data-menu-target="autoid_155">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_19.html#autoid_156" data-menu-target="autoid_156">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_18.html" data-menu-target="versions_2_3_18">2.3.18</a><ul><li><a class="page-menu-link" href="versions_2_3_18.html#autoid_157" data-menu-target="autoid_157">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_18.html#autoid_158" data-menu-target="autoid_158">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_17.html" data-menu-target="versions_2_3_17">2.3.17</a><ul><li><a class="page-menu-link" href="versions_2_3_17.html#autoid_159" data-menu-target="autoid_159
 ">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_17.html#autoid_160" data-menu-target="autoid_160">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_17.html#autoid_161" data-menu-target="autoid_161">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_16.html" data-menu-target="versions_2_3_16">2.3.16</a><ul><li><a class="page-menu-link" href="versions_2_3_16.html#autoid_162" data-menu-target="autoid_162">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_16.html#autoid_163" data-menu-target="autoid_163">Changes on the FTL side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_15.html" data-menu-target="versions_2_3_15">2.3.15</a><ul><li><a class="page-menu-link" href="versions_2_3_15.html#autoid_164" data-menu-target="autoid_164">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_15.html#autoid_165" data-menu-tar
 get="autoid_165">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_14.html" data-menu-target="versions_2_3_14">2.3.14</a><ul><li><a class="page-menu-link" href="versions_2_3_14.html#autoid_166" data-menu-target="autoid_166">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_14.html#autoid_167" data-menu-target="autoid_167">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_13.html" data-menu-target="versions_2_3_13">2.3.13</a><ul><li><a class="page-menu-link" href="versions_2_3_13.html#autoid_168" data-menu-target="autoid_168">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_13.html#autoid_169" data-menu-target="autoid_169">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_12.html" data-menu-target="versions_2_3_12">2.3.12</a><ul><li><a class="page-menu-link" href="versions_2_3_12.html#autoid_170" d
 ata-menu-target="autoid_170">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_11.html" data-menu-target="versions_2_3_11">2.3.11</a><ul><li><a class="page-menu-link" href="versions_2_3_11.html#autoid_171" data-menu-target="autoid_171">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_11.html#autoid_172" data-menu-target="autoid_172">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_11.html#autoid_173" data-menu-target="autoid_173">Documentation changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_10.html" data-menu-target="versions_2_3_10">2.3.10</a><ul><li><a class="page-menu-link" href="versions_2_3_10.html#autoid_174" data-menu-target="autoid_174">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_10.html#autoid_175" data-menu-target="autoid_175">Changes on the FTL side</a></li></ul></li><li><a class="page-menu-link" href="
 versions_2_3_9.html" data-menu-target="versions_2_3_9">2.3.9</a><ul><li><a class="page-menu-link" href="versions_2_3_9.html#autoid_176" data-menu-target="autoid_176">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_8.html" data-menu-target="versions_2_3_8">2.3.8</a><ul><li><a class="page-menu-link" href="versions_2_3_8.html#autoid_177" data-menu-target="autoid_177">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_7.html" data-menu-target="versions_2_3_7">2.3.7</a><ul><li><a class="page-menu-link" href="versions_2_3_7.html#autoid_178" data-menu-target="autoid_178">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_7.html#autoid_179" data-menu-target="autoid_179">Changes on the FTL side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_7rc1.html" data-menu-target="versions_2_3_7rc1">2.3.7 RC1</a><ul><li><a class="page-menu-link" href="versions_2_3_7rc1.
 html#autoid_180" data-menu-target="autoid_180">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_7rc1.html#autoid_181" data-menu-target="autoid_181">Changes on the FTL side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_6.html" data-menu-target="versions_2_3_6">2.3.6</a><ul><li><a class="page-menu-link" href="versions_2_3_6.html#autoid_182" data-menu-target="autoid_182">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_5.html" data-menu-target="versions_2_3_5">2.3.5</a><ul><li><a class="page-menu-link" href="versions_2_3_5.html#autoid_183" data-menu-target="autoid_183">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_5.html#autoid_184" data-menu-target="autoid_184">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_4.html" data-menu-target="versions_2_3_4">2.3.4</a><ul><li><a class="page-menu-link" href="versions_2_3_4
 .html#autoid_185" data-menu-target="autoid_185">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_4.html#autoid_186" data-menu-target="autoid_186">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_4.html#autoid_187" data-menu-target="autoid_187">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_3.html" data-menu-target="versions_2_3_3">2.3.3</a><ul><li><a class="page-menu-link" href="versions_2_3_3.html#autoid_188" data-menu-target="autoid_188">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_3.html#autoid_189" data-menu-target="autoid_189">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_3.html#autoid_190" data-menu-target="autoid_190">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_2.html" data-menu-target="versions_2_3_2">2.3.2</a><ul><li><a class="page-menu-link" href="versions_2_3_2.html#a
 utoid_191" data-menu-target="autoid_191">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_3_1.html" data-menu-target="versions_2_3_1">2.3.1</a><ul><li><a class="page-menu-link" href="versions_2_3_1.html#autoid_192" data-menu-target="autoid_192">Possible backward compatibility issue</a></li><li><a class="page-menu-link" href="versions_2_3_1.html#autoid_193" data-menu-target="autoid_193">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3_1.html#autoid_194" data-menu-target="autoid_194">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3_1.html#autoid_195" data-menu-target="autoid_195">Other changes</a></li><li><a class="page-menu-link" href="versions_2_3_1.html#autoid_196" data-menu-target="autoid_196">The history of the releases before the final version</a><ul><li><a class="page-menu-link" href="versions_2_3_1.html#autoid_197" data-menu-target="autoid_197">Differences between the prev
 iew release and final
-release</a></li></ul></li></ul></li><li><a class="page-menu-link" href="versions_2_3.html" data-menu-target="versions_2_3">2.3</a><ul><li><a class="page-menu-link" href="versions_2_3.html#autoid_198" data-menu-target="autoid_198">Non backward-compatible changes!</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_199" data-menu-target="autoid_199">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_200" data-menu-target="autoid_200">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_201" data-menu-target="autoid_201">Other changes</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_202" data-menu-target="autoid_202">The history of the releases before the final version</a><ul><li><a class="page-menu-link" href="versions_2_3.html#autoid_203" data-menu-target="autoid_203">Differences between the final release and Release Candidate
-4</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_204" data-menu-target="autoid_204">Differences between the Release Candidate 4 and Release
-Candidate 3</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_205" data-menu-target="autoid_205">Differences between the Release Candidate 3 and Release
-Candidate 2</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_206" data-menu-target="autoid_206">Differences between the Release Candidate 2 and Release
-Candidate 1</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_207" data-menu-target="autoid_207">Differences between the Release Candidate 1 and Preview 16
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_208" data-menu-target="autoid_208">Differences between the Preview 16 and Preview 15
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_209" data-menu-target="autoid_209">Differences between the Preview 15 and Preview 14
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_210" data-menu-target="autoid_210">Differences between the Preview 14 and Preview 13
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_211" data-menu-target="autoid_211">Differences between the Preview 13 and Preview 12
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_212" data-menu-target="autoid_212">Differences between the Preview 12 and Preview 11
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_213" data-menu-target="autoid_213">Differences between the Preview 11 and Preview 10
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_214" data-menu-target="autoid_214">Differences between the Preview 10 and Preview 9
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_215" data-menu-target="autoid_215">Differences between the Preview 9 and Preview 8
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_216" data-menu-target="autoid_216">Differences between the Preview 8 and Preview 7
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_217" data-menu-target="autoid_217">Differences between the Preview 7 and Preview 6
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_218" data-menu-target="autoid_218">Differences between the Preview 6 and Preview 5
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_219" data-menu-target="autoid_219">Differences between the Preview 5 and Preview 4
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_220" data-menu-target="autoid_220">Differences between the Preview 4 and Preview 3
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_221" data-menu-target="autoid_221">Differences between the Preview 3 and Preview 2
-releases</a></li><li><a class="page-menu-link" href="versions_2_3.html#autoid_222" data-menu-target="autoid_222">Differences between the Preview 2 and Preview 1
-releases</a></li></ul></li></ul></li><li><a class="page-menu-link" href="versions_2_2_8.html" data-menu-target="versions_2_2_8">2.2.8</a><ul><li><a class="page-menu-link" href="versions_2_2_8.html#autoid_223" data-menu-target="autoid_223">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_2_8.html#autoid_224" data-menu-target="autoid_224">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_2_8.html#autoid_225" data-menu-target="autoid_225">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_2_7.html" data-menu-target="versions_2_2_7">2.2.7</a><ul><li><a class="page-menu-link" href="versions_2_2_7.html#autoid_226" data-menu-target="autoid_226">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_2_6.html" data-menu-target="versions_2_2_6">2.2.6</a><ul><li><a class="page-menu-link" href="versions_2_2_6.html#autoid_227" data-menu-target="autoid_227">Changes on the FTL
  side</a></li><li><a class="page-menu-link" href="versions_2_2_6.html#autoid_228" data-menu-target="autoid_228">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_2_6.html#autoid_229" data-menu-target="autoid_229">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_2_5.html" data-menu-target="versions_2_2_5">2.2.5</a><ul><li><a class="page-menu-link" href="versions_2_2_5.html#autoid_230" data-menu-target="autoid_230">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_2_4.html" data-menu-target="versions_2_2_4">2.2.4</a><ul><li><a class="page-menu-link" href="versions_2_2_4.html#autoid_231" data-menu-target="autoid_231">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_2_4.html#autoid_232" data-menu-target="autoid_232">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_2_3.html" data-menu-target="versions_2_2_3">2.2.3</a><ul><li><a c
 lass="page-menu-link" href="versions_2_2_3.html#autoid_233" data-menu-target="autoid_233">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_2_3.html#autoid_234" data-menu-target="autoid_234">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_2_2.html" data-menu-target="versions_2_2_2">2.2.2</a><ul><li><a class="page-menu-link" href="versions_2_2_2.html#autoid_235" data-menu-target="autoid_235">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_2_1.html" data-menu-target="versions_2_2_1">2.2.1</a><ul><li><a class="page-menu-link" href="versions_2_2_1.html#autoid_236" data-menu-target="autoid_236">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_2_1.html#autoid_237" data-menu-target="autoid_237">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_2.html" data-menu-target="versions_2_2">2.2</a><ul><li><a class="pa
 ge-menu-link" href="versions_2_2.html#autoid_238" data-menu-target="autoid_238">Non backward-compatible changes!</a></li><li><a class="page-menu-link" href="versions_2_2.html#autoid_239" data-menu-target="autoid_239">Changes in FTL (FreeMarker Template Language)</a></li><li><a class="page-menu-link" href="versions_2_2.html#autoid_240" data-menu-target="autoid_240">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_2.html#autoid_241" data-menu-target="autoid_241">Other changes</a></li><li><a class="page-menu-link" href="versions_2_2.html#autoid_242" data-menu-target="autoid_242">The history of the releases before the final version</a><ul><li><a class="page-menu-link" href="versions_2_2.html#autoid_243" data-menu-target="autoid_243">Differences between the final and RC2 releases</a></li><li><a class="page-menu-link" href="versions_2_2.html#autoid_244" data-menu-target="autoid_244">Differences between the RC2 and RC1 releases</a></li><li><a class="page-menu
 -link" href="versions_2_2.html#autoid_245" data-menu-target="autoid_245">Differences between the Preview 2 and RC1 releases</a></li><li><a class="page-menu-link" href="versions_2_2.html#autoid_246" data-menu-target="autoid_246">Differences between the Preview 1 and Preview 2
-releases</a></li></ul></li></ul></li><li><a class="page-menu-link" href="versions_2_1_5.html" data-menu-target="versions_2_1_5">2.1.5</a><ul><li><a class="page-menu-link" href="versions_2_1_5.html#autoid_247" data-menu-target="autoid_247">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_1_4.html" data-menu-target="versions_2_1_4">2.1.4</a><ul><li><a class="page-menu-link" href="versions_2_1_4.html#autoid_248" data-menu-target="autoid_248">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_1_3.html" data-menu-target="versions_2_1_3">2.1.3</a><ul><li><a class="page-menu-link" href="versions_2_1_3.html#autoid_249" data-menu-target="autoid_249">Changes on the FTL side</a></li><li><a class="page-menu-link" href="versions_2_1_3.html#autoid_250" data-menu-target="autoid_250">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_1_2.html" data-menu-target="versions_2_1_2">2.1.2</a><ul><l
 i><a class="page-menu-link" href="versions_2_1_2.html#autoid_251" data-menu-target="autoid_251">Changes in FTL (FreeMarker Template Language)</a></li><li><a class="page-menu-link" href="versions_2_1_2.html#autoid_252" data-menu-target="autoid_252">Other changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_1_1.html" data-menu-target="versions_2_1_1">2.1.1</a><ul><li><a class="page-menu-link" href="versions_2_1_1.html#autoid_253" data-menu-target="autoid_253">Changes in FTL (FreeMarker Template Language)</a></li><li><a class="page-menu-link" href="versions_2_1_1.html#autoid_254" data-menu-target="autoid_254">Changes on the Java side</a></li></ul></li><li><a class="page-menu-link" href="versions_2_1.html" data-menu-target="versions_2_1">2.1</a><ul><li><a class="page-menu-link" href="versions_2_1.html#autoid_255" data-menu-target="autoid_255">Changes in FTL (FreeMarker Template Language)</a></li><li><a class="page-menu-link" href="versions_2_1.html#autoid_256" data-m
 enu-target="autoid_256">Changes on the Java side</a></li><li><a class="page-menu-link" href="versions_2_1.html#autoid_257" data-menu-target="autoid_257">Other changes</a></li><li><a class="page-menu-link" href="versions_2_1.html#autoid_258" data-menu-target="autoid_258">Differences between the RC1 and final release</a></li></ul></li><li><a class="page-menu-link" href="versions_2_01.html" data-menu-target="versions_2_01">2.01</a></li><li><a class="page-menu-link" href="versions_2_0.html" data-menu-target="versions_2_0">2.0</a><ul><li><a class="page-menu-link" href="versions_2_0.html#autoid_259" data-menu-target="autoid_259">Bugfixes</a></li><li><a class="page-menu-link" href="versions_2_0.html#autoid_260" data-menu-target="autoid_260">Changes to the Template language</a></li><li><a class="page-menu-link" href="versions_2_0.html#autoid_261" data-menu-target="autoid_261">Changes to the API</a></li><li><a class="page-menu-link" href="versions_2_0.html#autoid_262" data-menu-target="autoi
 d_262">Miscellany</a></li></ul></li><li><a class="page-menu-link" href="versions_2_0RC3.html" data-menu-target="versions_2_0RC3">2.0 RC3</a><ul><li><a class="page-menu-link" href="versions_2_0RC3.html#autoid_263" data-menu-target="autoid_263">Bug Fixes</a></li><li><a class="page-menu-link" href="versions_2_0RC3.html#autoid_264" data-menu-target="autoid_264">Changes to the Template Language</a></li><li><a class="page-menu-link" href="versions_2_0RC3.html#autoid_265" data-menu-target="autoid_265">API changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_0RC2.html" data-menu-target="versions_2_0RC2">2.0 RC2</a><ul><li><a class="page-menu-link" href="versions_2_0RC2.html#autoid_266" data-menu-target="autoid_266">Changes to Template Language</a></li><li><a class="page-menu-link" href="versions_2_0RC2.html#autoid_267" data-menu-target="autoid_267">API Changes</a></li></ul></li><li><a class="page-menu-link" href="versions_2_0RC1.html" data-menu-target="versions_2_0RC1">2
 .0 RC1</a><ul><li><a class="page-menu-link" href="versions_2_0RC1.html#autoid_268" data-menu-target="autoid_268">Support for Numerical operations, both arithmetic and
-boolean, as well as numerical ranges.</a></li><li><a class="page-menu-link" href="versions_2_0RC1.html#autoid_269" data-menu-target="autoid_269">API Changes</a></li><li><a class="page-menu-link" href="versions_2_0RC1.html#autoid_270" data-menu-target="autoid_270">Syntactical Miscellany</a></li></ul></li></ul></li><li><a class="page-menu-link" href="app_install.html" data-menu-target="app_install">Installing FreeMarker</a></li><li><a class="page-menu-link" href="app_legal.html" data-menu-target="app_legal">Legal</a><ul><li><a class="page-menu-link" href="app_license.html" data-menu-target="app_license">License</a></li><li><a class="page-menu-link" href="app_eccn.html" data-menu-target="app_eccn">Export Control</a></li></ul></li></ul></li><li><a class="page-menu-link" href="gloss.html" data-menu-target="gloss">Glossary</a></li><li><a class="page-menu-link" href="alphaidx.html" data-menu-target="alphaidx">Alphabetical Index</a></li></ul> </div><div class="bottom-pagers-wrapper"><div cl
 ass="pagers bottom"><span class="paging-arrow disabled previous"><span>Previous</span></span><a class="paging-arrow next" href="dgui.html"><span>Next</span></a></div></div></div></div>      </div>
+<ul><li><a class="page-menu-link" href="dgui.html" data-menu-target="dgui">Template Author&#39;s Guide</a><ul><li><a class="page-menu-link" href="dgui_quickstart.html" data-menu-target="dgui_quickstart">Getting Started</a><ul><li><a class="page-menu-link" href="dgui_quickstart_basics.html" data-menu-target="dgui_quickstart_basics">Template + data-model = output</a></li><li><a class="page-menu-link" href="dgui_quickstart_datamodel.html" data-menu-target="dgui_quickstart_datamodel">The data-model at a glance</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html" data-menu-target="dgui_quickstart_template">The template at a glance</a><ul><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_2" data-menu-target="autoid_2">Some basic directives</a><ul><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_3" data-menu-target="autoid_3">The if directive</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid
 _4" data-menu-target="autoid_4">The list directive</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_5" data-menu-target="autoid_5">The include directive</a></li></ul></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_6" data-menu-target="autoid_6">Using directives together</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_7" data-menu-target="autoid_7">Using built-ins</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#autoid_8" data-menu-target="autoid_8">Dealing with missing variables</a></li><li><a class="page-menu-link" href="dgui_quickstart_template.html#dgui_quickstart_template_autoescaping" data-menu-target="dgui_quickstart_template_autoescaping">Escaping for HTML, XML and other markup</a></li></ul></li></ul></li><li><a class="page-menu-link" href="dgui_datamodel.html" data-menu-target="dgui_datamodel">Values, Types</a><ul><li><a class="page-menu-link" href="dgui_da
 tamodel_basics.html" data-menu-target="dgui_datamodel_basics">Basics</a><ul><li><a class="page-menu-link" href="dgui_datamodel_basics.html#topic.value" data-menu-target="topic.value">What is a value?</a></li><li><a class="page-menu-link" href="dgui_datamodel_basics.html#autoid_9" data-menu-target="autoid_9">What is type?</a></li><li><a class="page-menu-link" href="dgui_datamodel_basics.html#autoid_10" data-menu-target="autoid_10">The data-model is a hash</a></li></ul></li><li><a class="page-menu-link" href="dgui_datamodel_types.html" data-menu-target="dgui_datamodel_types">The types</a><ul><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_scalar" data-menu-target="dgui_datamodel_scalar">Scalars</a></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_container" data-menu-target="dgui_datamodel_container">Containers</a></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#autoid_11" data-menu-target="autoid_11">Subro
 utines</a><ul><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_method" data-menu-target="dgui_datamodel_method">Methods and functions</a></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_userdefdir" data-menu-target="dgui_datamodel_userdefdir">User-defined directives</a></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#autoid_12" data-menu-target="autoid_12">Function/method versus user-defined directive</a></li></ul></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#autoid_13" data-menu-target="autoid_13">Miscellaneous</a><ul><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_node" data-menu-target="dgui_datamodel_node">Nodes</a></li><li><a class="page-menu-link" href="dgui_datamodel_types.html#dgui_datamodel_markupoutput" data-menu-target="dgui_datamodel_markupoutput">Markup output</a></li></ul></li></ul></li></ul></li><li><a class="page-menu-link" href="dgui_templ
 ate.html" data-menu-target="dgui_template">The Template</a><ul><li><a class="page-menu-link" href="dgui_template_overallstructure.html" data-menu-target="dgui_template_overallstructure">Overall structure</a></li><li><a class="page-menu-link" href="dgui_template_directives.html" data-menu-target="dgui_template_directives">Directives</a></li><li><a class="page-menu-link" href="dgui_template_exp.html" data-menu-target="dgui_template_exp">Expressions</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#exp_cheatsheet" data-menu-target="exp_cheatsheet">Quick overview (cheat sheet)</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct" data-menu-target="dgui_template_exp_direct">Specify values directly</a><ul><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_string" data-menu-target="dgui_template_exp_direct_string">Strings</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_e
 xp_direct_number" data-menu-target="dgui_template_exp_direct_number">Numbers</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_boolean" data-menu-target="dgui_template_exp_direct_boolean">Booleans</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_seuqence" data-menu-target="dgui_template_exp_direct_seuqence">Sequences</a></li><li><a class="page-menu-link" href="dgui_template_exp.html#dgui_template_exp_direct_ranges" data-menu-target="dgui_template_exp_direct_ranges">Ranges</a></li><li><a class="page-menu-link" href="dgui_t

<TRUNCATED>


[09/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateException.html b/docs/api/freemarker/template/class-use/TemplateException.html
index dee32d0..7355dfb 100644
--- a/docs/api/freemarker/template/class-use/TemplateException.html
+++ b/docs/api/freemarker/template/class-use/TemplateException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -179,42 +179,55 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">NonMarkupOutputException</a></span></code>
+<div class="block">Indicates that a <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><code>TemplateMethodModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template"><code>TemplateNodeModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonSequenceException.html" title="class in freemarker.core">NonSequenceException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> or <a href="../../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a> value was expected, but the value
  had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> value was expected (or maybe something that can be automatically coerced
  to that), but the value had a different type.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">NonStringOrTemplateOutputException</a></span></code>
+<div class="block">Indicates that a <a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> (or maybe something that can be automatically coerced
+ to that) or <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/StopException.html" title="class in freemarker.core">StopException</a></span></code>
@@ -291,7 +304,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#applyEqualsOperatorLenient-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyEqualsOperatorLenient</a></span>(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;leftValue,
                           <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;rightValue)</code>
 <div class="block">Compares two <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s according the rules of the FTL "==" operator, except that if the two types
-     are incompatible, they are treated as non-equal instead of throwing an exception.</div>
+ are incompatible, they are treated as non-equal instead of throwing an exception.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -350,8 +363,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colFirst"><code><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-">importLib</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;namespace)</code>
-<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate
- root relative.</div>
+<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate root relative.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -366,15 +378,14 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#include-java.lang.String-java.lang.String-boolean-">include</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
        boolean&nbsp;parse)</code>
-<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate
- root relative.</div>
+<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate root relative.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#include-freemarker.template.Template-">include</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;includedTemplate)</code>
-<div class="block">Processes a Template in the context of this <code>Environment</code>, including its
- output in the <code>Environment</code>'s Writer.</div>
+<div class="block">Processes a Template in the context of this <code>Environment</code>, including its output in the
+ <code>Environment</code>'s Writer.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -451,7 +462,11 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#visit-freemarker.core.TemplateElement-freemarker.template.TemplateDirectiveModel-java.util.Map-java.util.List-">visit</a></span>(freemarker.core.TemplateElement&nbsp;element,
      <a href="../../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>&nbsp;directiveModel,
      <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;args,
-     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)</code>&nbsp;</td>
+     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Should be internal API</span></div>
+</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -495,6 +510,14 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
        <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>[]&nbsp;loopVars,
        <a href="../../../freemarker/template/TemplateDirectiveBody.html" title="interface in freemarker.template">TemplateDirectiveBody</a>&nbsp;body)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">FreemarkerServlet.</span><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#processEnvironment-freemarker.core.Environment-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">processEnvironment</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
+                  javax.servlet.http.HttpServletRequest&nbsp;request,
+                  javax.servlet.http.HttpServletResponse&nbsp;response)</code>
+<div class="block">This is the method that actually executes the template.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -583,8 +606,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Template.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-">process</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;dataModel,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
-<div class="block">Executes template, using the data-model provided, writing the generated output
- to the supplied <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+<div class="block">Executes template, using the data-model provided, writing the generated output to the supplied <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
 </td>
 </tr>
 <tr class="altColor">

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateHashModel.html b/docs/api/freemarker/template/class-use/TemplateHashModel.html
index 6012908..7b187be 100644
--- a/docs/api/freemarker/template/class-use/TemplateHashModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -348,7 +348,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModel.html b/docs/api/freemarker/template/class-use/TemplateModel.html
index e4043fd..4f19955 100644
--- a/docs/api/freemarker/template/class-use/TemplateModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -174,6 +174,22 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <!--   -->
 </a>
 <h3>Uses of <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subinterfaces, and an explanation">
+<caption><span>Subinterfaces of <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Interface and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO extends <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</span></code>
+<div class="block">"markup output" template language data-type; stores markup (some kind of "rich text" / structured format, as opposed
+ to plain text) that meant to be printed as template output.</div>
+</td>
+</tr>
+</tbody>
+</table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
 <caption><span>Classes in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that implement <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
@@ -183,8 +199,45 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO extends <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</span></code>
+<div class="block">Common superclass for implementing <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
+ <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></span></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></span></code>
+<div class="block">Stores combined markup to be printed; used with <a href="../../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></span></code>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></span></code>
+<div class="block">Stores RTF markup to be printed; used with <a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><code>RTFOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></span></code>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></span></code>
+<div class="block">Stores XML markup to be printed; used with <a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -203,8 +256,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getLocalVariable-java.lang.String-">getLocalVariable</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">Returns the loop or macro local variable corresponding to this
- variable name.</div>
+<div class="block">Returns the loop or macro local variable corresponding to this variable name.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -234,7 +286,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#applyEqualsOperatorLenient-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyEqualsOperatorLenient</a></span>(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;leftValue,
                           <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;rightValue)</code>
 <div class="block">Compares two <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s according the rules of the FTL "==" operator, except that if the two types
-     are incompatible, they are treated as non-equal instead of throwing an exception.</div>
+ are incompatible, they are treated as non-equal instead of throwing an exception.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -567,7 +619,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>
@@ -913,7 +965,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                    javax.servlet.http.HttpServletResponse&nbsp;response,
                    <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
                    <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)</code>
-<div class="block">Called after the execution returns from template.process().</div>
+<div class="block">Called after the execution returns from <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -921,8 +973,8 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">FreemarkerServlet.</span><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#preTemplateProcess-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-freemarker.template.Template-freemarker.template.TemplateModel-">preTemplateProcess</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request,
                   javax.servlet.http.HttpServletResponse&nbsp;response,
                   <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
-                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)</code>
-<div class="block">Called before the execution is passed to template.process().</div>
+                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
+<div class="block">Called before the execution is passed to <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -1343,7 +1395,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
-<div class="block">Called for an object that aren't considered to be of a "basic" Java type, like for an application specific type,
+<div class="block">Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type,
  or for a W3C DOM node.</div>
 </td>
 </tr>

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateModelException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateModelException.html b/docs/api/freemarker/template/class-use/TemplateModelException.html
index 1002988..c51b147 100644
--- a/docs/api/freemarker/template/class-use/TemplateModelException.html
+++ b/docs/api/freemarker/template/class-use/TemplateModelException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.TemplateModelException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -189,6 +189,74 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#concat-MO-MO-">concat</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo1,
+      <a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo2)</code>
+<div class="block">Returns a <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> that contains the content of both <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>
+ objects concatenated.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat</a></span>(<a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo1,
+      <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo2)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</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;plainTextContent)</code>
+<div class="block">Should give the same result as <a href="../../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+<tr class="altColor">
+<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"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</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;plainTextContent)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#format-freemarker.template.TemplateDateModel-">format</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#format-freemarker.template.TemplateNumberModel-">format</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</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;markupText)</code>
+<div class="block">Wraps 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"><code>String</code></a> that's already markup to <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> interface, to indicate its
+ format.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</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;markupText)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</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;textToEsc)</code>
+<div class="block">Converts 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"><code>String</code></a> that's assumed to be plain text to <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
+ special characters in the plain text.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</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;textToEsc)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getGlobalVariable-java.lang.String-">getGlobalVariable</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">Returns the globally visible variable of the given name (or null).</div>
@@ -203,16 +271,128 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getLocalVariable-java.lang.String-">getLocalVariable</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">Returns the loop or macro local variable corresponding to this
- variable name.</div>
+<div class="block">Returns the loop or macro local variable corresponding to this variable name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">Returns the content as markup text; never <code>null</code>.</div>
+</td>
+</tr>
+<tr 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"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a></span>(<a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#getNonNullDate-freemarker.template.TemplateDateModel-">getNonNullDate</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> from an <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, and throw
+ <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#getNonNullNumber-freemarker.template.TemplateNumberModel-">getNonNullNumber</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a> from an <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a>, and throws
+ <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">If this <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created with <a href="../../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>, it returns
+ the original plain text, otherwise it returns <code>null</code>.</div>
+</td>
+</tr>
+<tr 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"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a></span>(<a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getVariable-java.lang.String-">getVariable</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">Returns the variable that is visible in this context, or <code>null</code> if the variable is not found.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#isEmpty-MO-">isEmpty</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">Returns if the markup is empty (0 length).</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#isEmpty-MO-">isEmpty</a></span>(<a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</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;builtInName)</code>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</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;builtInName)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected abstract <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</code>
+<div class="block">Creates a new <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Prints the parameter model to the output.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></span>(<a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">XMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/XMLOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">XHTMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/XHTMLOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">RTFOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/RTFOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">MarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Equivalent to calling <a href="../../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">HTMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/HTMLOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">CommonMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -973,7 +1153,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><span class="typeNameLabel">DefaultObjectWrapper.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/DefaultObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
-<div class="block">Called for an object that aren't considered to be of a "basic" Java type, like for an application specific type,
+<div class="block">Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type,
  or for a W3C DOM node.</div>
 </td>
 </tr>

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateNodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateNodeModel.html b/docs/api/freemarker/template/class-use/TemplateNodeModel.html
index c76ad87..1cf98e7 100644
--- a/docs/api/freemarker/template/class-use/TemplateNodeModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateNodeModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateNodeModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -163,7 +163,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateNumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateNumberModel.html b/docs/api/freemarker/template/class-use/TemplateNumberModel.html
index e23c841..67a9162 100644
--- a/docs/api/freemarker/template/class-use/TemplateNumberModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateNumberModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateNumberModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -84,6 +84,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="#freemarker.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="#freemarker.ext.beans">freemarker.ext.beans</a></td>
 <td class="colLast">
 <div class="block">The <a href="../../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>default object wrapper</code></a> of FreeMarker uses
@@ -91,19 +97,19 @@ this to expose Java Beans and POJO-s to templates, but it can also be used in it
 better alternative <a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#freemarker.ext.jython">freemarker.ext.jython</a></td>
 <td class="colLast">
 <div class="block">Exposes <a href="http://www.jython.org" target="_blank">Jython</a> objects to templates.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#freemarker.ext.rhino">freemarker.ext.rhino</a></td>
 <td class="colLast">
 <div class="block">Exposes Rhino (ECMAScript) objects to templates.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
 <td class="colLast">
 <div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
@@ -111,7 +117,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="#freemarker.template.utility">freemarker.template.utility</a></td>
 <td class="colLast">
 <div class="block">Various classes used by core FreeMarker code but might be useful outside of it too.</div>
@@ -122,6 +128,38 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </li>
 <li class="blockList">
 <ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with parameters of type <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#format-freemarker.template.TemplateNumberModel-">format</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#getNonNullNumber-freemarker.template.TemplateNumberModel-">getNonNullNumber</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a> from an <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a>, and throws
+ <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="freemarker.ext.beans">
 <!--   -->
 </a>

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateSequenceModel.html b/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
index 923038d..dfbee8c 100644
--- a/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateSequenceModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateSequenceModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -200,7 +200,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>



[32/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/ParserConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/ParserConfiguration.html b/docs/api/freemarker/core/ParserConfiguration.html
new file mode 100644
index 0000000..b4a7c95
--- /dev/null
+++ b/docs/api/freemarker/core/ParserConfiguration.html
@@ -0,0 +1,364 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ParserConfiguration (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="ParserConfiguration (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/ParserConfiguration.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/ParseException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/ParsingNotSupportedException.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/ParserConfiguration.html" target="_top">Frames</a></li>
+<li><a href="ParserConfiguration.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>Constr&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>Constr&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="Interface ParserConfiguration" class="title">Interface ParserConfiguration</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>, <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">ParserConfiguration</span></pre>
+<div class="block"><b>Don't implement this interface yourself</b>; use the existing implementation(s). This interface is implemented by
+ classes that hold settings that affect parsing. New parser settings can be added in new FreeMarker versions, which
+ will break your implementation.</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">
+<!-- ========== 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="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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/ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParserConfiguration.html#getArithmeticEngine--">getArithmeticEngine</a></span>()</code>
+<div class="block">Overlaps with <a href="../../freemarker/core/Configurable.html#getArithmeticEngine--"><code>Configurable.getArithmeticEngine()</code></a>; the parser needs this for creating numerical literals.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParserConfiguration.html#getAutoEscapingPolicy--">getAutoEscapingPolicy</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getAutoEscapingPolicy--"><code>Configuration.getAutoEscapingPolicy()</code></a>.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParserConfiguration.html#getIncompatibleImprovements--">getIncompatibleImprovements</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a>.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParserConfiguration.html#getNamingConvention--">getNamingConvention</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getNamingConvention--"><code>Configuration.getNamingConvention()</code></a>.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParserConfiguration.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">See <a href="../../freemarker/core/Configurable.html#getOutputEncoding--"><code>Configurable.getOutputEncoding()</code></a>.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParserConfiguration.html#getRecognizeStandardFileExtensions--">getRecognizeStandardFileExtensions</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getRecognizeStandardFileExtensions--"><code>Configuration.getRecognizeStandardFileExtensions()</code></a>.</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/core/ParserConfiguration.html#getStrictSyntaxMode--">getStrictSyntaxMode</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getStrictSyntaxMode--"><code>Configuration.getStrictSyntaxMode()</code></a>.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParserConfiguration.html#getTagSyntax--">getTagSyntax</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getTagSyntax--"><code>Configuration.getTagSyntax()</code></a>.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParserConfiguration.html#getWhitespaceStripping--">getWhitespaceStripping</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getWhitespaceStripping--"><code>Configuration.getWhitespaceStripping()</code></a>.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getTagSyntax--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTagSyntax</h4>
+<pre>int&nbsp;getTagSyntax()</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getTagSyntax--"><code>Configuration.getTagSyntax()</code></a>.</div>
+</li>
+</ul>
+<a name="getNamingConvention--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNamingConvention</h4>
+<pre>int&nbsp;getNamingConvention()</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getNamingConvention--"><code>Configuration.getNamingConvention()</code></a>.</div>
+</li>
+</ul>
+<a name="getWhitespaceStripping--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getWhitespaceStripping</h4>
+<pre>boolean&nbsp;getWhitespaceStripping()</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getWhitespaceStripping--"><code>Configuration.getWhitespaceStripping()</code></a>.</div>
+</li>
+</ul>
+<a name="getArithmeticEngine--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getArithmeticEngine</h4>
+<pre><a href="../../freemarker/core/ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a>&nbsp;getArithmeticEngine()</pre>
+<div class="block">Overlaps with <a href="../../freemarker/core/Configurable.html#getArithmeticEngine--"><code>Configurable.getArithmeticEngine()</code></a>; the parser needs this for creating numerical literals.</div>
+</li>
+</ul>
+<a name="getStrictSyntaxMode--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getStrictSyntaxMode</h4>
+<pre>boolean&nbsp;getStrictSyntaxMode()</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getStrictSyntaxMode--"><code>Configuration.getStrictSyntaxMode()</code></a>.</div>
+</li>
+</ul>
+<a name="getAutoEscapingPolicy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAutoEscapingPolicy</h4>
+<pre>int&nbsp;getAutoEscapingPolicy()</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getAutoEscapingPolicy--"><code>Configuration.getAutoEscapingPolicy()</code></a>.</div>
+</li>
+</ul>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&nbsp;getOutputFormat()</pre>
+<div class="block">See <a href="../../freemarker/core/Configurable.html#getOutputEncoding--"><code>Configurable.getOutputEncoding()</code></a>.</div>
+</li>
+</ul>
+<a name="getRecognizeStandardFileExtensions--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRecognizeStandardFileExtensions</h4>
+<pre>boolean&nbsp;getRecognizeStandardFileExtensions()</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getRecognizeStandardFileExtensions--"><code>Configuration.getRecognizeStandardFileExtensions()</code></a>.</div>
+</li>
+</ul>
+<a name="getIncompatibleImprovements--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getIncompatibleImprovements</h4>
+<pre><a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a>&nbsp;getIncompatibleImprovements()</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a>.</div>
+</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/ParserConfiguration.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/ParseException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/ParsingNotSupportedException.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/ParserConfiguration.html" target="_top">Frames</a></li>
+<li><a href="ParserConfiguration.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>Constr&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>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/ParsingNotSupportedException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/ParsingNotSupportedException.html b/docs/api/freemarker/core/ParsingNotSupportedException.html
new file mode 100644
index 0000000..e0fc867
--- /dev/null
+++ b/docs/api/freemarker/core/ParsingNotSupportedException.html
@@ -0,0 +1,285 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ParsingNotSupportedException (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="ParsingNotSupportedException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ParsingNotSupportedException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/PlainTextOutputFormat.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/ParsingNotSupportedException.html" target="_top">Frames</a></li>
+<li><a href="ParsingNotSupportedException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 ParsingNotSupportedException" class="title">Class ParsingNotSupportedException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.ParsingNotSupportedException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ParsingNotSupportedException</span>
+extends <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">Thrown when the <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> doesn't support parsing, and parsing was invoked.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.ParsingNotSupportedException">Serialized Form</a></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/ParsingNotSupportedException.html#ParsingNotSupportedException-java.lang.String-">ParsingNotSupportedException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/ParsingNotSupportedException.html#ParsingNotSupportedException-java.lang.String-java.lang.Throwable-">ParsingNotSupportedException</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;message,
+                            <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ParsingNotSupportedException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ParsingNotSupportedException</h4>
+<pre>public&nbsp;ParsingNotSupportedException(<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;message,
+                                    <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="ParsingNotSupportedException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ParsingNotSupportedException</h4>
+<pre>public&nbsp;ParsingNotSupportedException(<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;message)</pre>
+</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/ParsingNotSupportedException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/PlainTextOutputFormat.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/ParsingNotSupportedException.html" target="_top">Frames</a></li>
+<li><a href="ParsingNotSupportedException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/PlainTextOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/PlainTextOutputFormat.html b/docs/api/freemarker/core/PlainTextOutputFormat.html
new file mode 100644
index 0000000..29e82f3
--- /dev/null
+++ b/docs/api/freemarker/core/PlainTextOutputFormat.html
@@ -0,0 +1,360 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>PlainTextOutputFormat (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="PlainTextOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":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/PlainTextOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/RTFOutputFormat.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/PlainTextOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="PlainTextOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 PlainTextOutputFormat" class="title">Class PlainTextOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.PlainTextOutputFormat</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">PlainTextOutputFormat</span>
+extends <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></pre>
+<div class="block">Represents the plain text output format (MIME type "text/plain", name "plainText"). This format doesn't support
+ escaping. This format doesn't allow mixing in template output values of other output formats.
+ 
+ <p>
+ The main difference from <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a> is that this format doesn't allow inserting values of another
+ output format into itself (unless they can be converted to plain text), while <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a> would
+ just insert the foreign "markup" as is. Also, this format has {"text/plain"} MIME type, while
+ <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a> has <code>null</code>.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/PlainTextOutputFormat.html#INSTANCE">INSTANCE</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/PlainTextOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/PlainTextOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/PlainTextOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></span>()</code>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a> INSTANCE</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="isOutputFormatMixingAllowed--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOutputFormatMixingAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputFormatMixingAllowed()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
+ if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
+ application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
+ inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
+ inserted value is made by escaping plain text and the target format is non-escaping, in which case format
+ conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
+ will be demand for that.)
+ 
+ <p>
+ <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</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/PlainTextOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/RTFOutputFormat.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/PlainTextOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="PlainTextOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/RTFOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/RTFOutputFormat.html b/docs/api/freemarker/core/RTFOutputFormat.html
new file mode 100644
index 0000000..57b6770
--- /dev/null
+++ b/docs/api/freemarker/core/RTFOutputFormat.html
@@ -0,0 +1,443 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>RTFOutputFormat (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="RTFOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":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/RTFOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/StopException.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/RTFOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="RTFOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 RTFOutputFormat" class="title">Class RTFOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.MarkupOutputFormat</a>&lt;MO&gt;</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.RTFOutputFormat</li>
+</ul>
+</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">RTFOutputFormat</span>
+extends <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</pre>
+<div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF"). This format escapes by
+ default (via <a href="../../freemarker/template/utility/StringUtil.html#RTFEnc-java.lang.String-"><code>StringUtil.RTFEnc(String)</code></a>). The <code>?rtf</code> built-in silently bypasses template output values
+ of the type produced by this output format (<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core"><code>TemplateRTFOutputModel</code></a>).</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/RTFOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/RTFOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</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;plainTextContent)</code>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/RTFOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/RTFOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/RTFOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</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;builtInName)</code>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>protected <a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/RTFOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</code>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</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/core/RTFOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.CommonMarkupOutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></h3>
+<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isEmpty-MO-">isEmpty</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a> INSTANCE</pre>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="output-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public&nbsp;void&nbsp;output(<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;textToEsc,
+                   <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+            throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                   <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="escapePlainText-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>escapePlainText</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;escapePlainText(<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;plainTextContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="isLegacyBuiltInBypassed-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLegacyBuiltInBypassed</h4>
+<pre>public&nbsp;boolean&nbsp;isLegacyBuiltInBypassed(<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;builtInName)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is. A typical such case would be when a <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateHTMLOutputModel</code></a> of "HTML" format bypasses
+ <code>?html</code>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>newTemplateMarkupOutputModel</h4>
+<pre>protected&nbsp;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&nbsp;newTemplateMarkupOutputModel(<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;plainTextContent,
+                                                              <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;markupContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonMarkupOutputFormat</a></code></span></div>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/RTFOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/StopException.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/RTFOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="RTFOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/StopException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/StopException.html b/docs/api/freemarker/core/StopException.html
index cac08e6..536dea3 100644
--- a/docs/api/freemarker/core/StopException.html
+++ b/docs/api/freemarker/core/StopException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StopException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>StopException (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="StopException (FreeMarker 2.3.23 API)";
+            parent.document.title="StopException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/ParseException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -260,7 +260,7 @@ extends <a href="../../freemarker/template/TemplateException.html" title="class
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/ParseException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateClassResolver.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateClassResolver.html b/docs/api/freemarker/core/TemplateClassResolver.html
index 6bd59f7..31971c5 100644
--- a/docs/api/freemarker/core/TemplateClassResolver.html
+++ b/docs/api/freemarker/core/TemplateClassResolver.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TemplateClassResolver (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateClassResolver (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="TemplateClassResolver (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateClassResolver (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/StopException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.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/TemplateClassResolver.html" target="_top">Frames</a></li>
@@ -286,7 +286,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/StopException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.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/TemplateClassResolver.html" target="_top">Frames</a></li>


[24/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/InvalidFormatStringException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/InvalidFormatStringException.html b/docs/api/freemarker/core/class-use/InvalidFormatStringException.html
new file mode 100644
index 0000000..91ca772
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/InvalidFormatStringException.html
@@ -0,0 +1,174 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.InvalidFormatStringException (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.core.InvalidFormatStringException (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/core/InvalidFormatStringException.html" title="class in freemarker.core">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/core/class-use/InvalidFormatStringException.html" target="_top">Frames</a></li>
+<li><a href="InvalidFormatStringException.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.core.InvalidFormatStringException" class="title">Uses of Class<br>freemarker.core.InvalidFormatStringException</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/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></span></code>
+<div class="block">Used when creating <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the parameters
+ part of the format string (like some kind of pattern) is malformed.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core">UndefinedCustomFormatException</a></span></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/core/InvalidFormatStringException.html" title="class in freemarker.core">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/core/class-use/InvalidFormatStringException.html" target="_top">Frames</a></li>
+<li><a href="InvalidFormatStringException.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/core/class-use/InvalidReferenceException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/InvalidReferenceException.html b/docs/api/freemarker/core/class-use/InvalidReferenceException.html
index aaca936..fdb62b9 100644
--- a/docs/api/freemarker/core/class-use/InvalidReferenceException.html
+++ b/docs/api/freemarker/core/class-use/InvalidReferenceException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.InvalidReferenceException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.InvalidReferenceException (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.core.InvalidReferenceException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.InvalidReferenceException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/JSONOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/JSONOutputFormat.html b/docs/api/freemarker/core/class-use/JSONOutputFormat.html
new file mode 100644
index 0000000..2e450de
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/JSONOutputFormat.html
@@ -0,0 +1,169 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.JSONOutputFormat (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.core.JSONOutputFormat (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/core/JSONOutputFormat.html" title="class in freemarker.core">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/core/class-use/JSONOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="JSONOutputFormat.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.core.JSONOutputFormat" class="title">Uses of Class<br>freemarker.core.JSONOutputFormat</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/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">JSONOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/JSONOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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/core/JSONOutputFormat.html" title="class in freemarker.core">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/core/class-use/JSONOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="JSONOutputFormat.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/core/class-use/JavaScriptOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/JavaScriptOutputFormat.html b/docs/api/freemarker/core/class-use/JavaScriptOutputFormat.html
new file mode 100644
index 0000000..689efd3
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/JavaScriptOutputFormat.html
@@ -0,0 +1,169 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.JavaScriptOutputFormat (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.core.JavaScriptOutputFormat (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/core/JavaScriptOutputFormat.html" title="class in freemarker.core">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/core/class-use/JavaScriptOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="JavaScriptOutputFormat.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.core.JavaScriptOutputFormat" class="title">Uses of Class<br>freemarker.core.JavaScriptOutputFormat</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/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">JavaScriptOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/JavaScriptOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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/core/JavaScriptOutputFormat.html" title="class in freemarker.core">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/core/class-use/JavaScriptOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="JavaScriptOutputFormat.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/core/class-use/MarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/MarkupOutputFormat.html b/docs/api/freemarker/core/class-use/MarkupOutputFormat.html
new file mode 100644
index 0000000..f5e867b
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/MarkupOutputFormat.html
@@ -0,0 +1,255 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.MarkupOutputFormat (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.core.MarkupOutputFormat (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/core/MarkupOutputFormat.html" title="class in freemarker.core">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/core/class-use/MarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="MarkupOutputFormat.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.core.MarkupOutputFormat" class="title">Uses of Class<br>freemarker.core.MarkupOutputFormat</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/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></span></code>
+<div class="block">Represents two markup formats nested into each other.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;MO extends <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</span></code>
+<div class="block">Common superclass for implementing <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
+ subclass.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></span></code>
+<div class="block">Represents the HTML output format (MIME type "text/html", name "HTML").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></span></code>
+<div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></span></code>
+<div class="block">Represents the XML output format (MIME type "application/xhtml+xml", name "XHTML").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></span></code>
+<div class="block">Represents the XML output format (MIME type "application/xml", name "XML").</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#getInnerOutputFormat--">getInnerOutputFormat</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#getOuterOutputFormat--">getOuterOutputFormat</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="type parameter in TemplateMarkupOutputModel">MO</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateMarkupOutputModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the singleton <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</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/core/package-summary.html">freemarker.core</a> with parameters of type <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</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/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
+                          <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</code>
+<div class="block">Same as <a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-"><code>CombinedMarkupOutputFormat.CombinedMarkupOutputFormat(String, MarkupOutputFormat, MarkupOutputFormat)</code></a> with <code>null</code> as
+ the <code>name</code> parameter.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat</a></span>(<a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
+                          <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</code>
+<div class="block">Same as <a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-"><code>CombinedMarkupOutputFormat.CombinedMarkupOutputFormat(String, MarkupOutputFormat, MarkupOutputFormat)</code></a> with <code>null</code> as
+ the <code>name</code> parameter.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat</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="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
+                          <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat</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="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
+                          <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</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/core/MarkupOutputFormat.html" title="class in freemarker.core">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/core/class-use/MarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="MarkupOutputFormat.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/core/class-use/NonBooleanException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonBooleanException.html b/docs/api/freemarker/core/class-use/NonBooleanException.html
index 0450b97..be0ce9f 100644
--- a/docs/api/freemarker/core/class-use/NonBooleanException.html
+++ b/docs/api/freemarker/core/class-use/NonBooleanException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.NonBooleanException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonBooleanException (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.core.NonBooleanException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonBooleanException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonDateException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonDateException.html b/docs/api/freemarker/core/class-use/NonDateException.html
index 58ca03c..bcbf2d0 100644
--- a/docs/api/freemarker/core/class-use/NonDateException.html
+++ b/docs/api/freemarker/core/class-use/NonDateException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.NonDateException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonDateException (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.core.NonDateException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonDateException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonExtendedHashException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonExtendedHashException.html b/docs/api/freemarker/core/class-use/NonExtendedHashException.html
index 0d2f70b..d9729a2 100644
--- a/docs/api/freemarker/core/class-use/NonExtendedHashException.html
+++ b/docs/api/freemarker/core/class-use/NonExtendedHashException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.NonExtendedHashException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonExtendedHashException (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.core.NonExtendedHashException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonExtendedHashException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonHashException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonHashException.html b/docs/api/freemarker/core/class-use/NonHashException.html
index 8acd1b0..74939bf 100644
--- a/docs/api/freemarker/core/class-use/NonHashException.html
+++ b/docs/api/freemarker/core/class-use/NonHashException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.NonHashException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonHashException (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.core.NonHashException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonHashException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonMarkupOutputException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonMarkupOutputException.html b/docs/api/freemarker/core/class-use/NonMarkupOutputException.html
new file mode 100644
index 0000000..3bb3165
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/NonMarkupOutputException.html
@@ -0,0 +1,125 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.NonMarkupOutputException (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.core.NonMarkupOutputException (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/core/NonMarkupOutputException.html" title="class in freemarker.core">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/core/class-use/NonMarkupOutputException.html" target="_top">Frames</a></li>
+<li><a href="NonMarkupOutputException.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.core.NonMarkupOutputException" class="title">Uses of Class<br>freemarker.core.NonMarkupOutputException</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.NonMarkupOutputException</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/core/NonMarkupOutputException.html" title="class in freemarker.core">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/core/class-use/NonMarkupOutputException.html" target="_top">Frames</a></li>
+<li><a href="NonMarkupOutputException.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/core/class-use/NonMethodException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonMethodException.html b/docs/api/freemarker/core/class-use/NonMethodException.html
index 88ce03f..47447b9 100644
--- a/docs/api/freemarker/core/class-use/NonMethodException.html
+++ b/docs/api/freemarker/core/class-use/NonMethodException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.NonMethodException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonMethodException (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.core.NonMethodException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonMethodException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonNodeException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonNodeException.html b/docs/api/freemarker/core/class-use/NonNodeException.html
index 5bea064..1122027 100644
--- a/docs/api/freemarker/core/class-use/NonNodeException.html
+++ b/docs/api/freemarker/core/class-use/NonNodeException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.NonNodeException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonNodeException (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.core.NonNodeException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonNodeException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonNumericalException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonNumericalException.html b/docs/api/freemarker/core/class-use/NonNumericalException.html
index 272bd45..fa1a778 100644
--- a/docs/api/freemarker/core/class-use/NonNumericalException.html
+++ b/docs/api/freemarker/core/class-use/NonNumericalException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.NonNumericalException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonNumericalException (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.core.NonNumericalException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonNumericalException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonSequenceException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonSequenceException.html b/docs/api/freemarker/core/class-use/NonSequenceException.html
index d9386bc..788f28d 100644
--- a/docs/api/freemarker/core/class-use/NonSequenceException.html
+++ b/docs/api/freemarker/core/class-use/NonSequenceException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.NonSequenceException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonSequenceException (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.core.NonSequenceException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonSequenceException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonSequenceOrCollectionException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonSequenceOrCollectionException.html b/docs/api/freemarker/core/class-use/NonSequenceOrCollectionException.html
index a6f3868..3c28c83 100644
--- a/docs/api/freemarker/core/class-use/NonSequenceOrCollectionException.html
+++ b/docs/api/freemarker/core/class-use/NonSequenceOrCollectionException.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.core.NonSequenceOrCollectionException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonSequenceOrCollectionException (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.core.NonSequenceOrCollectionException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonSequenceOrCollectionException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonStringException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonStringException.html b/docs/api/freemarker/core/class-use/NonStringException.html
index d7a2453..6d1abee 100644
--- a/docs/api/freemarker/core/class-use/NonStringException.html
+++ b/docs/api/freemarker/core/class-use/NonStringException.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.core.NonStringException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.NonStringException (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.core.NonStringException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.NonStringException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/NonStringOrTemplateOutputException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/NonStringOrTemplateOutputException.html b/docs/api/freemarker/core/class-use/NonStringOrTemplateOutputException.html
new file mode 100644
index 0000000..9be9569
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/NonStringOrTemplateOutputException.html
@@ -0,0 +1,125 @@
+<!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.core.NonStringOrTemplateOutputException (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.core.NonStringOrTemplateOutputException (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/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">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/core/class-use/NonStringOrTemplateOutputException.html" target="_top">Frames</a></li>
+<li><a href="NonStringOrTemplateOutputException.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.core.NonStringOrTemplateOutputException" class="title">Uses of Class<br>freemarker.core.NonStringOrTemplateOutputException</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.NonStringOrTemplateOutputException</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/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">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/core/class-use/NonStringOrTemplateOutputException.html" target="_top">Frames</a></li>
+<li><a href="NonStringOrTemplateOutputException.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/core/class-use/OptInTemplateClassResolver.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/OptInTemplateClassResolver.html b/docs/api/freemarker/core/class-use/OptInTemplateClassResolver.html
index 90d44c9..d9b6a8e 100644
--- a/docs/api/freemarker/core/class-use/OptInTemplateClassResolver.html
+++ b/docs/api/freemarker/core/class-use/OptInTemplateClassResolver.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.core.OptInTemplateClassResolver (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.OptInTemplateClassResolver (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.core.OptInTemplateClassResolver (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.OptInTemplateClassResolver (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {


[45/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/MergingTemplateConfigurationFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/MergingTemplateConfigurationFactory.html b/docs/api/freemarker/cache/MergingTemplateConfigurationFactory.html
new file mode 100644
index 0000000..c60c9de
--- /dev/null
+++ b/docs/api/freemarker/cache/MergingTemplateConfigurationFactory.html
@@ -0,0 +1,340 @@
+<!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>MergingTemplateConfigurationFactory (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="MergingTemplateConfigurationFactory (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":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/MergingTemplateConfigurationFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/MergingTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="MergingTemplateConfigurationFactory.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.cache</div>
+<h2 title="Class MergingTemplateConfigurationFactory" class="title">Class MergingTemplateConfigurationFactory</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/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">freemarker.cache.TemplateConfigurationFactory</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.MergingTemplateConfigurationFactory</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">MergingTemplateConfigurationFactory</span>
+extends <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></pre>
+<div class="block">Returns the merged results of all the child factories. The factories are merged in the order as they were added.
+ <code>null</code> results from the child factories will be ignored. If all child factories return <code>null</code>, the result
+ of this factory will be <code>null</code> too.</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/cache/MergingTemplateConfigurationFactory.html#MergingTemplateConfigurationFactory-freemarker.cache.TemplateConfigurationFactory...-">MergingTemplateConfigurationFactory</a></span>(<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>...&nbsp;templateConfigurationFactories)</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/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>
+<div class="block">Returns (maybe creates) the <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Calls <a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.cache.TemplateConfigurationFactory">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.cache.<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></h3>
+<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#getConfiguration--">getConfiguration</a>, <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#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="MergingTemplateConfigurationFactory-freemarker.cache.TemplateConfigurationFactory...-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MergingTemplateConfigurationFactory</h4>
+<pre>public&nbsp;MergingTemplateConfigurationFactory(<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>...&nbsp;templateConfigurationFactories)</pre>
+</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-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>get</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</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;sourceName,
+                                 <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                          throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                                 <a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">TemplateConfigurationFactory</a></code></span></div>
+<div class="block">Returns (maybe creates) the <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">get</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sourceName</code> - The name (path) that was used for <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>. See
+            <a href="../../freemarker/template/Template.html#getSourceName--"><code>Template.getSourceName()</code></a> for details.</dd>
+<dd><code>templateSource</code> - The object returned by <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for
+         this template source.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - Typically, if there factory needs further I/O to find out more about the template source, but that
+             fails.</dd>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></code> - If there's a problem that's specific to the factory logic.</dd>
+</dl>
+</li>
+</ul>
+<a name="setConfigurationOfChildren-freemarker.template.Configuration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setConfigurationOfChildren</h4>
+<pre>protected&nbsp;void&nbsp;setConfigurationOfChildren(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">TemplateConfigurationFactory</a></code></span></div>
+<div class="block">Calls <a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct
+ "children" of this object, not on the children of the children.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/MergingTemplateConfigurationFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/MergingTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="MergingTemplateConfigurationFactory.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/MruCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/MruCacheStorage.html b/docs/api/freemarker/cache/MruCacheStorage.html
index 9e323da..dace7b5 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>MruCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>MruCacheStorage (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="MruCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="MruCacheStorage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -441,7 +441,7 @@ implements <a href="../../freemarker/cache/CacheStorageWithGetSize.html" title="
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/MultiTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/MultiTemplateLoader.html b/docs/api/freemarker/cache/MultiTemplateLoader.html
index 080761b..8000ef3 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>MultiTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>MultiTemplateLoader (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MultiTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="MultiTemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/NotMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/MultiTemplateLoader.html" target="_top">Frames</a></li>
@@ -118,14 +118,12 @@ var activeTableTab = "activeTableTab";
 extends <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>
 implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache">StatefulTemplateLoader</a></pre>
 <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. On every request, loaders are
- queried in the order of their appearance in the array of loaders provided to the constructor. However, if a request
- for some template name was already satisfied in the past by one of the loaders, that Loader is queried first (a soft
- affinity).
+ queried in the order of their appearance in the array of loaders provided to the constructor. However, by default, if
+ a request for some template name was already satisfied in the past by one of the loaders, that loader is queried
+ first (stickiness). This behavior can be disabled with <a href="../../freemarker/cache/MultiTemplateLoader.html#setSticky-boolean-"><code>setSticky(boolean)</code></a>, then the loaders are always
+ queried in the order of their appearance in the array.
  
- <p>
- This class is <em>not</em> thread-safe. If it's accessed from multiple threads concurrently, proper synchronization
- must be provided by the callers. Note that <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a>, the natural user of this class, provides the
- necessary synchronizations when it uses this class, so then you don't have to worry this.</div>
+ <p>This class is thread-safe.</div>
 </li>
 </ul>
 </div>
@@ -203,13 +201,20 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 </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/MultiTemplateLoader.html#isSticky--">isSticky</a></span>()</code>&nbsp;</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">Invoked by <a href="../../freemarker/template/Configuration.html#clearTemplateCache--"><code>Configuration.clearTemplateCache()</code></a> to instruct this
- template loader to throw away its current state and start afresh.</div>
+<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>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<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>
+</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>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/MultiTemplateLoader.html#toString--">toString</a></span>()</code>
 <div class="block">Show class name and some details that are useful in template-not-found errors.</div>
@@ -402,9 +407,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"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/cache/StatefulTemplateLoader.html#resetState--">StatefulTemplateLoader</a></code></span></div>
-<div class="block">Invoked by <a href="../../freemarker/template/Configuration.html#clearTemplateCache--"><code>Configuration.clearTemplateCache()</code></a> to instruct this
- template loader to throw away its current state and start afresh.</div>
+<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>
 <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>
@@ -444,7 +447,7 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 <a name="getTemplateLoader-int-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getTemplateLoader</h4>
 <pre>public&nbsp;<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;getTemplateLoader(int&nbsp;index)</pre>
@@ -455,6 +458,32 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 </dl>
 </li>
 </ul>
+<a name="isSticky--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isSticky</h4>
+<pre>public&nbsp;boolean&nbsp;isSticky()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="setSticky-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setSticky</h4>
+<pre>public&nbsp;void&nbsp;setSticky(boolean&nbsp;sticky)</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
@@ -484,7 +513,7 @@ implements <a href="../../freemarker/cache/StatefulTemplateLoader.html" title="i
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/NotMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/MultiTemplateLoader.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/NotMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/NotMatcher.html b/docs/api/freemarker/cache/NotMatcher.html
new file mode 100644
index 0000000..52177aa
--- /dev/null
+++ b/docs/api/freemarker/cache/NotMatcher.html
@@ -0,0 +1,289 @@
+<!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>NotMatcher (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="NotMatcher (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/NotMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/NotMatcher.html" target="_top">Frames</a></li>
+<li><a href="NotMatcher.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.cache</div>
+<h2 title="Class NotMatcher" class="title">Class NotMatcher</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/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">freemarker.cache.TemplateSourceMatcher</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.NotMatcher</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">NotMatcher</span>
+extends <a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></pre>
+<div class="block">Logical "not" operation on the given matcher.</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/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>
+</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>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/NotMatcher.html#matches-java.lang.String-java.lang.Object-">matches</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;sourceName,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</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="NotMatcher-freemarker.cache.TemplateSourceMatcher-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NotMatcher</h4>
+<pre>public&nbsp;NotMatcher(<a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a>&nbsp;matcher)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="matches-java.lang.String-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>matches</h4>
+<pre>public&nbsp;boolean&nbsp;matches(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</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/NotMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/NotMatcher.html" target="_top">Frames</a></li>
+<li><a href="NotMatcher.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/NullCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/NullCacheStorage.html b/docs/api/freemarker/cache/NullCacheStorage.html
index 2d77e6e..a146364 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>NullCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NullCacheStorage (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="NullCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="NullCacheStorage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,8 +50,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/NotMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/OrMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/NullCacheStorage.html" target="_top">Frames</a></li>
@@ -385,8 +385,8 @@ implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="i
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/NotMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/OrMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/NullCacheStorage.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/OrMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/OrMatcher.html b/docs/api/freemarker/cache/OrMatcher.html
new file mode 100644
index 0000000..4a419da
--- /dev/null
+++ b/docs/api/freemarker/cache/OrMatcher.html
@@ -0,0 +1,289 @@
+<!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>OrMatcher (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="OrMatcher (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/OrMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/OrMatcher.html" target="_top">Frames</a></li>
+<li><a href="OrMatcher.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.cache</div>
+<h2 title="Class OrMatcher" class="title">Class OrMatcher</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/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">freemarker.cache.TemplateSourceMatcher</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.OrMatcher</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">OrMatcher</span>
+extends <a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></pre>
+<div class="block">Logical "or" operation among the given matchers.</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/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>
+</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>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/OrMatcher.html#matches-java.lang.String-java.lang.Object-">matches</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;sourceName,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</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="OrMatcher-freemarker.cache.TemplateSourceMatcher...-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>OrMatcher</h4>
+<pre>public&nbsp;OrMatcher(<a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a>...&nbsp;matchers)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="matches-java.lang.String-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>matches</h4>
+<pre>public&nbsp;boolean&nbsp;matches(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</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/OrMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/OrMatcher.html" target="_top">Frames</a></li>
+<li><a href="OrMatcher.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/PathGlobMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/PathGlobMatcher.html b/docs/api/freemarker/cache/PathGlobMatcher.html
new file mode 100644
index 0000000..0ae0134
--- /dev/null
+++ b/docs/api/freemarker/cache/PathGlobMatcher.html
@@ -0,0 +1,356 @@
+<!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>PathGlobMatcher (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="PathGlobMatcher (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":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/PathGlobMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/OrMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/PathGlobMatcher.html" target="_top">Frames</a></li>
+<li><a href="PathGlobMatcher.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.cache</div>
+<h2 title="Class PathGlobMatcher" class="title">Class PathGlobMatcher</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/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">freemarker.cache.TemplateSourceMatcher</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.PathGlobMatcher</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">PathGlobMatcher</span>
+extends <a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></pre>
+<div class="block">Matches the whole template source name (also known as template source path) with the given glob.
+ Note that the template source name is relative to the template storage root defined by the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>;
+ it's not the full path of a file on the file system.
+ 
+ <p>This glob implementation recognizes <code>**</code> (Ant-style directory wildcard) among others. For more details see
+ <a href="../../freemarker/template/utility/StringUtil.html#globToRegularExpression-java.lang.String-boolean-"><code>StringUtil.globToRegularExpression(String, boolean)</code></a>.
+ 
+ <p>About the usage of <code>/</code> (slash):
+ <ul>
+   <li>You aren't allowed to start the glob with <code>/</code>, because template names (template paths) never start with
+       it. 
+   <li>Future FreeMarker versions (compared to 2.3.24) might will support importing whole directories. Directory paths
+       in FreeMarker should end with <code>/</code>. Hence, <code>foo/bar</code> refers to the file {bar}, while
+       <code>foo/bar/</code> refers to the {bar} directory.
+ </ul>
+ 
+ <p>By default the glob is case sensitive, but this can be changed with <a href="../../freemarker/cache/PathGlobMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a> (or
+ <a href="../../freemarker/cache/PathGlobMatcher.html#caseInsensitive-boolean-"><code>caseInsensitive(boolean)</code></a>).</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/cache/PathGlobMatcher.html#PathGlobMatcher-java.lang.String-">PathGlobMatcher</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;glob)</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/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/PathGlobMatcher.html#caseInsensitive-boolean-">caseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Fluid API variation of <a href="../../freemarker/cache/PathGlobMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/PathGlobMatcher.html#isCaseInsensitive--">isCaseInsensitive</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/PathGlobMatcher.html#matches-java.lang.String-java.lang.Object-">matches</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;sourceName,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/PathGlobMatcher.html#setCaseInsensitive-boolean-">setCaseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>false</code>.</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="PathGlobMatcher-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PathGlobMatcher</h4>
+<pre>public&nbsp;PathGlobMatcher(<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;glob)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>glob</code> - Glob with the syntax defined by <a href="../../freemarker/template/utility/StringUtil.html#globToRegularExpression-java.lang.String-boolean-"><code>StringUtil.globToRegularExpression(String, boolean)</code></a>. Must not
+            start with <code>/</code>.</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="matches-java.lang.String-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>matches</h4>
+<pre>public&nbsp;boolean&nbsp;matches(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isCaseInsensitive--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isCaseInsensitive</h4>
+<pre>public&nbsp;boolean&nbsp;isCaseInsensitive()</pre>
+</li>
+</ul>
+<a name="setCaseInsensitive-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCaseInsensitive</h4>
+<pre>public&nbsp;void&nbsp;setCaseInsensitive(boolean&nbsp;caseInsensitive)</pre>
+<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>false</code>.</div>
+</li>
+</ul>
+<a name="caseInsensitive-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>caseInsensitive</h4>
+<pre>public&nbsp;<a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a>&nbsp;caseInsensitive(boolean&nbsp;caseInsensitive)</pre>
+<div class="block">Fluid API variation of <a href="../../freemarker/cache/PathGlobMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</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/PathGlobMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/OrMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/PathGlobMatcher.html" target="_top">Frames</a></li>
+<li><a href="PathGlobMatcher.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>


[29/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateMarkupOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateMarkupOutputModel.html b/docs/api/freemarker/core/TemplateMarkupOutputModel.html
new file mode 100644
index 0000000..40a2f7f
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateMarkupOutputModel.html
@@ -0,0 +1,271 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateMarkupOutputModel (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="TemplateMarkupOutputModel (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateMarkupOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateNumberFormat.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/TemplateMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateMarkupOutputModel.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>Constr&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>Constr&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="Interface TemplateMarkupOutputModel" class="title">Interface TemplateMarkupOutputModel&lt;MO extends TemplateMarkupOutputModel&lt;MO&gt;&gt;</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt><span class="paramLabel">Type Parameters:</span></dt>
+<dd><code>MO</code> - Refers to the interface's own type, which is useful in interfaces that extend
+            <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> (Java Generics trick).</dd>
+</dl>
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></dd>
+</dl>
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>, <a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>, <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>, <a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>, <a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>, <a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">TemplateMarkupOutputModel&lt;MO extends TemplateMarkupOutputModel&lt;MO&gt;&gt;</span>
+extends <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></pre>
+<div class="block">"markup output" template language data-type; stores markup (some kind of "rich text" / structured format, as opposed
+ to plain text) that meant to be printed as template output. This type is related to the <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>
+ mechanism. Values of this kind are exempt from <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>-based automatic escaping.
+ 
+ <p>
+ Each implementation of this type has a <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> subclass pair, whose singleton instance is returned by
+ <a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--"><code>getOutputFormat()</code></a>. See more about how markup output values work at <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.
+ 
+ <p>
+ Note that <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s are by design not treated like <a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a>-s, and so
+ the implementations of this interface usually shouldn't implement <a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a>. (Because, operations
+ applicable on plain strings, like converting to upper case, substringing, etc., can corrupt markup.) If the template
+ author wants to pass in the "source" of the markup as string somewhere, he should use <code>?markup_string</code>.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.template.TemplateModel">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></h3>
+<code><a href="../../freemarker/template/TemplateModel.html#NOTHING">NOTHING</a></code></li>
+</ul>
+</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="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="type parameter in TemplateMarkupOutputModel">MO</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="type parameter in TemplateMarkupOutputModel">MO</a>&gt;&nbsp;getOutputFormat()</pre>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</div>
+</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/TemplateMarkupOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateNumberFormat.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/TemplateMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateMarkupOutputModel.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>Constr&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>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateNumberFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateNumberFormat.html b/docs/api/freemarker/core/TemplateNumberFormat.html
new file mode 100644
index 0000000..42f7677
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateNumberFormat.html
@@ -0,0 +1,382 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateNumberFormat (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="TemplateNumberFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":6,"i2":6,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateNumberFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateNumberFormatFactory.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/TemplateNumberFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateNumberFormat.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 TemplateNumberFormat" class="title">Class TemplateNumberFormat</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/TemplateValueFormat.html" title="class in freemarker.core">freemarker.core.TemplateValueFormat</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateNumberFormat</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateNumberFormat</span>
+extends <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></pre>
+<div class="block">Represents a number format; used in templates for formatting and parsing with that format. This is similar to Java's
+ <a href="http://docs.oracle.com/javase/8/docs/api/java/text/NumberFormat.html?is-external=true" title="class or interface in java.text"><code>NumberFormat</code></a>, but made to fit the requirements of FreeMarker. Also, it makes easier to define formats that
+ can't be represented with Java's existing <a href="http://docs.oracle.com/javase/8/docs/api/java/text/NumberFormat.html?is-external=true" title="class or interface in java.text"><code>NumberFormat</code></a> implementations.
+ 
+ <p>
+ Implementations need not be thread-safe if the <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core"><code>TemplateNumberFormatFactory</code></a> doesn't recycle them among
+ different <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>-s. As far as FreeMarker's concerned, instances are bound to a single
+ <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>, and <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>-s are thread-local objects.</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/TemplateNumberFormat.html#TemplateNumberFormat--">TemplateNumberFormat</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateNumberFormat.html#format-freemarker.template.TemplateNumberModel-">format</a></span>(<a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-">formatToPlainText</a></span>(<a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateNumberFormat.html#isLocaleBound--">isLocaleBound</a></span>()</code>
+<div class="block">Tells if this formatter should be re-created if the locale changes.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateNumberFormat.html#parse-java.lang.String-">parse</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;s)</code>
+<div class="block">This method is reserved for future purposes; currently it always throws <a href="../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core"><code>ParsingNotSupportedException</code></a>.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.TemplateValueFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></h3>
+<code><a href="../../freemarker/core/TemplateValueFormat.html#getDescription--">getDescription</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#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="TemplateNumberFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateNumberFormat</h4>
+<pre>public&nbsp;TemplateNumberFormat()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="formatToPlainText-freemarker.template.TemplateNumberModel-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>formatToPlainText</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;formatToPlainText(<a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)
+                                  throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a>,
+                                         <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>numberModel</code> - The number to format; not <code>null</code>. Most implementations will just work with the return value of
+            <a href="../../freemarker/template/TemplateDateModel.html#getAsDate--"><code>TemplateDateModel.getAsDate()</code></a>, but some may format differently depending on the properties of
+            a custom <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> implementation.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The number as text, with no escaping (like no HTML escaping); can't be <code>null</code>.</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 subclass:
+             <a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core"><code>UnformattableValueException</code></a>.</dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code> - Exception thrown by the <code>dateModel</code> object when calling its methods.</dd>
+</dl>
+</li>
+</ul>
+<a name="format-freemarker.template.TemplateNumberModel-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>format</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;format(<a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)
+              throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a>,
+                     <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text. If the markup result would be just the result of
+ <a href="../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-"><code>formatToPlainText(TemplateNumberModel)</code></a> escaped, it must return the <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> that
+ <a href="../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-"><code>formatToPlainText(TemplateNumberModel)</code></a> does.
+ 
+ <p>
+ The implementation in <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a> simply calls <a href="../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-"><code>formatToPlainText(TemplateNumberModel)</code></a>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>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"><code>String</code></a> or a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>; not <code>null</code>.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isLocaleBound--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLocaleBound</h4>
+<pre>public abstract&nbsp;boolean&nbsp;isLocaleBound()</pre>
+<div class="block">Tells if this formatter should be re-created if the locale changes.</div>
+</li>
+</ul>
+<a name="parse-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>parse</h4>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;parse(<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;s)
+                   throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">This method is reserved for future purposes; currently it always throws <a href="../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core"><code>ParsingNotSupportedException</code></a>. We
+ don't yet support number parsing with <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s, because currently FTL parses strings to
+ number with the <a href="../../freemarker/core/ArithmeticEngine.html" title="class in freemarker.core"><code>ArithmeticEngine</code></a> (<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a> were only introduced in 2.3.24). If it
+ will be support, it will be similar to <a href="../../freemarker/core/TemplateDateFormat.html#parse-java.lang.String-int-"><code>TemplateDateFormat.parse(String, int)</code></a>.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateNumberFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateNumberFormatFactory.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/TemplateNumberFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateNumberFormat.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateNumberFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateNumberFormatFactory.html b/docs/api/freemarker/core/TemplateNumberFormatFactory.html
new file mode 100644
index 0000000..6ff2852
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateNumberFormatFactory.html
@@ -0,0 +1,318 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateNumberFormatFactory (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="TemplateNumberFormatFactory (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateNumberFormatFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateRTFOutputModel.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/TemplateNumberFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateNumberFormatFactory.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 TemplateNumberFormatFactory" class="title">Class TemplateNumberFormatFactory</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>freemarker.core.TemplateNumberFormatFactory</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">AliasTemplateNumberFormatFactory</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateNumberFormatFactory</span>
+extends <a href="../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</a></pre>
+<div class="block">Factory for a certain kind of number formatting (<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>). Usually a singleton (one-per-VM or
+ one-per-<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>), and so must be thread-safe.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>Configurable.setCustomNumberFormats(java.util.Map)</code></a></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/TemplateNumberFormatFactory.html#TemplateNumberFormatFactory--">TemplateNumberFormatFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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>abstract <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-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,
+   <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="../../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="TemplateNumberFormatFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateNumberFormatFactory</h4>
+<pre>public&nbsp;TemplateNumberFormatFactory()</pre>
+</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-java.util.Locale-freemarker.core.Environment-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>get</h4>
+<pre>public abstract&nbsp;<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</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,
+                                         <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="../../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">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="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#getNumberFormat--"><code>numberFormat</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/TemplateNumberFormatFactory.html" title="class in freemarker.core"><code>TemplateNumberFormatFactory</code></a> implementation. Not <code>null</code>, often an empty string.</dd>
+<dd><code>locale</code> - The locale to format for. Not <code>null</code>. The resulting format must 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>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 the <code>params</code> is malformed.</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/TemplateNumberFormatFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateRTFOutputModel.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/TemplateNumberFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateNumberFormatFactory.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateRTFOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateRTFOutputModel.html b/docs/api/freemarker/core/TemplateRTFOutputModel.html
new file mode 100644
index 0000000..aa515d2
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateRTFOutputModel.html
@@ -0,0 +1,277 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateRTFOutputModel (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="TemplateRTFOutputModel (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/TemplateRTFOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateValueFormat.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/TemplateRTFOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateRTFOutputModel.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>Constr&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>Constr&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 TemplateRTFOutputModel" class="title">Class TemplateRTFOutputModel</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/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">freemarker.core.CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateRTFOutputModel</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">TemplateRTFOutputModel</span>
+extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</pre>
+<div class="block">Stores RTF markup to be printed; used with <a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><code>RTFOutputFormat</code></a>.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.template.TemplateModel">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></h3>
+<code><a href="../../freemarker/template/TemplateModel.html#NOTHING">NOTHING</a></code></li>
+</ul>
+</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/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateRTFOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</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">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a>&nbsp;getOutputFormat()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">TemplateMarkupOutputModel</a></code></span></div>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateRTFOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateValueFormat.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/TemplateRTFOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateRTFOutputModel.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>Constr&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>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateValueFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateValueFormat.html b/docs/api/freemarker/core/TemplateValueFormat.html
new file mode 100644
index 0000000..3549c08
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateValueFormat.html
@@ -0,0 +1,284 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateValueFormat (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="TemplateValueFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateValueFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateValueFormatException.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/TemplateValueFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormat.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 TemplateValueFormat" class="title">Class TemplateValueFormat</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateValueFormat</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a>, <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateValueFormat</span>
+extends <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></pre>
+<div class="block">Superclass of all value format objects; objects that convert values to strings, or parse strings.</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/TemplateValueFormat.html#TemplateValueFormat--">TemplateValueFormat</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateValueFormat.html#getDescription--">getDescription</a></span>()</code>
+<div class="block">Meant to be used in error messages to tell what format the parsed string didn't fit.</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="TemplateValueFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateValueFormat</h4>
+<pre>public&nbsp;TemplateValueFormat()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getDescription--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getDescription</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getDescription()</pre>
+<div class="block">Meant to be used in error messages to tell what format the parsed string didn't fit.</div>
+</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/TemplateValueFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateValueFormatException.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/TemplateValueFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormat.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>


[18/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/BeansWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/BeansWrapper.html b/docs/api/freemarker/ext/beans/BeansWrapper.html
index e0725a4..2f283ea 100644
--- a/docs/api/freemarker/ext/beans/BeansWrapper.html
+++ b/docs/api/freemarker/ext/beans/BeansWrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BeansWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BeansWrapper (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="BeansWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="BeansWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -695,7 +695,8 @@ implements <a href="../../../freemarker/template/utility/RichObjectWrapper.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>BeansWrapper</h4>
-<pre>public&nbsp;BeansWrapper()</pre>
+<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;BeansWrapper()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../../freemarker/ext/beans/BeansWrapperBuilder.html" title="class in freemarker.ext.beans"><code>BeansWrapperBuilder</code></a> or, in rare cases, <a href="../../../freemarker/ext/beans/BeansWrapper.html#BeansWrapper-freemarker.template.Version-"><code>BeansWrapper(Version)</code></a> instead.</span></div>
 <div class="block">Creates a new instance with the incompatible-improvements-version specified in
  <a href="../../../freemarker/template/Configuration.html#DEFAULT_INCOMPATIBLE_IMPROVEMENTS"><code>Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS</code></a>.</div>
@@ -743,6 +744,13 @@ implements <a href="../../../freemarker/template/utility/RichObjectWrapper.html"
        like in Java), which is hence never the one with the <code>Object</code> parameter type. For more details
        about overloaded method selection changes see the version history in the FreeMarker Manual.
      </li>
+     <li>
+       <p>2.3.24 (or higher):
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util"><code>Iterator</code></a>-s were always said to be non-empty when using <code>?has_content</code> and such (i.e.,
+       operators that check emptiness without reading any elements). Now an <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util"><code>Iterator</code></a> counts as
+       empty exactly if it has no elements left. (Note that this bug has never affected basic functionality, like
+       <code>&lt;#list ...&gt;</code>.) 
+     </li>  
    </ul>
    
    <p>Note that the version will be normalized to the lowest version where the same incompatible
@@ -1170,7 +1178,8 @@ implements <a href="../../../freemarker/template/utility/RichObjectWrapper.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>setNullModel</h4>
-<pre>public&nbsp;void&nbsp;setNullModel(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;nullModel)</pre>
+<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;void&nbsp;setNullModel(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;nullModel)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Changing the <code>null</code> model can cause a lot of confusion; don't do it.</span></div>
 <div class="block">Sets the null model. This model is returned from the <a href="../../../freemarker/ext/beans/BeansWrapper.html#wrap-java.lang.Object-"><code>wrap(Object)</code></a> method whenever the wrapped object is
  <code>null</code>. It defaults to <code>null</code>, which is dealt with quite strictly on engine level, however you can
@@ -1214,7 +1223,8 @@ implements <a href="../../../freemarker/template/utility/RichObjectWrapper.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getDefaultInstance</h4>
-<pre>public static final&nbsp;<a href="../../../freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans">BeansWrapper</a>&nbsp;getDefaultInstance()</pre>
+<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 static final&nbsp;<a href="../../../freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans">BeansWrapper</a>&nbsp;getDefaultInstance()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../../freemarker/ext/beans/BeansWrapperBuilder.html" title="class in freemarker.ext.beans"><code>BeansWrapperBuilder</code></a> instead. The instance returned here is not read-only, so it's
      dangerous to use.</span></div>
 <div class="block">Returns the default instance of the wrapper. This instance is used
@@ -1328,8 +1338,9 @@ implements <a href="../../../freemarker/template/utility/RichObjectWrapper.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>getInstance</h4>
-<pre>protected&nbsp;<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;getInstance(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object,
-                                    <a href="../../../freemarker/ext/util/ModelFactory.html" title="interface in freemarker.ext.util">ModelFactory</a>&nbsp;factory)</pre>
+<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>
+protected&nbsp;<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;getInstance(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object,
+                                                 <a href="../../../freemarker/ext/util/ModelFactory.html" title="interface in freemarker.ext.util">ModelFactory</a>&nbsp;factory)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">override <a href="../../../freemarker/ext/beans/BeansWrapper.html#getModelFactory-java.lang.Class-"><code>getModelFactory(Class)</code></a> instead. Using this
  method will now bypass wrapper caching (if it's enabled) and always 
  result in creation of a new wrapper. This method will be removed in 2.4</span></div>
@@ -1554,9 +1565,10 @@ implements <a href="../../../freemarker/template/utility/RichObjectWrapper.html"
 <ul class="blockList">
 <li class="blockList">
 <h4>finetuneMethodAppearance</h4>
-<pre>protected&nbsp;void&nbsp;finetuneMethodAppearance(<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;clazz,
-                                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;m,
-                                        <a href="../../../freemarker/ext/beans/BeansWrapper.MethodAppearanceDecision.html" title="class in freemarker.ext.beans">BeansWrapper.MethodAppearanceDecision</a>&nbsp;decision)</pre>
+<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>
+protected&nbsp;void&nbsp;finetuneMethodAppearance(<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;clazz,
+                                                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Method.html?is-external=true" title="class or interface in java.lang.reflect">Method</a>&nbsp;m,
+                                                     <a href="../../../freemarker/ext/beans/BeansWrapper.MethodAppearanceDecision.html" title="class in freemarker.ext.beans">BeansWrapper.MethodAppearanceDecision</a>&nbsp;decision)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../../freemarker/ext/beans/BeansWrapper.html#setMethodAppearanceFineTuner-freemarker.ext.beans.MethodAppearanceFineTuner-"><code>setMethodAppearanceFineTuner(MethodAppearanceFineTuner)</code></a>;
      no need to extend this class anymore.
      Soon this method will be final, so trying to override it will break your app.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/BeansWrapperBuilder.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/BeansWrapperBuilder.html b/docs/api/freemarker/ext/beans/BeansWrapperBuilder.html
index d68e587..9fd51dc 100644
--- a/docs/api/freemarker/ext/beans/BeansWrapperBuilder.html
+++ b/docs/api/freemarker/ext/beans/BeansWrapperBuilder.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BeansWrapperBuilder (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BeansWrapperBuilder (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="BeansWrapperBuilder (FreeMarker 2.3.23 API)";
+            parent.document.title="BeansWrapperBuilder (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -182,7 +182,7 @@ extends <a href="../../../freemarker/ext/beans/BeansWrapperConfiguration.html" t
        <li><p>
          Static model caches: These are used by the hash returned by <a href="../../../freemarker/ext/beans/BeansWrapper.html#getEnumModels--"><code>BeansWrapper.getEnumModels()</code></a> and
          <a href="../../../freemarker/ext/beans/BeansWrapper.html#getStaticModels--"><code>BeansWrapper.getStaticModels()</code></a>, for caching <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s for the static methods/fields
-         and Java 5 enums that were accessed through them. To use said hashes, you have to put them
+         and Java enums that were accessed through them. To use said hashes, you have to put them
          explicitly into the data-model or expose them to the template explicitly otherwise, so in most applications
          these caches aren't unused.
        </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/BeansWrapperConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/BeansWrapperConfiguration.html b/docs/api/freemarker/ext/beans/BeansWrapperConfiguration.html
index 36b6b95..8c96080 100644
--- a/docs/api/freemarker/ext/beans/BeansWrapperConfiguration.html
+++ b/docs/api/freemarker/ext/beans/BeansWrapperConfiguration.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BeansWrapperConfiguration (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BeansWrapperConfiguration (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="BeansWrapperConfiguration (FreeMarker 2.3.23 API)";
+            parent.document.title="BeansWrapperConfiguration (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/BooleanModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/BooleanModel.html b/docs/api/freemarker/ext/beans/BooleanModel.html
index d279e3f..0b0a672 100644
--- a/docs/api/freemarker/ext/beans/BooleanModel.html
+++ b/docs/api/freemarker/ext/beans/BooleanModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BooleanModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BooleanModel (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="BooleanModel (FreeMarker 2.3.23 API)";
+            parent.document.title="BooleanModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/CollectionModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/CollectionModel.html b/docs/api/freemarker/ext/beans/CollectionModel.html
index ab7b807..5ce2ea5 100644
--- a/docs/api/freemarker/ext/beans/CollectionModel.html
+++ b/docs/api/freemarker/ext/beans/CollectionModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>CollectionModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>CollectionModel (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="CollectionModel (FreeMarker 2.3.23 API)";
+            parent.document.title="CollectionModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/DateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/DateModel.html b/docs/api/freemarker/ext/beans/DateModel.html
index 442a255..6507ada 100644
--- a/docs/api/freemarker/ext/beans/DateModel.html
+++ b/docs/api/freemarker/ext/beans/DateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DateModel (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="DateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="DateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/EnumerationModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/EnumerationModel.html b/docs/api/freemarker/ext/beans/EnumerationModel.html
index f7f3cbe..363d6c4 100644
--- a/docs/api/freemarker/ext/beans/EnumerationModel.html
+++ b/docs/api/freemarker/ext/beans/EnumerationModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EnumerationModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>EnumerationModel (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="EnumerationModel (FreeMarker 2.3.23 API)";
+            parent.document.title="EnumerationModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/HashAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/HashAdapter.html b/docs/api/freemarker/ext/beans/HashAdapter.html
index c84b5ac..067bc4a 100644
--- a/docs/api/freemarker/ext/beans/HashAdapter.html
+++ b/docs/api/freemarker/ext/beans/HashAdapter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>HashAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>HashAdapter (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="HashAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="HashAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/InvalidPropertyException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/InvalidPropertyException.html b/docs/api/freemarker/ext/beans/InvalidPropertyException.html
index 80d5c23..db4f321 100644
--- a/docs/api/freemarker/ext/beans/InvalidPropertyException.html
+++ b/docs/api/freemarker/ext/beans/InvalidPropertyException.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>InvalidPropertyException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>InvalidPropertyException (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="InvalidPropertyException (FreeMarker 2.3.23 API)";
+            parent.document.title="InvalidPropertyException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/IteratorModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/IteratorModel.html b/docs/api/freemarker/ext/beans/IteratorModel.html
index 287d9b0..c0632f5 100644
--- a/docs/api/freemarker/ext/beans/IteratorModel.html
+++ b/docs/api/freemarker/ext/beans/IteratorModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>IteratorModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>IteratorModel (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="IteratorModel (FreeMarker 2.3.23 API)";
+            parent.document.title="IteratorModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/MapModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/MapModel.html b/docs/api/freemarker/ext/beans/MapModel.html
index fa86d2d..98c7ecb 100644
--- a/docs/api/freemarker/ext/beans/MapModel.html
+++ b/docs/api/freemarker/ext/beans/MapModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MapModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>MapModel (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="MapModel (FreeMarker 2.3.23 API)";
+            parent.document.title="MapModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/MethodAppearanceFineTuner.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/MethodAppearanceFineTuner.html b/docs/api/freemarker/ext/beans/MethodAppearanceFineTuner.html
index 98ff60e..da4d056 100644
--- a/docs/api/freemarker/ext/beans/MethodAppearanceFineTuner.html
+++ b/docs/api/freemarker/ext/beans/MethodAppearanceFineTuner.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MethodAppearanceFineTuner (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>MethodAppearanceFineTuner (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="MethodAppearanceFineTuner (FreeMarker 2.3.23 API)";
+            parent.document.title="MethodAppearanceFineTuner (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/NumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/NumberModel.html b/docs/api/freemarker/ext/beans/NumberModel.html
index 7bdf4b6..a7efe03 100644
--- a/docs/api/freemarker/ext/beans/NumberModel.html
+++ b/docs/api/freemarker/ext/beans/NumberModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NumberModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NumberModel (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="NumberModel (FreeMarker 2.3.23 API)";
+            parent.document.title="NumberModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -255,7 +255,7 @@ implements <a href="../../../freemarker/template/TemplateNumberModel.html" title
 <h4>getAsNumber</h4>
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;getAsNumber()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../freemarker/template/TemplateNumberModel.html#getAsNumber--">TemplateNumberModel</a></code></span></div>
-<div class="block">Returns the numeric value. The return value must not be null.</div>
+<div class="block">Returns the numeric value. The return value must not be <code>null</code>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../freemarker/template/TemplateNumberModel.html#getAsNumber--">getAsNumber</a></code>&nbsp;in interface&nbsp;<code><a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/OverloadedMethodsModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/OverloadedMethodsModel.html b/docs/api/freemarker/ext/beans/OverloadedMethodsModel.html
index f19a911..3187b7e 100644
--- a/docs/api/freemarker/ext/beans/OverloadedMethodsModel.html
+++ b/docs/api/freemarker/ext/beans/OverloadedMethodsModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>OverloadedMethodsModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>OverloadedMethodsModel (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="OverloadedMethodsModel (FreeMarker 2.3.23 API)";
+            parent.document.title="OverloadedMethodsModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/ResourceBundleModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/ResourceBundleModel.html b/docs/api/freemarker/ext/beans/ResourceBundleModel.html
index 676ced7..c94d9dd 100644
--- a/docs/api/freemarker/ext/beans/ResourceBundleModel.html
+++ b/docs/api/freemarker/ext/beans/ResourceBundleModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ResourceBundleModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ResourceBundleModel (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="ResourceBundleModel (FreeMarker 2.3.23 API)";
+            parent.document.title="ResourceBundleModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/SimpleMapModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/SimpleMapModel.html b/docs/api/freemarker/ext/beans/SimpleMapModel.html
index 8b5fc61..a1538fe 100644
--- a/docs/api/freemarker/ext/beans/SimpleMapModel.html
+++ b/docs/api/freemarker/ext/beans/SimpleMapModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleMapModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleMapModel (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="SimpleMapModel (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleMapModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/SimpleMethodModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/SimpleMethodModel.html b/docs/api/freemarker/ext/beans/SimpleMethodModel.html
index 8b54c3a..9495b8c 100644
--- a/docs/api/freemarker/ext/beans/SimpleMethodModel.html
+++ b/docs/api/freemarker/ext/beans/SimpleMethodModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SimpleMethodModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleMethodModel (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="SimpleMethodModel (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleMethodModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/SingletonCustomizer.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/SingletonCustomizer.html b/docs/api/freemarker/ext/beans/SingletonCustomizer.html
index ed3ab30..59c3a45 100644
--- a/docs/api/freemarker/ext/beans/SingletonCustomizer.html
+++ b/docs/api/freemarker/ext/beans/SingletonCustomizer.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>SingletonCustomizer (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SingletonCustomizer (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="SingletonCustomizer (FreeMarker 2.3.23 API)";
+            parent.document.title="SingletonCustomizer (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/StringModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/StringModel.html b/docs/api/freemarker/ext/beans/StringModel.html
index 25b3bc4..897697e 100644
--- a/docs/api/freemarker/ext/beans/StringModel.html
+++ b/docs/api/freemarker/ext/beans/StringModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>StringModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>StringModel (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="StringModel (FreeMarker 2.3.23 API)";
+            parent.document.title="StringModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/ArrayModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/ArrayModel.html b/docs/api/freemarker/ext/beans/class-use/ArrayModel.html
index d4ee741..d302247 100644
--- a/docs/api/freemarker/ext/beans/class-use/ArrayModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/ArrayModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.ArrayModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.ArrayModel (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.ext.beans.ArrayModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.ArrayModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/BeanModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/BeanModel.html b/docs/api/freemarker/ext/beans/class-use/BeanModel.html
index b7863f2..691783f 100644
--- a/docs/api/freemarker/ext/beans/class-use/BeanModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/BeanModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.BeanModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.BeanModel (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.ext.beans.BeanModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.BeanModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/BeansModelCache.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/BeansModelCache.html b/docs/api/freemarker/ext/beans/class-use/BeansModelCache.html
index 1557c96..cad5dde 100644
--- a/docs/api/freemarker/ext/beans/class-use/BeansModelCache.html
+++ b/docs/api/freemarker/ext/beans/class-use/BeansModelCache.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.BeansModelCache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.BeansModelCache (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.ext.beans.BeansModelCache (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.BeansModelCache (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecision.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecision.html b/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecision.html
index 7f2b799..3bf0588 100644
--- a/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecision.html
+++ b/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecision.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.BeansWrapper.MethodAppearanceDecision (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.BeansWrapper.MethodAppearanceDecision (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.ext.beans.BeansWrapper.MethodAppearanceDecision (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.BeansWrapper.MethodAppearanceDecision (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecisionInput.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecisionInput.html b/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecisionInput.html
index 729981f..1f59e11 100644
--- a/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecisionInput.html
+++ b/docs/api/freemarker/ext/beans/class-use/BeansWrapper.MethodAppearanceDecisionInput.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.BeansWrapper.MethodAppearanceDecisionInput (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.BeansWrapper.MethodAppearanceDecisionInput (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.ext.beans.BeansWrapper.MethodAppearanceDecisionInput (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.BeansWrapper.MethodAppearanceDecisionInput (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/BeansWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/BeansWrapper.html b/docs/api/freemarker/ext/beans/class-use/BeansWrapper.html
index aecf8cd..57b9606 100644
--- a/docs/api/freemarker/ext/beans/class-use/BeansWrapper.html
+++ b/docs/api/freemarker/ext/beans/class-use/BeansWrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.BeansWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.BeansWrapper (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.ext.beans.BeansWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.BeansWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/BeansWrapperBuilder.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/BeansWrapperBuilder.html b/docs/api/freemarker/ext/beans/class-use/BeansWrapperBuilder.html
index f556ed1..c8c3ada 100644
--- a/docs/api/freemarker/ext/beans/class-use/BeansWrapperBuilder.html
+++ b/docs/api/freemarker/ext/beans/class-use/BeansWrapperBuilder.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.BeansWrapperBuilder (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.BeansWrapperBuilder (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.ext.beans.BeansWrapperBuilder (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.BeansWrapperBuilder (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/BeansWrapperConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/BeansWrapperConfiguration.html b/docs/api/freemarker/ext/beans/class-use/BeansWrapperConfiguration.html
index 85d0e1c..73ed9d9 100644
--- a/docs/api/freemarker/ext/beans/class-use/BeansWrapperConfiguration.html
+++ b/docs/api/freemarker/ext/beans/class-use/BeansWrapperConfiguration.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.BeansWrapperConfiguration (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.BeansWrapperConfiguration (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.ext.beans.BeansWrapperConfiguration (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.BeansWrapperConfiguration (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/BooleanModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/BooleanModel.html b/docs/api/freemarker/ext/beans/class-use/BooleanModel.html
index e49676c..dd213ca 100644
--- a/docs/api/freemarker/ext/beans/class-use/BooleanModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/BooleanModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.BooleanModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.BooleanModel (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.ext.beans.BooleanModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.BooleanModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/CollectionModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/CollectionModel.html b/docs/api/freemarker/ext/beans/class-use/CollectionModel.html
index 8e11927..3997363 100644
--- a/docs/api/freemarker/ext/beans/class-use/CollectionModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/CollectionModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.CollectionModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.CollectionModel (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.ext.beans.CollectionModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.CollectionModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/DateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/DateModel.html b/docs/api/freemarker/ext/beans/class-use/DateModel.html
index a9a35e1..2b0cafe 100644
--- a/docs/api/freemarker/ext/beans/class-use/DateModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/DateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.DateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.DateModel (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.ext.beans.DateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.DateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/EnumerationModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/EnumerationModel.html b/docs/api/freemarker/ext/beans/class-use/EnumerationModel.html
index 701e768..3b6578b 100644
--- a/docs/api/freemarker/ext/beans/class-use/EnumerationModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/EnumerationModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.EnumerationModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.EnumerationModel (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.ext.beans.EnumerationModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.EnumerationModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/HashAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/HashAdapter.html b/docs/api/freemarker/ext/beans/class-use/HashAdapter.html
index e1c032c..44d69f7 100644
--- a/docs/api/freemarker/ext/beans/class-use/HashAdapter.html
+++ b/docs/api/freemarker/ext/beans/class-use/HashAdapter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.HashAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.HashAdapter (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.ext.beans.HashAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.HashAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/InvalidPropertyException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/InvalidPropertyException.html b/docs/api/freemarker/ext/beans/class-use/InvalidPropertyException.html
index 293d710..c4cf763 100644
--- a/docs/api/freemarker/ext/beans/class-use/InvalidPropertyException.html
+++ b/docs/api/freemarker/ext/beans/class-use/InvalidPropertyException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.InvalidPropertyException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.InvalidPropertyException (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.ext.beans.InvalidPropertyException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.InvalidPropertyException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/IteratorModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/IteratorModel.html b/docs/api/freemarker/ext/beans/class-use/IteratorModel.html
index c7a0bae..662ea9d 100644
--- a/docs/api/freemarker/ext/beans/class-use/IteratorModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/IteratorModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.IteratorModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.IteratorModel (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.ext.beans.IteratorModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.IteratorModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/MapModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/MapModel.html b/docs/api/freemarker/ext/beans/class-use/MapModel.html
index c4e3c69..69d0cae 100644
--- a/docs/api/freemarker/ext/beans/class-use/MapModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/MapModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.MapModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.MapModel (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.ext.beans.MapModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.MapModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/NumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/NumberModel.html b/docs/api/freemarker/ext/beans/class-use/NumberModel.html
index 37684a2..20d9743 100644
--- a/docs/api/freemarker/ext/beans/class-use/NumberModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/NumberModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.NumberModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.NumberModel (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.ext.beans.NumberModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.NumberModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/OverloadedMethodsModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/OverloadedMethodsModel.html b/docs/api/freemarker/ext/beans/class-use/OverloadedMethodsModel.html
index 586fc26..211832d 100644
--- a/docs/api/freemarker/ext/beans/class-use/OverloadedMethodsModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/OverloadedMethodsModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.OverloadedMethodsModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.OverloadedMethodsModel (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.ext.beans.OverloadedMethodsModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.OverloadedMethodsModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/ResourceBundleModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/ResourceBundleModel.html b/docs/api/freemarker/ext/beans/class-use/ResourceBundleModel.html
index f1c7779..5482d6a 100644
--- a/docs/api/freemarker/ext/beans/class-use/ResourceBundleModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/ResourceBundleModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.ResourceBundleModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.ResourceBundleModel (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.ext.beans.ResourceBundleModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.ResourceBundleModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/SimpleMapModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/SimpleMapModel.html b/docs/api/freemarker/ext/beans/class-use/SimpleMapModel.html
index 2c49a88..e7b5df1 100644
--- a/docs/api/freemarker/ext/beans/class-use/SimpleMapModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/SimpleMapModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.SimpleMapModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.SimpleMapModel (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.ext.beans.SimpleMapModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.SimpleMapModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/SimpleMethodModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/SimpleMethodModel.html b/docs/api/freemarker/ext/beans/class-use/SimpleMethodModel.html
index f617a62..ce6397b 100644
--- a/docs/api/freemarker/ext/beans/class-use/SimpleMethodModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/SimpleMethodModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.SimpleMethodModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.SimpleMethodModel (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.ext.beans.SimpleMethodModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.SimpleMethodModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/class-use/StringModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/class-use/StringModel.html b/docs/api/freemarker/ext/beans/class-use/StringModel.html
index 12d19d7..312795a 100644
--- a/docs/api/freemarker/ext/beans/class-use/StringModel.html
+++ b/docs/api/freemarker/ext/beans/class-use/StringModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.beans.StringModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.beans.StringModel (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.ext.beans.StringModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.beans.StringModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/package-frame.html b/docs/api/freemarker/ext/beans/package-frame.html
index def5f06..8deda8b 100644
--- a/docs/api/freemarker/ext/beans/package-frame.html
+++ b/docs/api/freemarker/ext/beans/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.ext.beans (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.beans (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/package-summary.html b/docs/api/freemarker/ext/beans/package-summary.html
index eaf3ced..534eac6 100644
--- a/docs/api/freemarker/ext/beans/package-summary.html
+++ b/docs/api/freemarker/ext/beans/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.ext.beans (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.beans (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.ext.beans (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.beans (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/package-tree.html b/docs/api/freemarker/ext/beans/package-tree.html
index bdc8219..c77ebde 100644
--- a/docs/api/freemarker/ext/beans/package-tree.html
+++ b/docs/api/freemarker/ext/beans/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.ext.beans Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.beans 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.ext.beans Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.beans Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/package-use.html b/docs/api/freemarker/ext/beans/package-use.html
index 08ec2a6..e100b35 100644
--- a/docs/api/freemarker/ext/beans/package-use.html
+++ b/docs/api/freemarker/ext/beans/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.ext.beans (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.beans (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.ext.beans (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.beans (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/NodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/NodeModel.html b/docs/api/freemarker/ext/dom/NodeModel.html
index 47458d3..23481c0 100644
--- a/docs/api/freemarker/ext/dom/NodeModel.html
+++ b/docs/api/freemarker/ext/dom/NodeModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NodeModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NodeModel (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="NodeModel (FreeMarker 2.3.23 API)";
+            parent.document.title="NodeModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -117,12 +117,16 @@ var activeTableTab = "activeTableTab";
 <pre>public abstract class <span class="typeNameLabel">NodeModel</span>
 extends <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>
 implements <a href="../../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a>, <a href="../../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, <a href="../../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a>, freemarker.core._UnexpectedTypeErrorExplainerTemplateModel</pre>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.
  
  <p>
  Note that <a href="../../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>DefaultObjectWrapper</code></a> automatically wraps W3C DOM <a href="http://docs.oracle.com/javase/8/docs/api/org/w3c/dom/Node.html?is-external=true" title="class or interface in org.w3c.dom"><code>Node</code></a>-s into this, so you may not need to
  do that with this class manually. Though, before dropping the <a href="http://docs.oracle.com/javase/8/docs/api/org/w3c/dom/Node.html?is-external=true" title="class or interface in org.w3c.dom"><code>Node</code></a>-s into the data-model, you may want to
- apply <a href="../../../freemarker/ext/dom/NodeModel.html#simplify-org.w3c.dom.Node-"><code>simplify(Node)</code></a> on them.</div>
+ apply <a href="../../../freemarker/ext/dom/NodeModel.html#simplify-org.w3c.dom.Node-"><code>simplify(Node)</code></a> on them.
+ 
+ <p>
+ Note that this class shouldn't be used to represent a result set of 0 or multiple nodes (we use <code>NodeListModel</code>
+ then), but should be used to represent a node set of exactly 1 node.</div>
 </li>
 </ul>
 </div>


[16/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/class-use/RhinoScriptableModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/class-use/RhinoScriptableModel.html b/docs/api/freemarker/ext/rhino/class-use/RhinoScriptableModel.html
index 789fa1b..a19f2e6 100644
--- a/docs/api/freemarker/ext/rhino/class-use/RhinoScriptableModel.html
+++ b/docs/api/freemarker/ext/rhino/class-use/RhinoScriptableModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.rhino.RhinoScriptableModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.rhino.RhinoScriptableModel (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.ext.rhino.RhinoScriptableModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.rhino.RhinoScriptableModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/class-use/RhinoWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/class-use/RhinoWrapper.html b/docs/api/freemarker/ext/rhino/class-use/RhinoWrapper.html
index 4cf7bc6..d96f548 100644
--- a/docs/api/freemarker/ext/rhino/class-use/RhinoWrapper.html
+++ b/docs/api/freemarker/ext/rhino/class-use/RhinoWrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.rhino.RhinoWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.rhino.RhinoWrapper (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.ext.rhino.RhinoWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.rhino.RhinoWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/package-frame.html b/docs/api/freemarker/ext/rhino/package-frame.html
index 3b90749..7443516 100644
--- a/docs/api/freemarker/ext/rhino/package-frame.html
+++ b/docs/api/freemarker/ext/rhino/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.ext.rhino (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.rhino (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/package-summary.html b/docs/api/freemarker/ext/rhino/package-summary.html
index 743cbd9..d9f72fb 100644
--- a/docs/api/freemarker/ext/rhino/package-summary.html
+++ b/docs/api/freemarker/ext/rhino/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.ext.rhino (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.rhino (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.ext.rhino (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.rhino (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/package-tree.html b/docs/api/freemarker/ext/rhino/package-tree.html
index 75edd12..0e0d454 100644
--- a/docs/api/freemarker/ext/rhino/package-tree.html
+++ b/docs/api/freemarker/ext/rhino/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.ext.rhino Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.rhino 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.ext.rhino Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.rhino Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/package-use.html b/docs/api/freemarker/ext/rhino/package-use.html
index 072afb7..ea0d75c 100644
--- a/docs/api/freemarker/ext/rhino/package-use.html
+++ b/docs/api/freemarker/ext/rhino/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.ext.rhino (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.rhino (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.ext.rhino (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.rhino (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/AllHttpScopesHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/AllHttpScopesHashModel.html b/docs/api/freemarker/ext/servlet/AllHttpScopesHashModel.html
index 805fec6..c1f092e 100644
--- a/docs/api/freemarker/ext/servlet/AllHttpScopesHashModel.html
+++ b/docs/api/freemarker/ext/servlet/AllHttpScopesHashModel.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>AllHttpScopesHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>AllHttpScopesHashModel (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="AllHttpScopesHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="AllHttpScopesHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/FreemarkerServlet.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/FreemarkerServlet.html b/docs/api/freemarker/ext/servlet/FreemarkerServlet.html
index bd814b1..6efecaa 100644
--- a/docs/api/freemarker/ext/servlet/FreemarkerServlet.html
+++ b/docs/api/freemarker/ext/servlet/FreemarkerServlet.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>FreemarkerServlet (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>FreemarkerServlet (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FreemarkerServlet (FreeMarker 2.3.23 API)";
+            parent.document.title="FreemarkerServlet (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":42,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":42,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -151,9 +151,8 @@ extends javax.servlet.http.HttpServlet</pre>
  <code>&lt;#assign tiles=JspTaglibs["/WEB-INF/struts-tiles.tld"]&gt;</code>.
  
  <li>A custom directive named <code>include_page</code> allows you to include the output of another servlet resource from
- your servlet container, just as if you used <code>ServletRequest.getRequestDispatcher(path).include()</code>:
- <code>&lt;@include_page path="/myWebapp/somePage.jsp"/&gt;</code>. You can also pass parameters to the newly included page by
- passing a hash named <code>params</code>:
+ your servlet container, just as if you used <code>ServletRequest.getRequestDispatcher(path).include()</code>: <code>&lt;@include_page path="/myWebapp/somePage.jsp"/&gt;</code>. You can also pass parameters to the newly included page by passing a
+ hash named <code>params</code>:
  <code>&lt;@include_page path="/myWebapp/somePage.jsp" params= lang: "en", q="5"}/&gt;</code>. By default, the request
  parameters of the original request (the one being processed by FreemarkerServlet) are also inherited by the include.
  You can explicitly control this inheritance using the <code>inherit_params</code> parameter:
@@ -169,41 +168,113 @@ extends javax.servlet.http.HttpServlet</pre>
  
  <ul>
  
- <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_TEMPLATE_PATH">"TemplatePath"</a></strong>: Specifies the location of the templates. By default, this is
- interpreted as a <code>ServletContext</code> reasource path, which practically means a web application directory relative
- path, or a <code>WEB-INF/lib/*.jar/META-INF/resources</code>-relative path (note that this last didn't work properly
- before FreeMarker 2.3.23).<br>
+ <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_TEMPLATE_PATH">"TemplatePath"</a></strong>: Specifies the location of the template files. By default,
+ this is interpreted as a <code>ServletContext</code> resource path, which practically means a web application directory
+ relative path, or a <code>WEB-INF/lib/*.jar/META-INF/resources</code>-relative path (note that this last haven't always
+ worked before FreeMarker 2.3.23).<br>
  Alternatively, you can prepend it with <tt>file://</tt> to indicate a literal path in the file system (i.e.
  <tt>file:///var/www/project/templates/</tt>). Note that three slashes were used to specify an absolute path.<br>
  Also, you can prepend it with <code>classpath:</code>, like in <tt>classpath:com/example/templates</tt>, to indicate that
  you want to load templates from the specified package accessible through the Thread Context Class Loader of the
  thread that initializes this servlet.<br>
  If <code>incompatible_improvements</code> is set to 2.3.22 (or higher), you can specify multiple comma separated locations
- inside square brackets, like: <code>[ WEB-INF/templates, classpath:com/example/myapp/templates ]</code>.
- This internally creates a <a href="../../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><code>MultiTemplateLoader</code></a>. Note again that if <code>incompatible_improvements</code> isn't
- set to at least 2.3.22, the initial <code>[</code> has no special meaning, and so this feature is unavailable.<br>
+ inside square brackets, like: <code>[ WEB-INF/templates, classpath:com/example/myapp/templates ]</code>. This internally
+ creates a <a href="../../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache"><code>MultiTemplateLoader</code></a>. Note again that if <code>incompatible_improvements</code> isn't set to at least
+ 2.3.22, the initial <code>[</code> has no special meaning, and so this feature is unavailable.<br>
  Any of the above can have a <code>?setting(name=value, ...)</code> postfix to set the JavaBeans properties of the
  <a href="../../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> created. For example,
- <code>/templates?settings(attemptFileAccess=false, URLConnectionUsesCaches=true)</code>
- calls <a href="../../../freemarker/cache/WebappTemplateLoader.html#setAttemptFileAccess-boolean-"><code>WebappTemplateLoader.setAttemptFileAccess(boolean)</code></a>
- and <a href="../../../freemarker/cache/WebappTemplateLoader.html#setURLConnectionUsesCaches-java.lang.Boolean-"><code>WebappTemplateLoader.setURLConnectionUsesCaches(Boolean)</code></a> to tune the <a href="../../../freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache"><code>WebappTemplateLoader</code></a>. 
- For backward compatibility (not recommended!), you can use the <code>class://</code> prefix, like in
+ <code>/templates?settings(attemptFileAccess=false, URLConnectionUsesCaches=true)</code> calls
+ <a href="../../../freemarker/cache/WebappTemplateLoader.html#setAttemptFileAccess-boolean-"><code>WebappTemplateLoader.setAttemptFileAccess(boolean)</code></a> and
+ <a href="../../../freemarker/cache/WebappTemplateLoader.html#setURLConnectionUsesCaches-java.lang.Boolean-"><code>WebappTemplateLoader.setURLConnectionUsesCaches(Boolean)</code></a> to tune the <a href="../../../freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache"><code>WebappTemplateLoader</code></a>. For
+ backward compatibility (not recommended!), you can use the <code>class://</code> prefix, like in
  <tt>class://com/example/templates</tt> format, which is similar to <code>classpath:</code>, except that it uses the
- defining class loader of this servlet's class. This can cause template not found errors, if that class (in
+ defining class loader of this servlet's class. This can cause template-not-found errors, if that class (in
  <code>freemarer.jar</code> usually) is not local to the web application, while the templates are.<br>
  The default value is <tt>class://</tt> (that is, the root of the class hierarchy), which is not recommended anymore,
- and should be overwritten with the init-param.</li>
+ and should be overwritten with the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_TEMPLATE_PATH">"TemplatePath"</a> init-param.</li>
  
- <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_NO_CACHE">"NoCache"</a></strong>: If set to true, generates headers in the response that advise the
- HTTP client not to cache the returned page. The default is <tt>false</tt>.</li>
+ <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_NO_CACHE">"NoCache"</a></strong>: If set to <code>true</code>, generates headers in the response that
+ advise the HTTP client not to cache the returned page. If <code>false</code>, the HTTP response is not modified for this
+ purpose. The default is <code>false</code>.</li>
  
- <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_CONTENT_TYPE">"ContentType"</a></strong>: If specified, response uses the specified Content-type HTTP
- header. The value may include the charset (e.g. <tt>"text/html; charset=ISO-8859-1"</tt>). If not specified,
- <tt>"text/html"</tt> is used. If the charset is not specified in this init-param, then the charset (encoding) of the
- actual template file will be used (in the response HTTP header and for encoding the output stream). Note that this
- setting can be overridden on a per-template basis by specifying a custom attribute named <tt>content_type</tt> in the
- <tt>attributes</tt> parameter of the <tt>&lt;#ftl&gt;</tt> directive.</li>
+ <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_CONTENT_TYPE">"ContentType"</a></strong>: The Content-type HTTP header value used in the HTTP responses
+ when nothing else specifies the MIME type. The things that may specify the MIME type (and hence this init-param is
+ ignored), starting with the highest precedence, are:
+ <ol>
+ <li>If the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">"OverrideResponseContentType"</a> init-param is <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_NEVER">"never"</a> (the
+ default is <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_ALWAYS">"always"</a>), then the value of <code>ServletResponse.getContentType()</code> is used
+ if that's non-<code>null</code>.
+ <li>The template's <tt>content_type</tt> custom attribute, usually specified via the <tt>attributes</tt> parameter of
+ the <tt>&lt;#ftl&gt;</tt> directive. This is a legacy feature, deprecated by the <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> mechanism.
+ <li>The <a href="../../../freemarker/template/Template.html#getOutputFormat--">output format of the template</a>, if that has non-<code>null</code> MIME-type
+ (<a href="../../../freemarker/core/OutputFormat.html#getMimeType--"><code>OutputFormat.getMimeType()</code></a>). When a template has no output format specified, <a href="../../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>
+ is used, which has <code>null</code> MIME-type. (The output format of a template is deduced from <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>
+ settings, or can be specified directly in the template, like <code>&lt;#ftl outputFormat="HTML"&gt;</code>. See the FreeMarker
+ Manual for more about the output format mechanism. Note that setting an output format may turns on auto-escaping, so
+ it's not just about MIME types.)
+ <li>If the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">"OverrideResponseContentType"</a> init-param is not <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_ALWAYS">"always"</a>
+ (the default is <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_ALWAYS">"always"</a>), then the value of <code>ServletResponse.getContentType()</code> is
+ used if that's non-<code>null</code>.
+ </ol>
+ If none of the above gives a MIME type, then this init-param does. Defaults to <tt>"text/html"</tt>. If and only if
+ the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_RESPONSE_CHARACTER_ENCODING">"ResponseCharacterEncoding"</a> init-param is set to <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_LEGACY">"legacy"</a> (which is
+ the default of it), the content type may include the charset (as in <tt>"text/html; charset=utf-8"</tt>), in which
+ case that specifies the actual charset of the output. If the the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_RESPONSE_CHARACTER_ENCODING">"ResponseCharacterEncoding"</a>
+ init-param is not set to <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_LEGACY">"legacy"</a>, then specifying the charset in the
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_CONTENT_TYPE">"ContentType"</a> init-param is not allowed, and will cause servlet initialization error.</li>
+
+ <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">"OverrideResponseContentType"</a></strong> (since 2.3.24): Specifies when we should
+ override the <code>contentType</code> that might be already set (i.e., non-<code>null</code>) in the
+ <code>HttpServletResponse</code>. The default is <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_ALWAYS">"always"</a>, which means that we always set the
+ content type. Another possible value is <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_NEVER">"never"</a>, which means that we don't set the content
+ type in the response, unless <code>ServletResponse.getContentType()</code> is <code>null</code>. The third possible value
+ is <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE">"whenTemplateHasMimeType"</a>, which means that we only set the content type if either
+ the template has an associated <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> with non-<code>null</code> <a href="../../../freemarker/core/OutputFormat.html#getMimeType--"><code>OutputFormat.getMimeType()</code></a>, or it
+ has a custom attribute with name <tt>content_type</tt>, or <code>ServletResponse.getContentType()</code> is
+ <code>null</code>. Setting this init-param allows you to specify the content type before forwarding to
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a>.</li>
+
+ <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">"OverrideResponseLocale"</a></strong> (since 2.3.24): Specifies if we should override
+ the template <code>locale</code> that might be already set (i.e., non-<code>null</code>) in the <code>HttpServletRequest</code>. The
+ default is <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_ALWAYS">"always"</a>, which means that we always deduce the template <code>locale</code> by
+ invoking <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#deduceLocale-java.lang.String-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-"><code>deduceLocale(String, HttpServletRequest, HttpServletResponse)</code></a>. Another possible value is
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_NEVER">"never"</a>, which means that we don't deduce the template <code>locale</code>, unless
+ <code>ServletRequest.getLocale()</code> is <code>null</code>.
  
+ <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_RESPONSE_CHARACTER_ENCODING">"ResponseCharacterEncoding"</a></strong> (since 2.3.24): Specifies how the
+ <code>HttpServletResponse</code> "character encoding" (as in <code>ServletResponse.setCharacterEncoding(String)</code>)
+ will be deduced. The possible modes are:
+ <ul>
+ <li><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_LEGACY">"legacy"</a>: This is the default for backward compatibility; in new applications, use
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_FROM_TEMPLATE">"fromTemplate"</a> (or some of the other options) instead. <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_LEGACY">"legacy"</a>
+ will use the charset of the template file to set the charset of the servlet response. Except, if the
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_CONTENT_TYPE">"ContentType"</a> init-param contains a charset, it will use that instead. A quirk of this legacy
+ mode is that it's not aware of the <a href="../../../freemarker/core/Configurable.html#getOutputEncoding--"><code>Configurable.getOutputEncoding()</code></a> FreeMarker setting, and thus never reads
+ or writes it (though very few applications utilize that setting anyway). Also, it sets the charset of the servlet
+ response by adding it to the response content type via calling <code>ServletResponse.setContentType(String)</code> (as
+ that was the only way before Servlet 2.4), not via the more modern
+ <code>ServletResponse.setCharacterEncoding(String)</code> method. Note that the charset of a template usually comes
+ from <a href="../../../freemarker/template/Configuration.html#getDefaultEncoding--"><code>Configuration.getDefaultEncoding()</code></a> (i.e., from the <code>default_encoding</code> FreeMarker setting),
+ occasionally from <a href="../../../freemarker/template/Configuration.html#getEncoding-java.util.Locale-"><code>Configuration.getEncoding(Locale)</code></a> (when FreeMarker was configured to use different charsets
+ depending on the locale) or even more rarely from <a href="../../../freemarker/template/Configuration.html#getTemplateConfigurations--"><code>Configuration.getTemplateConfigurations()</code></a> (when FreeMarker was
+ configured to use a specific charset for certain templates).
+ <li><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_FROM_TEMPLATE">"fromTemplate"</a>: This should be used in most applications, but it's not the default for
+ backward compatibility. It reads the <a href="../../../freemarker/core/Configurable.html#getOutputEncoding--"><code>Configurable.getOutputEncoding()</code></a> setting of the template (note that the
+ template usually just inherits that from the <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>), and if that's not set, then reads the source
+ charset of the template, just like <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_LEGACY">"legacy"</a>. Then it passes the charset acquired this way to
+ <code>ServletResponse.setCharacterEncoding(String)</code> and <a href="../../../freemarker/core/Environment.html#setOutputEncoding-java.lang.String-"><code>Environment.setOutputEncoding(String)</code></a>. (It
+ doesn't call the legacy <code>ServletResponse.setContentType(String)</code> API to set the charset.) (Note that if the
+ template has a <code>content_type</code> template attribute (which is deprecated) that specifies a charset, it will be
+ used as the output charset of that template.)
+ <li><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_DO_NOT_SET">"doNotSet"</a>: <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> will not set the <code>HttpServletResponse</code>
+ "character encoding". It will still call <a href="../../../freemarker/core/Environment.html#setOutputEncoding-java.lang.String-"><code>Environment.setOutputEncoding(String)</code></a>, so that the running template
+ will be aware of the charset used for the output.
+ <li><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_FORCE_PREFIX">"force "</a> + charset name, for example <code>force UTF-8</code>: The output charset will
+ be the one specified after "force" + space, regardless of everything. The charset specified this way is passed to
+ <code>ServletResponse.setCharacterEncoding(String)</code> and <a href="../../../freemarker/core/Environment.html#setOutputEncoding-java.lang.String-"><code>Environment.setOutputEncoding(String)</code></a>. If the
+ charset name is not recognized by Java, the servlet initialization will fail.
+ </ul>
+
  <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_BUFFER_SIZE">"BufferSize"</a></strong>: Sets the size of the output buffer in bytes, or if "KB" or
  "MB" is written after the number (like <code>&lt;param-value&gt;256 KB&lt;/param-value&gt;</code>) then in kilobytes or megabytes.
  This corresponds to <code>ServletResponse.setBufferSize(int)</code>. If the <code>HttpServletResponse</code> state doesn't
@@ -220,9 +291,7 @@ extends javax.servlet.http.HttpServlet</pre>
  
  <li><strong><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_META_INF_TLD_LOCATIONS">"MetaInfTldSources"</a></strong> (since 2.3.22): Comma separated list of items, each
  is either <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#META_INF_TLD_LOCATION_WEB_INF_PER_LIB_JARS">"webInfPerLibJars"</a>, or <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#META_INF_TLD_LOCATION_CLASSPATH">"classpath"</a>
- optionally followed by colon and a regular expression, or <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#META_INF_TLD_LOCATION_CLEAR">"clear"</a>. For example
- <code>&lt;param-value&gt;classpath:.*myoverride.*\.jar$, webInfPerLibJars, classpath:.*taglib.*\.jar$&lt;/param-value&gt;</code>, or
- <code>&lt;param-value&gt;classpath&lt;/param-value&gt;</code>. (Whitespace around the commas and list items will be ignored.) See
+ optionally followed by colon and a regular expression, or <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#META_INF_TLD_LOCATION_CLEAR">"clear"</a>. For example <code>&lt;param-value&gt;classpath:.*myoverride.*\.jar$, webInfPerLibJars, classpath:.*taglib.*\.jar$&lt;/param-value&gt;</code>, or <code>&lt;param-value&gt;classpath&lt;/param-value&gt;</code>. (Whitespace around the commas and list items will be ignored.) See
  <a href="../../../freemarker/ext/jsp/TaglibFactory.html#setMetaInfTldSources-java.util.List-"><code>TaglibFactory.setMetaInfTldSources(List)</code></a> for more information. Defaults to a list that contains
  <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#META_INF_TLD_LOCATION_WEB_INF_PER_LIB_JARS">"webInfPerLibJars"</a> only (can be overridden with
  <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#createDefaultMetaInfTldSources--"><code>createDefaultMetaInfTldSources()</code></a>). Note that this can be also specified with the
@@ -250,7 +319,8 @@ extends javax.servlet.http.HttpServlet</pre>
  as <code>object_wrapper</code>.
  
  <li><strong>Any other init-params</strong> will be interpreted as <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>-level FreeMarker setting. See
- the possible names and values at <a href="../../../freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-"><code>Configuration.setSetting(String, String)</code></a>.</li>
+ the possible names and values at <a href="../../../freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-"><code>Configuration.setSetting(String, String)</code></a>. Note that these init-param names
+ are starting with lower-case letter (upper-case init-params are used for FreemarkerSerlvet settings).</li>
  
  </ul>
  
@@ -288,12 +358,10 @@ extends javax.servlet.http.HttpServlet</pre>
  the servlet container (with the proper cause exception). After all, if the visited URL had an associated "action" but
  the template behind it is missing, that's an internal server error, not a wrong URL.</li>
  
- <li>
- If the template contains parsing errors, it will log it with error level, then the servlet throws
+ <li>If the template contains parsing errors, it will log it with error level, then the servlet throws
  <code>ServletException</code> to the servlet container (with the proper cause exception).</li>
  
- <li>
- If the template throws exception during its execution, and the value of the <code>template_exception_handler</code>
+ <li>If the template throws exception during its execution, and the value of the <code>template_exception_handler</code>
  init-param is <code>rethrow</code> (recommended), it will log it with error level and then the servlet throws
  <code>ServletException</code> to the servlet container (with the proper cause exception). But beware, the default value of
  the <code>template_exception_handler</code> init-param is <code>html_debug</code>, which is for development only! Set it to
@@ -372,10 +440,56 @@ extends javax.servlet.http.HttpServlet</pre>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE</a></span></code>
+<div class="block">Init-param name - see the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> class documentation about the init-params.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">INIT_PARAM_OVERRIDE_RESPONSE_LOCALE</a></span></code>
+<div class="block">Init-param name - see the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> class documentation about the init-params.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_RESPONSE_CHARACTER_ENCODING">INIT_PARAM_RESPONSE_CHARACTER_ENCODING</a></span></code>
+<div class="block">Init-param name - see the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> class documentation about the init-params.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_TEMPLATE_PATH">INIT_PARAM_TEMPLATE_PATH</a></span></code>
 <div class="block">Init-param name - see the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> class documentation about the init-params.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_ALWAYS">INIT_PARAM_VALUE_ALWAYS</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_DO_NOT_SET">INIT_PARAM_VALUE_DO_NOT_SET</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_FORCE_PREFIX">INIT_PARAM_VALUE_FORCE_PREFIX</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_FROM_TEMPLATE">INIT_PARAM_VALUE_FROM_TEMPLATE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_LEGACY">INIT_PARAM_VALUE_LEGACY</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_NEVER">INIT_PARAM_VALUE_NEVER</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE">INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE</a></span></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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/ext/servlet/FreemarkerServlet.html#KEY_APPLICATION">KEY_APPLICATION</a></span></code>&nbsp;</td>
@@ -539,7 +653,8 @@ extends javax.servlet.http.HttpServlet</pre>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#deduceLocale-java.lang.String-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">deduceLocale</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;templatePath,
             javax.servlet.http.HttpServletRequest&nbsp;request,
             javax.servlet.http.HttpServletResponse&nbsp;response)</code>
-<div class="block">Returns the locale used for the <a href="../../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-"><code>Configuration.getTemplate(String, Locale)</code></a> call.</div>
+<div class="block">Returns the locale used for the <a href="../../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-"><code>Configuration.getTemplate(String, Locale)</code></a> call (as far as the
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">"OverrideResponseLocale"</a> Servlet init-param allows that).</div>
 </td>
 </tr>
 <tr id="i10" class="altColor">
@@ -559,12 +674,18 @@ extends javax.servlet.http.HttpServlet</pre>
 </td>
 </tr>
 <tr id="i13" class="rowColor">
+<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#getDefaultOverrideResponseContentType--">getDefaultOverrideResponseContentType</a></span>()</code>
+<div class="block">Returns the default value of the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">"OverrideResponseContentType"</a> Servlet init-param.</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>protected <a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#getObjectWrapper--">getObjectWrapper</a></span>()</code>
 <div class="block">Should be final; don't override it.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#getTemplatePath--">getTemplatePath</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -572,7 +693,7 @@ extends javax.servlet.http.HttpServlet</pre>
 </div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#init--">init</a></span>()</code>
 <div class="block">Don't override this method to adjust FreeMarker settings! Override the protected methods for that, such as
@@ -580,7 +701,7 @@ extends javax.servlet.http.HttpServlet</pre>
  etc.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#initializeServletContext-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">initializeServletContext</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request,
                         javax.servlet.http.HttpServletResponse&nbsp;response)</code>
@@ -589,7 +710,7 @@ extends javax.servlet.http.HttpServlet</pre>
  set.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#initializeSession-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">initializeSession</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request,
                  javax.servlet.http.HttpServletResponse&nbsp;response)</code>
@@ -597,16 +718,16 @@ extends javax.servlet.http.HttpServlet</pre>
  (that is, HttpSession-specific) attributes are not yet set.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#postTemplateProcess-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-freemarker.template.Template-freemarker.template.TemplateModel-">postTemplateProcess</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request,
                    javax.servlet.http.HttpServletResponse&nbsp;response,
                    <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
                    <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)</code>
-<div class="block">Called after the execution returns from template.process().</div>
+<div class="block">Called after the execution returns from <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#preprocessRequest-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">preprocessRequest</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request,
                  javax.servlet.http.HttpServletResponse&nbsp;response)</code>
@@ -614,23 +735,31 @@ extends javax.servlet.http.HttpServlet</pre>
  is put to work.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#preTemplateProcess-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-freemarker.template.Template-freemarker.template.TemplateModel-">preTemplateProcess</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request,
                   javax.servlet.http.HttpServletResponse&nbsp;response,
                   <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
-                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)</code>
-<div class="block">Called before the execution is passed to template.process().</div>
+                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
+<div class="block">Called before the execution is passed to <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#processEnvironment-freemarker.core.Environment-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">processEnvironment</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
+                  javax.servlet.http.HttpServletRequest&nbsp;request,
+                  javax.servlet.http.HttpServletResponse&nbsp;response)</code>
+<div class="block">This is the method that actually executes the template.</div>
+</td>
+</tr>
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#requestUrlToTemplatePath-javax.servlet.http.HttpServletRequest-">requestUrlToTemplatePath</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request)</code>
 <div class="block">Maps the request URL to a template path (template name) that is passed to
  <a href="../../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-"><code>Configuration.getTemplate(String, Locale)</code></a>.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#setConfigurationDefaults--">setConfigurationDefaults</a></span>()</code>
 <div class="block">Sets the defaults of the configuration that are specific to the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> subclass.</div>
@@ -736,6 +865,54 @@ extends javax.servlet.http.HttpServlet</pre>
 </dl>
 </li>
 </ul>
+<a name="INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE</pre>
+<div class="block">Init-param name - see the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> class documentation about the init-params.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INIT_PARAM_RESPONSE_CHARACTER_ENCODING">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_RESPONSE_CHARACTER_ENCODING</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_RESPONSE_CHARACTER_ENCODING</pre>
+<div class="block">Init-param name - see the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> class documentation about the init-params.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_RESPONSE_CHARACTER_ENCODING">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_OVERRIDE_RESPONSE_LOCALE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_OVERRIDE_RESPONSE_LOCALE</pre>
+<div class="block">Init-param name - see the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> class documentation about the init-params.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="INIT_PARAM_BUFFER_SIZE">
 <!--   -->
 </a>
@@ -800,6 +977,97 @@ extends javax.servlet.http.HttpServlet</pre>
 </dl>
 </li>
 </ul>
+<a name="INIT_PARAM_VALUE_NEVER">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_VALUE_NEVER</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_VALUE_NEVER</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_NEVER">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INIT_PARAM_VALUE_ALWAYS">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_VALUE_ALWAYS</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_VALUE_ALWAYS</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_ALWAYS">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INIT_PARAM_VALUE_FROM_TEMPLATE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_VALUE_FROM_TEMPLATE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_VALUE_FROM_TEMPLATE</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_FROM_TEMPLATE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INIT_PARAM_VALUE_LEGACY">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_VALUE_LEGACY</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_VALUE_LEGACY</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_LEGACY">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INIT_PARAM_VALUE_DO_NOT_SET">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_VALUE_DO_NOT_SET</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_VALUE_DO_NOT_SET</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_DO_NOT_SET">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INIT_PARAM_VALUE_FORCE_PREFIX">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INIT_PARAM_VALUE_FORCE_PREFIX</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> INIT_PARAM_VALUE_FORCE_PREFIX</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_FORCE_PREFIX">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="SYSTEM_PROPERTY_META_INF_TLD_SOURCES">
 <!--   -->
 </a>
@@ -993,7 +1261,8 @@ extends javax.servlet.http.HttpServlet</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>debug</h4>
-<pre>protected&nbsp;boolean debug</pre>
+<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>
+protected&nbsp;boolean debug</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Not used anymore; to enable/disable debug logging, just set the logging level of the logging library
              used by <a href="../../../freemarker/log/Logger.html" title="class in freemarker.log"><code>Logger</code></a>.</span></div>
 </li>
@@ -1104,6 +1373,33 @@ extends javax.servlet.http.HttpServlet</pre>
 </dl>
 </li>
 </ul>
+<a name="processEnvironment-freemarker.core.Environment-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>processEnvironment</h4>
+<pre>protected&nbsp;void&nbsp;processEnvironment(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
+                                  javax.servlet.http.HttpServletRequest&nbsp;request,
+                                  javax.servlet.http.HttpServletResponse&nbsp;response)
+                           throws <a href="../../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a>,
+                                  <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">This is the method that actually executes the template. The original implementation coming from
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> simply calls <a href="../../../freemarker/core/Environment.html#process--"><code>Environment.process()</code></a>. Overriding this method allows you to
+ prepare the <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> before the execution, or extract information from the <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> after
+ the execution. It also allows you to capture exceptions throw by the template.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>env</code> - The <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> object already set up to execute the template. You only have to call
+            <a href="../../../freemarker/core/Environment.html#process--"><code>Environment.process()</code></a> and the output will be produced by the template.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></code></dd>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="deduceLocale-java.lang.String-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">
 <!--   -->
 </a>
@@ -1114,12 +1410,13 @@ extends javax.servlet.http.HttpServlet</pre>
                               javax.servlet.http.HttpServletRequest&nbsp;request,
                               javax.servlet.http.HttpServletResponse&nbsp;response)
                        throws javax.servlet.ServletException</pre>
-<div class="block">Returns the locale used for the <a href="../../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-"><code>Configuration.getTemplate(String, Locale)</code></a> call. The base implementation
- simply returns the locale setting of the configuration. Override this method to provide different behaviour, i.e.
- to use the locale indicated in the request.</div>
+<div class="block">Returns the locale used for the <a href="../../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-"><code>Configuration.getTemplate(String, Locale)</code></a> call (as far as the
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">"OverrideResponseLocale"</a> Servlet init-param allows that). The base implementation in
+ <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> simply returns the <code>locale</code> setting of the configuration. Override this method to
+ provide different behavior, for example, to use the locale indicated in the HTTP request.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>templatePath</code> - The template path (templat name) as it will be passed to <a href="../../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a>.
+<dd><code>templatePath</code> - The template path (template name) as it will be passed to <a href="../../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a>.
             (Not to be confused with the servlet init-param of identical name; they aren't related.)</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code>javax.servlet.ServletException</code> - Can be thrown since 2.3.22, if the locale can't be deduced from the URL.</dd>
@@ -1352,7 +1649,8 @@ extends javax.servlet.http.HttpServlet</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTemplatePath</h4>
-<pre>protected final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getTemplatePath()</pre>
+<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>
+protected final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getTemplatePath()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Not called by FreeMarker code, and there's no point to override this (unless to cause confusion).</span></div>
 <div class="block">The value of the <code>TemplatePath</code> init-param. <code>null</code> if the <code>template_loader</code> setting was set in
  a custom <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#createConfiguration--"><code>createConfiguration()</code></a>.</div>
@@ -1427,30 +1725,25 @@ extends javax.servlet.http.HttpServlet</pre>
 <pre>protected&nbsp;boolean&nbsp;preTemplateProcess(javax.servlet.http.HttpServletRequest&nbsp;request,
                                      javax.servlet.http.HttpServletResponse&nbsp;response,
                                      <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
-                                     <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)
+                                     <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)
                               throws javax.servlet.ServletException,
                                      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Called before the execution is passed to template.process().
- This is a generic hook you might use in subclasses to perform a specific
- action before the template is processed. By default does nothing.
- A typical action to perform here is to inject application-specific
- objects into the model root
-
- <p>Example: Expose the Serlvet context path as "baseDir" for all templates:
-
-<pre>
-    ((SimpleHash) data).put("baseDir", request.getContextPath() + "/");
-    return true;
-</pre></div>
+<div class="block">Called before the execution is passed to <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, java.io.Writer)</code></a>. This is a
+ generic hook you might use in subclasses to perform a specific action before the template is processed.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>request</code> - the actual HTTP request</dd>
-<dd><code>response</code> - the actual HTTP response</dd>
-<dd><code>template</code> - the template that will get executed</dd>
-<dd><code>data</code> - the data that will be passed to the template. By default this will be
-        an <a href="../../../freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet"><code>AllHttpScopesHashModel</code></a> (which is a <a href="../../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> subclass).
-        Thus, you can add new variables to the data-model with the
-        <a href="../../../freemarker/template/SimpleHash.html#put-java.lang.String-java.lang.Object-"><code>SimpleHash.put(String, Object)</code></a> subclass) method.</dd>
+<dd><code>request</code> - The HTTP request that we will response to.</dd>
+<dd><code>response</code> - The HTTP response. The HTTP headers are already initialized here, such as the <code>conteType</code> and
+            the <code>responseCharacterEncoding</code> are already set, but you can do the final adjustments here. The
+            response <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a> isn't created yet, so changing HTTP headers and buffering parameters works.</dd>
+<dd><code>template</code> - The template that will get executed</dd>
+<dd><code>model</code> - The data model that will be passed to the template. By default this will be an
+            <a href="../../../freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet"><code>AllHttpScopesHashModel</code></a> (which is a <a href="../../../freemarker/template/SimpleHash.html" title="class in freemarker.template"><code>SimpleHash</code></a> subclass). Thus, you
+            can add new variables to the data-model with the
+            <a href="../../../freemarker/template/SimpleHash.html#put-java.lang.String-java.lang.Object-"><code>SimpleHash.put(String, Object)</code></a> subclass) method. However, to adjust the
+            data-model, overriding
+            <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#createModel-freemarker.template.ObjectWrapper-javax.servlet.ServletContext-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-"><code>createModel(ObjectWrapper, ServletContext, HttpServletRequest, HttpServletResponse)</code></a> is
+            probably a more appropriate place.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>true to process the template, false to suppress template processing.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1471,7 +1764,7 @@ extends javax.servlet.http.HttpServlet</pre>
                                    <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)
                             throws javax.servlet.ServletException,
                                    <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Called after the execution returns from template.process().
+<div class="block">Called after the execution returns from <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, java.io.Writer)</code></a>.
  This is a generic hook you might use in subclasses to perform a specific
  action after the template is processed. It will be invoked even if the
  template processing throws an exception. By default does nothing.</div>
@@ -1490,7 +1783,7 @@ extends javax.servlet.http.HttpServlet</pre>
 <a name="getConfiguration--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getConfiguration</h4>
 <pre>protected&nbsp;<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;getConfiguration()</pre>
@@ -1499,6 +1792,22 @@ extends javax.servlet.http.HttpServlet</pre>
  when you modify it.</div>
 </li>
 </ul>
+<a name="getDefaultOverrideResponseContentType--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getDefaultOverrideResponseContentType</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getDefaultOverrideResponseContentType()</pre>
+<div class="block">Returns the default value of the <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">"OverrideResponseContentType"</a> Servlet init-param.
+ The method inherited from <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet"><code>FreemarkerServlet</code></a> returns <a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_ALWAYS">"always"</a>; subclasses my
+ override this.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/HttpRequestHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/HttpRequestHashModel.html b/docs/api/freemarker/ext/servlet/HttpRequestHashModel.html
index e376d0f..589090f 100644
--- a/docs/api/freemarker/ext/servlet/HttpRequestHashModel.html
+++ b/docs/api/freemarker/ext/servlet/HttpRequestHashModel.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>HttpRequestHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>HttpRequestHashModel (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="HttpRequestHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="HttpRequestHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/HttpRequestParametersHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/HttpRequestParametersHashModel.html b/docs/api/freemarker/ext/servlet/HttpRequestParametersHashModel.html
index dfa5803..035346f 100644
--- a/docs/api/freemarker/ext/servlet/HttpRequestParametersHashModel.html
+++ b/docs/api/freemarker/ext/servlet/HttpRequestParametersHashModel.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>HttpRequestParametersHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>HttpRequestParametersHashModel (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="HttpRequestParametersHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="HttpRequestParametersHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/HttpSessionHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/HttpSessionHashModel.html b/docs/api/freemarker/ext/servlet/HttpSessionHashModel.html
index 250177a..eaa023c 100644
--- a/docs/api/freemarker/ext/servlet/HttpSessionHashModel.html
+++ b/docs/api/freemarker/ext/servlet/HttpSessionHashModel.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>HttpSessionHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>HttpSessionHashModel (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="HttpSessionHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="HttpSessionHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/IncludePage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/IncludePage.html b/docs/api/freemarker/ext/servlet/IncludePage.html
index 5158d1e..86aef97 100644
--- a/docs/api/freemarker/ext/servlet/IncludePage.html
+++ b/docs/api/freemarker/ext/servlet/IncludePage.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>IncludePage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>IncludePage (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="IncludePage (FreeMarker 2.3.23 API)";
+            parent.document.title="IncludePage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/ServletContextHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/ServletContextHashModel.html b/docs/api/freemarker/ext/servlet/ServletContextHashModel.html
index 22ab5d8..1657c53 100644
--- a/docs/api/freemarker/ext/servlet/ServletContextHashModel.html
+++ b/docs/api/freemarker/ext/servlet/ServletContextHashModel.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>ServletContextHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ServletContextHashModel (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="ServletContextHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="ServletContextHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -232,8 +232,9 @@ implements <a href="../../../freemarker/template/TemplateHashModel.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ServletContextHashModel</h4>
-<pre>public&nbsp;ServletContextHashModel(javax.servlet.ServletContext&nbsp;servletctx,
-                               <a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a>&nbsp;wrapper)</pre>
+<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;ServletContextHashModel(javax.servlet.ServletContext&nbsp;servletctx,
+                                            <a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a>&nbsp;wrapper)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">use 
  <a href="../../../freemarker/ext/servlet/ServletContextHashModel.html#ServletContextHashModel-javax.servlet.GenericServlet-freemarker.template.ObjectWrapper-"><code>ServletContextHashModel(GenericServlet, ObjectWrapper)</code></a> instead.</span></div>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/class-use/AllHttpScopesHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/class-use/AllHttpScopesHashModel.html b/docs/api/freemarker/ext/servlet/class-use/AllHttpScopesHashModel.html
index db73bb1..bbe876a 100644
--- a/docs/api/freemarker/ext/servlet/class-use/AllHttpScopesHashModel.html
+++ b/docs/api/freemarker/ext/servlet/class-use/AllHttpScopesHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.servlet.AllHttpScopesHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.servlet.AllHttpScopesHashModel (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.ext.servlet.AllHttpScopesHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.servlet.AllHttpScopesHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/class-use/FreemarkerServlet.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/class-use/FreemarkerServlet.html b/docs/api/freemarker/ext/servlet/class-use/FreemarkerServlet.html
index c677286..c7635e3 100644
--- a/docs/api/freemarker/ext/servlet/class-use/FreemarkerServlet.html
+++ b/docs/api/freemarker/ext/servlet/class-use/FreemarkerServlet.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.servlet.FreemarkerServlet (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.servlet.FreemarkerServlet (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.ext.servlet.FreemarkerServlet (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.servlet.FreemarkerServlet (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/class-use/HttpRequestHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/class-use/HttpRequestHashModel.html b/docs/api/freemarker/ext/servlet/class-use/HttpRequestHashModel.html
index 54e540b..a292589 100644
--- a/docs/api/freemarker/ext/servlet/class-use/HttpRequestHashModel.html
+++ b/docs/api/freemarker/ext/servlet/class-use/HttpRequestHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.servlet.HttpRequestHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.servlet.HttpRequestHashModel (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.ext.servlet.HttpRequestHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.servlet.HttpRequestHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/class-use/HttpRequestParametersHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/class-use/HttpRequestParametersHashModel.html b/docs/api/freemarker/ext/servlet/class-use/HttpRequestParametersHashModel.html
index 78ac642..463c261 100644
--- a/docs/api/freemarker/ext/servlet/class-use/HttpRequestParametersHashModel.html
+++ b/docs/api/freemarker/ext/servlet/class-use/HttpRequestParametersHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.servlet.HttpRequestParametersHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.servlet.HttpRequestParametersHashModel (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.ext.servlet.HttpRequestParametersHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.servlet.HttpRequestParametersHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {



[10/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/Configuration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/Configuration.html b/docs/api/freemarker/template/class-use/Configuration.html
index 3444ef5..33455ff 100644
--- a/docs/api/freemarker/template/class-use/Configuration.html
+++ b/docs/api/freemarker/template/class-use/Configuration.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.Configuration (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.Configuration (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.Configuration (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.Configuration (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -121,6 +121,22 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </a>
 <h3>Uses of <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></h3>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> that return <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateConfigurationFactory.html#getConfiguration--">getConfiguration</a></span>()</code>
+<div class="block">Returns the configuration this object belongs to, or <code>null</code> if it isn't yet bound to a
+ <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
 <caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> with parameters of type <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
@@ -129,12 +145,38 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Binds this <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> to a <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateCache.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
 <div class="block"><span class="deprecationComment">Use the <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> constructor.</span></div>
 </div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Calls <a href="../../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">MergingTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/MergingTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">FirstMatchTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">ConditionalTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/ConditionalTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
@@ -157,9 +199,21 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
              <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
              <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
              <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
-             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
+             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
+<div class="block">Same as
+ <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, TemplateLookupStrategy, TemplateNameFormat,
+ TemplateConfigurationFactory, Configuration)</code></a> with <code>null</code> for <code>templateConfigurations</code>-s.</div>
+</td>
 </tr>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
+             <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
+             <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
+             <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
+             <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>&nbsp;templateConfigurations,
+             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
              <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
 <div class="block">Same as <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> with a new <a href="../../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache"><code>SoftCacheStorage</code></a>
@@ -184,6 +238,12 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colFirst"><code><a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getConfiguration--">getConfiguration</a></span>()</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#getParentConfiguration--">getParentConfiguration</a></span>()</code>
+<div class="block">Returns the parent <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, or <code>null</code> if none was associated yet.</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -206,6 +266,13 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">Sets the value of a <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>-scope attribute in the given <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-">setParentConfiguration</a></span>(<a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Associates this instance with a <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>; usually you don't call this, as it's called internally
+ when this instance is added to a <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -291,7 +358,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;content,
                     <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
-<div class="block">Creates a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
+<div class="block">Creates (not "get"-s) a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -346,6 +413,17 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </td>
 </tr>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-freemarker.core.ParserConfiguration-java.lang.String-">Template</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+        <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
+        <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>&nbsp;customParserConfiguration,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
+<div class="block">Same as <a href="../../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template.Template(String, String, Reader, Configuration, String)</code></a>, but also specifies a
+ <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-">Template</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/Template.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/Template.html b/docs/api/freemarker/template/class-use/Template.html
index 836ad71..401d138 100644
--- a/docs/api/freemarker/template/class-use/Template.html
+++ b/docs/api/freemarker/template/class-use/Template.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.Template (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.Template (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.Template (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.Template (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -188,8 +188,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateForImporting-java.lang.String-">getTemplateForImporting</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
-<div class="block">Gets a template for importing; used with
- <a href="../../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-"><code>Environment.importLib(Template importedTemplate, String namespace)</code></a>.</div>
+<div class="block">Gets a template for importing; used with <a href="../../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-"><code>Environment.importLib(Template importedTemplate, String namespace)</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -198,7 +197,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
                        boolean&nbsp;parse)</code>
 <div class="block">Same as <a href="../../../freemarker/core/Environment.html#getTemplateForInclusion-java.lang.String-java.lang.String-boolean-boolean-"><code>Environment.getTemplateForInclusion(String, String, boolean, boolean)</code></a> with <code>false</code>
- <code>ignoreMissign</code> argument.</div>
+ <code>ignoreMissing</code> argument.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -220,26 +219,33 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-">apply</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
+<div class="block">Sets the settings of the <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> which are not yet set in the <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> and are set in this
+ <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, leaves the other settings as is.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><span class="typeNameLabel">CustomAttribute.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CustomAttribute.html#get-freemarker.template.Template-">get</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block">Gets the value of a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-scope attribute from the given <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-">importLib</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;loadedTemplate,
          <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;namespace)</code>
 <div class="block">Emulates <code>import</code> directive.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#include-freemarker.template.Template-">include</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;includedTemplate)</code>
-<div class="block">Processes a Template in the context of this <code>Environment</code>, including its
- output in the <code>Environment</code>'s Writer.</div>
+<div class="block">Processes a Template in the context of this <code>Environment</code>, including its output in the
+ <code>Environment</code>'s Writer.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateClassResolver.html#resolve-java.lang.String-freemarker.core.Environment-freemarker.template.Template-">resolve</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;className,
        <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
@@ -247,27 +253,27 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">Gets a <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang"><code>Class</code></a> based on the class name.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a></code></td>
 <td class="colLast"><span class="typeNameLabel">OptInTemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/OptInTemplateClassResolver.html#resolve-java.lang.String-freemarker.core.Environment-freemarker.template.Template-">resolve</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;className,
        <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
        <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><span class="typeNameLabel">OptInTemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/OptInTemplateClassResolver.html#safeGetTemplateName-freemarker.template.Template-">safeGetTemplateName</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block">Extract the template name from the template object which will be matched
  against the trusted template names and pattern.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">CustomAttribute.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.template.Template-">set</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
    <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block">Sets the value of a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-scope attribute in the given <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">FreeMarkerTree.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/FreeMarkerTree.html#setTemplate-freemarker.template.Template-">setTemplate</a></span>(<a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
@@ -362,7 +368,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                    javax.servlet.http.HttpServletResponse&nbsp;response,
                    <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
                    <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)</code>
-<div class="block">Called after the execution returns from template.process().</div>
+<div class="block">Called after the execution returns from <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -370,8 +376,8 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <td class="colLast"><span class="typeNameLabel">FreemarkerServlet.</span><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#preTemplateProcess-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-freemarker.template.Template-freemarker.template.TemplateModel-">preTemplateProcess</a></span>(javax.servlet.http.HttpServletRequest&nbsp;request,
                   javax.servlet.http.HttpServletResponse&nbsp;response,
                   <a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
-                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;data)</code>
-<div class="block">Called before the execution is passed to template.process().</div>
+                  <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
+<div class="block">Called before the execution is passed to <a href="../../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>process(Object, java.io.Writer)</code></a>.</div>
 </td>
 </tr>
 </tbody>
@@ -403,7 +409,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;content,
                     <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
-<div class="block">Creates a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
+<div class="block">Creates (not "get"-s) a <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
 </td>
 </tr>
 <tr class="altColor">

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateDateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateDateModel.html b/docs/api/freemarker/template/class-use/TemplateDateModel.html
index a3ed44e..4093e43 100644
--- a/docs/api/freemarker/template/class-use/TemplateDateModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateDateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateDateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateDateModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateDateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateDateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -84,6 +84,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="#freemarker.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="#freemarker.ext.beans">freemarker.ext.beans</a></td>
 <td class="colLast">
 <div class="block">The <a href="../../../freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>default object wrapper</code></a> of FreeMarker uses
@@ -91,7 +97,7 @@ this to expose Java Beans and POJO-s to templates, but it can also be used in it
 better alternative <a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
 <td class="colLast">
 <div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
@@ -104,6 +110,38 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </li>
 <li class="blockList">
 <ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with parameters of type <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#format-freemarker.template.TemplateDateModel-">format</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#getNonNullDate-freemarker.template.TemplateDateModel-">getNonNullDate</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> from an <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, and throw
+ <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="freemarker.ext.beans">
 <!--   -->
 </a>

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/TemplateDirectiveModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/TemplateDirectiveModel.html b/docs/api/freemarker/template/class-use/TemplateDirectiveModel.html
index da72d3c..889782f 100644
--- a/docs/api/freemarker/template/class-use/TemplateDirectiveModel.html
+++ b/docs/api/freemarker/template/class-use/TemplateDirectiveModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.TemplateDirectiveModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.TemplateDirectiveModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.TemplateDirectiveModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.TemplateDirectiveModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -118,7 +118,11 @@ templates instead of JSP as the MVC View
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#visit-freemarker.core.TemplateElement-freemarker.template.TemplateDirectiveModel-java.util.Map-java.util.List-">visit</a></span>(freemarker.core.TemplateElement&nbsp;element,
      <a href="../../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>&nbsp;directiveModel,
      <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;args,
-     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)</code>&nbsp;</td>
+     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Should be internal API</span></div>
+</div>
+</td>
 </tr>
 </tbody>
 </table>


[07/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/StringUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/StringUtil.html b/docs/api/freemarker/template/utility/StringUtil.html
index 5caf7d9..330e49a 100644
--- a/docs/api/freemarker/template/utility/StringUtil.html
+++ b/docs/api/freemarker/template/utility/StringUtil.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>StringUtil (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>StringUtil (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StringUtil (FreeMarker 2.3.23 API)";
+            parent.document.title="StringUtil (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":41,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9,"i39":9,"i40":9,"i41":9,"i42":9,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":41,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":41,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9,"i39":9,"i40":9,"i41":9,"i42":9,"i43":9,"i44":9,"i45":9,"i46":9,"i47":9,"i48":9,"i49":9,"i50":9,"i51":9,"i52":9,"i53":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -155,7 +155,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#chomp-java.lang.String-">chomp</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;s)</code>
-<div class="block">Removes the line-break from the end of the string.</div>
+<div class="block">Removes a line-break from the end of the string (if there's any).</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
@@ -199,6 +199,19 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#getYesNo-java.lang.String-">getYesNo</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;s)</code>&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html?is-external=true" title="class or interface in java.util.regex">Pattern</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#globToRegularExpression-java.lang.String-">globToRegularExpression</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;glob)</code>
+<div class="block">Same as <a href="../../../freemarker/template/utility/StringUtil.html#globToRegularExpression-java.lang.String-boolean-"><code>globToRegularExpression(String, boolean)</code></a> with <code>caseInsensitive</code> argument <code>false</code>.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html?is-external=true" title="class or interface in java.util.regex">Pattern</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#globToRegularExpression-java.lang.String-boolean-">globToRegularExpression</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;glob,
+                       boolean&nbsp;caseInsensitive)</code>
+<div class="block">Creates a regular expression from a glob.</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#HTMLEnc-java.lang.String-">HTMLEnc</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;s)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -206,33 +219,33 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#isFTLIdentifierPart-char-">isFTLIdentifierPart</a></span>(char&nbsp;c)</code>
 <div class="block">Tells if a character can occur in an FTL identifier expression (without escaping) as other than the first
  character.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#isFTLIdentifierStart-char-">isFTLIdentifierStart</a></span>(char&nbsp;c)</code>
 <div class="block">Tells if a character can occur on the beginning of an FTL identifier expression (without escaping).</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#isTrimmableToEmpty-char:A-">isTrimmableToEmpty</a></span>(char[]&nbsp;text)</code>
 <div class="block">Tells if <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#trim--" title="class or interface in java.lang"><code>String.trim()</code></a> will return a 0-length string for the <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> equivalent of the argument.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#isTrimmableToEmpty-char:A-int-">isTrimmableToEmpty</a></span>(char[]&nbsp;text,
                   int&nbsp;start)</code>
 <div class="block">Like <a href="../../../freemarker/template/utility/StringUtil.html#isTrimmableToEmpty-char:A-"><code>isTrimmableToEmpty(char[])</code></a>, but acts on a sub-array that starts at <code>start</code> (inclusive index).</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#isTrimmableToEmpty-char:A-int-int-">isTrimmableToEmpty</a></span>(char[]&nbsp;text,
                   int&nbsp;start,
@@ -241,66 +254,70 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  and ends at <code>end</code> (exclusive index).</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#isXMLID-java.lang.String-">isXMLID</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>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#isXMLID-java.lang.String-">isXMLID</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"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Don't use this outside FreeMarker; it's name if misleading, and it doesn't follow the XML specs.</span></div>
+</div>
+</td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#javaScriptStringEnc-java.lang.String-">javaScriptStringEnc</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;s)</code>
 <div class="block">Escapes 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"><code>String</code></a> to be safely insertable into a JavaScript string literal; for more see
  <a href="../../../freemarker/template/utility/StringUtil.html#jsStringEnc-java.lang.String-boolean-"><code>jsStringEnc(s, false)</code></a>.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#javaStringEnc-java.lang.String-">javaStringEnc</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;s)</code>
 <div class="block">Escapes the <code>String</code> with the escaping rules of Java language
  string literals, so it's safe to insert the value into a string literal.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#jQuote-java.lang.Object-">jQuote</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Converts the parameter with <code>toString</code> (if it's not <code>null</code>) and passes it to
  <a href="../../../freemarker/template/utility/StringUtil.html#jQuote-java.lang.String-"><code>jQuote(String)</code></a>.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#jQuote-java.lang.String-">jQuote</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;s)</code>
 <div class="block">Quotes string as Java Language string literal.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#jQuoteNoXSS-java.lang.Object-">jQuoteNoXSS</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
 <div class="block">Converts the parameter with <code>toString</code> (if not
  <code>null</code>)and passes it to <a href="../../../freemarker/template/utility/StringUtil.html#jQuoteNoXSS-java.lang.String-"><code>jQuoteNoXSS(String)</code></a>.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#jQuoteNoXSS-java.lang.String-">jQuoteNoXSS</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;s)</code>
 <div class="block">Same as <a href="../../../freemarker/template/utility/StringUtil.html#jQuoteNoXSS-java.lang.String-"><code>jQuoteNoXSS(String)</code></a> but also escapes <code>'&lt;'</code>
  as <code>\</code><code>u003C</code>.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#jsonStringEnc-java.lang.String-">jsonStringEnc</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;s)</code>
 <div class="block">Escapes 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"><code>String</code></a> to be safely insertable into a JSON string literal; for more see
  <a href="../../../freemarker/template/utility/StringUtil.html#jsStringEnc-java.lang.String-boolean-"><code>jsStringEnc(s, true)</code></a>.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#jsStringEnc-java.lang.String-boolean-">jsStringEnc</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;s,
            boolean&nbsp;json)</code>
 <div class="block">Escapes 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"><code>String</code></a> to be safely insertable into a JavaScript or a JSON string literal.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#leftPad-java.lang.String-int-">leftPad</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;s,
        int&nbsp;minLength)</code>
@@ -308,7 +325,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  length.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#leftPad-java.lang.String-int-char-">leftPad</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;s,
        int&nbsp;minLength,
@@ -317,7 +334,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  the desired length.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#leftPad-java.lang.String-int-java.lang.String-">leftPad</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;s,
        int&nbsp;minLength,
@@ -326,14 +343,14 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  desired length.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#matchesName-java.lang.String-java.lang.String-java.lang.String-freemarker.core.Environment-">matchesName</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;qname,
            <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;nodeName,
            <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;nsURI,
            <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>static <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></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#parseNameValuePairList-java.lang.String-java.lang.String-">parseNameValuePairList</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;s,
                       <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;defaultValue)</code>
@@ -341,7 +358,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  and the name and value is separated with colon.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#replace-java.lang.String-java.lang.String-java.lang.String-">replace</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;text,
        <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;oldSub,
@@ -349,7 +366,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">Same as <a href="../../../freemarker/template/utility/StringUtil.html#replace-java.lang.String-java.lang.String-java.lang.String-boolean-boolean-"><code>replace(String, String, String, boolean, boolean)</code></a> with two <code>false</code> parameters.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#replace-java.lang.String-java.lang.String-java.lang.String-boolean-boolean-">replace</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;text,
        <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;oldsub,
@@ -359,7 +376,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">Replaces all occurrences of a sub-string in a string.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#rightPad-java.lang.String-int-">rightPad</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;s,
         int&nbsp;minLength)</code>
@@ -367,7 +384,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  length.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#rightPad-java.lang.String-int-char-">rightPad</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;s,
         int&nbsp;minLength,
@@ -376,7 +393,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  reaches the desired length.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#rightPad-java.lang.String-int-java.lang.String-">rightPad</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;s,
         int&nbsp;minLength,
@@ -385,20 +402,27 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  desired length.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#RTFEnc-java.lang.String-">RTFEnc</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;s)</code>
 <div class="block">Rich Text Format encoding (does not replace line breaks).</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i37" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#RTFEnc-java.lang.String-java.io.Writer-">RTFEnc</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;s,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Like <a href="../../../freemarker/template/utility/StringUtil.html#RTFEnc-java.lang.String-"><code>RTFEnc(String)</code></a>, but writes the result into a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+</td>
+</tr>
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#split-java.lang.String-char-">split</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;s,
      char&nbsp;c)</code>
 <div class="block">Splits a string at the specified character.</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i39" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#split-java.lang.String-java.lang.String-boolean-">split</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;s,
      <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;sep,
@@ -406,32 +430,32 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">Splits a string at the specified string.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i40" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#toLowerABC-int-">toLowerABC</a></span>(int&nbsp;n)</code>
 <div class="block">Same as <a href="../../../freemarker/template/utility/StringUtil.html#toUpperABC-int-"><code>toUpperABC(int)</code></a>, but produces lower case result, like <code>"ab"</code>.</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#toUpperABC-int-">toUpperABC</a></span>(int&nbsp;n)</code>
 <div class="block">Converts <code>1</code>, <code>2</code>, <code>3</code> and so forth to <code>"A"</code>, <code>"B"</code>, <code>"C"</code> and so fort.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<tr id="i42" class="altColor">
 <td class="colFirst"><code>static char[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#trim-char:A-">trim</a></span>(char[]&nbsp;cs)</code>
 <div class="block">Behaves exactly like <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true#trim--" title="class or interface in java.lang"><code>String.trim()</code></a>, but works on arrays.</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
+<tr id="i43" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#tryToString-java.lang.Object-">tryToString</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;object)</code>
 <div class="block">Tries to run <code>toString()</code>, but if that fails, returns a
  <code>"[com.example.SomeClass.toString() failed: " + e + "]"</code> instead.</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i44" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#URLEnc-java.lang.String-java.lang.String-">URLEnc</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;s,
       <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;charset)</code>
@@ -439,48 +463,62 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  characters that are reserved anywhere.</div>
 </td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i45" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#URLPathEnc-java.lang.String-java.lang.String-">URLPathEnc</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;s,
           <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;charset)</code>
 <div class="block">Like <a href="../../../freemarker/template/utility/StringUtil.html#URLEnc-java.lang.String-java.lang.String-"><code>URLEnc(String, String)</code></a> but doesn't escape the slash character (<code>/</code>).</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i46" class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#versionStringToInt-java.lang.String-">versionStringToInt</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;version)</code>
 <div class="block">Converts a version number string to an integer for easy comparison.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i47" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#XHTMLEnc-java.lang.String-">XHTMLEnc</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;s)</code>
 <div class="block">XHTML Encoding.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i48" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#XHTMLEnc-java.lang.String-java.io.Writer-">XHTMLEnc</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;s,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Like <a href="../../../freemarker/template/utility/StringUtil.html#XHTMLEnc-java.lang.String-"><code>XHTMLEnc(String)</code></a>, but writes the result into a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+</td>
+</tr>
+<tr id="i49" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#XMLEnc-java.lang.String-">XMLEnc</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;s)</code>
 <div class="block">XML Encoding.</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr id="i50" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/StringUtil.html#XMLEnc-java.lang.String-java.io.Writer-">XMLEnc</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;s,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Like <a href="../../../freemarker/template/utility/StringUtil.html#XMLEnc-java.lang.String-"><code>XMLEnc(String)</code></a>, but writes the result into a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+</td>
+</tr>
+<tr id="i51" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#XMLEncNA-java.lang.String-">XMLEncNA</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;s)</code>
 <div class="block">XML encoding without replacing apostrophes.</div>
 </td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr id="i52" class="altColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#XMLEncNQG-java.lang.String-">XMLEncNQG</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;s)</code>
 <div class="block">XML encoding without replacing apostrophes and quotation marks and
   greater-thans (except in <code>]]&gt;</code>).</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i53" class="rowColor">
 <td class="colFirst"><code>static <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/template/utility/StringUtil.html#XMLEncQAttr-java.lang.String-">XMLEncQAttr</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;s)</code>
-<div class="block">XML encoding for attributes values quoted with <tt>"</tt> (not with <tt>'</tt>!).</div>
+<div class="block">XML encoding for attribute values quoted with <tt>"</tt> (not with <tt>'</tt>!).</div>
 </td>
 </tr>
 </table>
@@ -528,7 +566,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>HTMLEnc</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;HTMLEnc(<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;s)</pre>
+<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 static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;HTMLEnc(<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;s)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../../freemarker/template/utility/StringUtil.html#XHTMLEnc-java.lang.String-"><code>XHTMLEnc(String)</code></a> instead, because it escapes apostrophe-quote too.</span></div>
 <div class="block">HTML encoding (does not convert line breaks and apostrophe-quote).
   Replaces all '&gt;' '&lt;' '&amp;' and '"' with entity reference, but not "'" (apostrophe-quote).
@@ -547,6 +586,24 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
   Replaces all '&gt;' '&lt;' '&amp;', "'" and '"' with entity reference</div>
 </li>
 </ul>
+<a name="XMLEnc-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>XMLEnc</h4>
+<pre>public static&nbsp;void&nbsp;XMLEnc(<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;s,
+                          <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+                   throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Like <a href="../../../freemarker/template/utility/StringUtil.html#XMLEnc-java.lang.String-"><code>XMLEnc(String)</code></a>, but writes the result into a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="XHTMLEnc-java.lang.String-">
 <!--   -->
 </a>
@@ -561,6 +618,24 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
   instead [see http://www.w3.org/TR/xhtml1/#C_16])</div>
 </li>
 </ul>
+<a name="XHTMLEnc-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>XHTMLEnc</h4>
+<pre>public static&nbsp;void&nbsp;XHTMLEnc(<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;s,
+                            <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+                     throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Like <a href="../../../freemarker/template/utility/StringUtil.html#XHTMLEnc-java.lang.String-"><code>XHTMLEnc(String)</code></a>, but writes the result into a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="XMLEncNA-java.lang.String-">
 <!--   -->
 </a>
@@ -582,7 +657,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <li class="blockList">
 <h4>XMLEncQAttr</h4>
 <pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;XMLEncQAttr(<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;s)</pre>
-<div class="block">XML encoding for attributes values quoted with <tt>"</tt> (not with <tt>'</tt>!).
+<div class="block">XML encoding for attribute values quoted with <tt>"</tt> (not with <tt>'</tt>!).
   Also can be used for HTML attributes that are quoted with <tt>"</tt>.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -613,7 +688,25 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <h4>RTFEnc</h4>
 <pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;RTFEnc(<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;s)</pre>
 <div class="block">Rich Text Format encoding (does not replace line breaks).
-  Escapes all '\' '{' '}' and '"'</div>
+  Escapes all '\' '{' '}'.</div>
+</li>
+</ul>
+<a name="RTFEnc-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>RTFEnc</h4>
+<pre>public static&nbsp;void&nbsp;RTFEnc(<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;s,
+                          <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+                   throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Like <a href="../../../freemarker/template/utility/StringUtil.html#RTFEnc-java.lang.String-"><code>RTFEnc(String)</code></a>, but writes the result into a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
 </li>
 </ul>
 <a name="URLEnc-java.lang.String-java.lang.String-">
@@ -814,7 +907,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <li class="blockList">
 <h4>chomp</h4>
 <pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;chomp(<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;s)</pre>
-<div class="block">Removes the line-break from the end of the string.</div>
+<div class="block">Removes a line-break from the end of the string (if there's any).</div>
 </li>
 </ul>
 <a name="emptyToNull-java.lang.String-">
@@ -980,12 +1073,12 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  output. Note that for JSON, the quotation marks must be <code>"</code>, not <code>'</code>, because JSON doesn't escape
  <code>'</code>.
  
- <p>The escaping rules guarantee that if the inside
- of the literal is from one or more touching sections of strings escaped with this, no character sequence will
- occur that closes the string literal or has special meaning in HTML/XML that can terminate the script section.
+ <p>The escaping rules guarantee that if the inside of the JavaScript/JSON string literal is from one or more
+ touching pieces that were escaped with this, no character sequence can occur that closes the
+ JavaScript/JSON string literal, or has a meaning in HTML/XML that causes the HTML script section to be closed.
  (If, however, the escaped section is preceded by or followed by strings from other sources, this can't be
  guaranteed in some rare cases. Like <tt>x = "&lt;/${a?js_string}"</tt> might closes the "script"
- element if <code>a</code> is is <code>"script&gt;"</code>.)
+ element if <code>a</code> is <code>"script&gt;"</code>.)
  
  The escaped characters are:
  
@@ -1065,11 +1158,14 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>isXMLID</h4>
-<pre>public static&nbsp;boolean&nbsp;isXMLID(<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>
+<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 static&nbsp;boolean&nbsp;isXMLID(<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"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Don't use this outside FreeMarker; it's name if misleading, and it doesn't follow the XML specs.</span></div>
+<div class="block">Used internally by the XML DOM wrapper to check if the subvariable name is just an element name, or a more
+ complex XPath expression.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>whether the name is a valid XML tagname.
- (This routine might only be 99% accurate. Should maybe REVISIT)</dd>
+<dd>whether the name is a valid XML tagname. (This routine might only be 99% accurate. Should maybe REVISIT)</dd>
 </dl>
 </li>
 </ul>
@@ -1327,7 +1423,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <a name="isTrimmableToEmpty-char:A-int-int-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>isTrimmableToEmpty</h4>
 <pre>public static&nbsp;boolean&nbsp;isTrimmableToEmpty(char[]&nbsp;text,
@@ -1341,6 +1437,52 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="globToRegularExpression-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>globToRegularExpression</h4>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html?is-external=true" title="class or interface in java.util.regex">Pattern</a>&nbsp;globToRegularExpression(<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;glob)</pre>
+<div class="block">Same as <a href="../../../freemarker/template/utility/StringUtil.html#globToRegularExpression-java.lang.String-boolean-"><code>globToRegularExpression(String, boolean)</code></a> with <code>caseInsensitive</code> argument <code>false</code>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="globToRegularExpression-java.lang.String-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>globToRegularExpression</h4>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html?is-external=true" title="class or interface in java.util.regex">Pattern</a>&nbsp;globToRegularExpression(<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;glob,
+                                              boolean&nbsp;caseInsensitive)</pre>
+<div class="block">Creates a regular expression from a glob. The glob must use <code>/</code> for as file separator, not <code>\</code>
+ (backslash), and is always case sensitive.
+
+ <p>This glob implementation recognizes these special characters:
+ <ul>
+   <li><code>?</code>: Wildcard that matches exactly one character, other than <code>/</code> 
+   <li><code>*</code>: Wildcard that matches zero, one or multiple characters, other than <code>/</code>
+   <li><code>**</code>: Wildcard that matches zero, one or multiple directories. For example, <code>**</code><code>/head.ftl</code>
+       matches <code>foo/bar/head.ftl</code>, <code>foo/head.ftl</code> and <code>head.ftl</code> too. <code>**</code> must be either
+       preceded by <code>/</code> or be at the beginning of the glob. <code>**</code> must be either followed by <code>/</code> or be
+       at the end of the glob. When <code>**</code> is at the end of the glob, it also matches file names, like
+       <code>a/**</code> matches <code>a/b/c.ftl</code>. If the glob only consist of a <code>**</code>, it will be a match for
+       everything.
+   <li><code>\</code> (backslash): Makes the next character non-special (a literal). For example <code>How\?.ftl</code> will
+       match <code>How?.ftl</code>, but not <code>HowX.ftl</code>. Naturally, two backslashes produce one literal backslash. 
+   <li><code>[</code>: Reserved for future purposes; can't be used
+   <li><code>{</code>: Reserved for future purposes; can't be used
+ </ul></div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/ToCanonical.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ToCanonical.html b/docs/api/freemarker/template/utility/ToCanonical.html
index 19392ed..a157cb0 100644
--- a/docs/api/freemarker/template/utility/ToCanonical.html
+++ b/docs/api/freemarker/template/utility/ToCanonical.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>ToCanonical (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ToCanonical (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="ToCanonical (FreeMarker 2.3.23 API)";
+            parent.document.title="ToCanonical (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -113,7 +113,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">ToCanonical</span>
+<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 class <span class="typeNameLabel">ToCanonical</span>
 extends <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></pre>
 <div class="block">Read in a template and convert it to a canonical format.</div>
 </li>
@@ -207,7 +208,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;main(<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;args)</pre>
+<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 static&nbsp;void&nbsp;main(<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;args)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/UndeclaredThrowableException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/UndeclaredThrowableException.html b/docs/api/freemarker/template/utility/UndeclaredThrowableException.html
index 55003ec..3fee3f9 100644
--- a/docs/api/freemarker/template/utility/UndeclaredThrowableException.html
+++ b/docs/api/freemarker/template/utility/UndeclaredThrowableException.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>UndeclaredThrowableException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>UndeclaredThrowableException (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="UndeclaredThrowableException (FreeMarker 2.3.23 API)";
+            parent.document.title="UndeclaredThrowableException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/UnrecognizedTimeZoneException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/UnrecognizedTimeZoneException.html b/docs/api/freemarker/template/utility/UnrecognizedTimeZoneException.html
index 46075a1..c81d869 100644
--- a/docs/api/freemarker/template/utility/UnrecognizedTimeZoneException.html
+++ b/docs/api/freemarker/template/utility/UnrecognizedTimeZoneException.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>UnrecognizedTimeZoneException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>UnrecognizedTimeZoneException (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="UnrecognizedTimeZoneException (FreeMarker 2.3.23 API)";
+            parent.document.title="UnrecognizedTimeZoneException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/UnsupportedNumberClassException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/UnsupportedNumberClassException.html b/docs/api/freemarker/template/utility/UnsupportedNumberClassException.html
index c27841d..ff1b67e 100644
--- a/docs/api/freemarker/template/utility/UnsupportedNumberClassException.html
+++ b/docs/api/freemarker/template/utility/UnsupportedNumberClassException.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>UnsupportedNumberClassException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>UnsupportedNumberClassException (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="UnsupportedNumberClassException (FreeMarker 2.3.23 API)";
+            parent.document.title="UnsupportedNumberClassException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/WriteProtectable.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/WriteProtectable.html b/docs/api/freemarker/template/utility/WriteProtectable.html
index 4f8b3cb..3d5dc89 100644
--- a/docs/api/freemarker/template/utility/WriteProtectable.html
+++ b/docs/api/freemarker/template/utility/WriteProtectable.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>WriteProtectable (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>WriteProtectable (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="WriteProtectable (FreeMarker 2.3.23 API)";
+            parent.document.title="WriteProtectable (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/XmlEscape.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/XmlEscape.html b/docs/api/freemarker/template/utility/XmlEscape.html
index e58946f..e126b6e 100644
--- a/docs/api/freemarker/template/utility/XmlEscape.html
+++ b/docs/api/freemarker/template/utility/XmlEscape.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>XmlEscape (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>XmlEscape (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="XmlEscape (FreeMarker 2.3.23 API)";
+            parent.document.title="XmlEscape (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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



[37/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/CustomAttribute.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CustomAttribute.html b/docs/api/freemarker/core/CustomAttribute.html
index 10fb02b..6be558a 100644
--- a/docs/api/freemarker/core/CustomAttribute.html
+++ b/docs/api/freemarker/core/CustomAttribute.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>CustomAttribute (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>CustomAttribute (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CustomAttribute (FreeMarker 2.3.23 API)";
+            parent.document.title="CustomAttribute (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/Configurable.UnknownSettingException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/DirectiveCallPlace.html" title="interface in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -231,33 +231,46 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </td>
 </tr>
 <tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CustomAttribute.html#get-freemarker.core.TemplateConfiguration-">get</a></span>(<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;templateConfiguration)</code>
+<div class="block">Same as <a href="../../freemarker/core/CustomAttribute.html#get-freemarker.template.Template-"><code>get(Template)</code></a>, but applies to a <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CustomAttribute.html#set-java.lang.Object-">set</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</code>
 <div class="block">Same as <a href="../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.core.Environment-"><code>set(Object, Environment)</code></a>, but uses <a href="../../freemarker/core/Environment.html#getCurrentEnvironment--"><code>Environment.getCurrentEnvironment()</code></a> to fill the 2nd
  argument.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.template.Configuration-">set</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
    <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
 <div class="block">Sets the value of a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>-scope attribute in the given <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.core.Environment-">set</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
    <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>
 <div class="block">Sets the attribute inside the appropriate scope that's accessible through the specified <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.template.Template-">set</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
    <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
 <div class="block">Sets the value of a <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-scope attribute in the given <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>.</div>
 </td>
 </tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.core.TemplateConfiguration-">set</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
+   <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;templateConfiguration)</code>
+<div class="block">Same as <a href="../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.template.Template-"><code>set(Object, Template)</code></a>, but applicable to a <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -420,6 +433,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="get-freemarker.core.TemplateConfiguration-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>get</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;get(<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;templateConfiguration)</pre>
+<div class="block">Same as <a href="../../freemarker/core/CustomAttribute.html#get-freemarker.template.Template-"><code>get(Template)</code></a>, but applies to a <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="get-freemarker.template.Configuration-">
 <!--   -->
 </a>
@@ -494,6 +521,21 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="set-java.lang.Object-freemarker.core.TemplateConfiguration-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>set</h4>
+<pre>public final&nbsp;void&nbsp;set(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
+                      <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;templateConfiguration)</pre>
+<div class="block">Same as <a href="../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.template.Template-"><code>set(Object, Template)</code></a>, but applicable to a <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="set-java.lang.Object-freemarker.template.Configuration-">
 <!--   -->
 </a>
@@ -542,7 +584,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/Configurable.UnknownSettingException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/DirectiveCallPlace.html" title="interface in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/DirectiveCallPlace.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/DirectiveCallPlace.html b/docs/api/freemarker/core/DirectiveCallPlace.html
index 05891af..8ff84d9 100644
--- a/docs/api/freemarker/core/DirectiveCallPlace.html
+++ b/docs/api/freemarker/core/DirectiveCallPlace.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DirectiveCallPlace (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DirectiveCallPlace (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="DirectiveCallPlace (FreeMarker 2.3.23 API)";
+            parent.document.title="DirectiveCallPlace (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -271,10 +271,7 @@ var activeTableTab = "activeTableTab";
  doesn't stand though when <code>providerIdentity</code> mismatches occur (see later). Furthermore, then it's also
  possible that multiple objects created by the same <a href="../../freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility"><code>ObjectFactory</code></a> will be in use on the same time, because
  of directive executions already running in parallel, and because of memory synchronization delays (hardware
- dependent) between the threads.
- 
- <p>
- Note that this feature will only work on Java 5 or later.</div>
+ dependent) between the threads.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>providerIdentity</code> - This is usually the class of the <a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template"><code>TemplateDirectiveModel</code></a> that creates (and uses) the custom

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/Environment.Namespace.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/Environment.Namespace.html b/docs/api/freemarker/core/Environment.Namespace.html
index bc00410..82fa1e1 100644
--- a/docs/api/freemarker/core/Environment.Namespace.html
+++ b/docs/api/freemarker/core/Environment.Namespace.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Environment.Namespace (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Environment.Namespace (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="Environment.Namespace (FreeMarker 2.3.23 API)";
+            parent.document.title="Environment.Namespace (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {


[41/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
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>


[48/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/constant-values.html
----------------------------------------------------------------------
diff --git a/docs/api/constant-values.html b/docs/api/constant-values.html
index 867b96e..8bbe27d 100644
--- a/docs/api/constant-values.html
+++ b/docs/api/constant-values.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>Constant Field Values (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Constant Field Values (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="Constant Field Values (FreeMarker 2.3.23 API)";
+            parent.document.title="Constant Field Values (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -227,6 +227,48 @@
 <td class="colLast"><code>"classic_compatible"</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="freemarker.core.Configurable.CUSTOM_DATE_FORMATS_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY">CUSTOM_DATE_FORMATS_KEY</a></code></td>
+<td class="colLast"><code>"custom_date_formats"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.core.Configurable.CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</a></code></td>
+<td class="colLast"><code>"customDateFormats"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.core.Configurable.CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE</a></code></td>
+<td class="colLast"><code>"custom_date_formats"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.core.Configurable.CUSTOM_NUMBER_FORMATS_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY">CUSTOM_NUMBER_FORMATS_KEY</a></code></td>
+<td class="colLast"><code>"custom_number_formats"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.core.Configurable.CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</a></code></td>
+<td class="colLast"><code>"customNumberFormats"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.core.Configurable.CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</a></code></td>
+<td class="colLast"><code>"custom_number_formats"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.Configurable.DATE_FORMAT_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
@@ -605,21 +647,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>AND</code></td>
-<td class="colLast"><code>118</code></td>
+<td class="colLast"><code>124</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.AS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>AS</code></td>
-<td class="colLast"><code>131</code></td>
+<td class="colLast"><code>137</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ASCII_DIGIT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ASCII_DIGIT</code></td>
-<td class="colLast"><code>138</code></td>
+<td class="colLast"><code>144</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ASSIGN">
@@ -636,333 +678,361 @@
 <td class="colLast"><code>6</code></td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a name="freemarker.core.ParseException.AUTOESC">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>AUTOESC</code></td>
+<td class="colLast"><code>30</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.BLANK">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>BLANK</code></td>
 <td class="colLast"><code>1</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.BREAK">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>BREAK</code></td>
-<td class="colLast"><code>49</code></td>
+<td class="colLast"><code>55</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.BUILT_IN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>BUILT_IN</code></td>
-<td class="colLast"><code>95</code></td>
+<td class="colLast"><code>101</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.CALL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CALL</code></td>
 <td class="colLast"><code>27</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CASE</code></td>
 <td class="colLast"><code>15</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.CLOSE_BRACKET">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSE_BRACKET</code></td>
-<td class="colLast"><code>125</code></td>
+<td class="colLast"><code>131</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.CLOSE_PAREN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSE_PAREN</code></td>
-<td class="colLast"><code>127</code></td>
+<td class="colLast"><code>133</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.CLOSE_TAG1">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSE_TAG1</code></td>
 <td class="colLast"><code>4</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.CLOSE_TAG2">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSE_TAG2</code></td>
 <td class="colLast"><code>5</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.CLOSING_CURLY_BRACKET">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSING_CURLY_BRACKET</code></td>
-<td class="colLast"><code>129</code></td>
+<td class="colLast"><code>135</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.COLON">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>COLON</code></td>
-<td class="colLast"><code>123</code></td>
+<td class="colLast"><code>129</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.COMMA">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>COMMA</code></td>
-<td class="colLast"><code>121</code></td>
+<td class="colLast"><code>127</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.COMMENT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>COMMENT</code></td>
-<td class="colLast"><code>30</code></td>
+<td class="colLast"><code>33</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.COMPRESS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>COMPRESS</code></td>
-<td class="colLast"><code>29</code></td>
+<td class="colLast"><code>32</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DECIMAL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DECIMAL</code></td>
-<td class="colLast"><code>90</code></td>
+<td class="colLast"><code>96</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DEFAUL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DEFAUL</code></td>
-<td class="colLast"><code>57</code></td>
+<td class="colLast"><code>63</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DEFAULT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DEFAULT</code></td>
 <td class="colLast"><code>0</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DIRECTIVE_END">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DIRECTIVE_END</code></td>
-<td class="colLast"><code>139</code></td>
+<td class="colLast"><code>145</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DIV_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DIV_EQUALS</code></td>
-<td class="colLast"><code>103</code></td>
+<td class="colLast"><code>109</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DIVIDE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DIVIDE</code></td>
-<td class="colLast"><code>116</code></td>
+<td class="colLast"><code>122</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DOLLAR_INTERPOLATION_OPENING">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOLLAR_INTERPOLATION_OPENING</code></td>
-<td class="colLast"><code>75</code></td>
+<td class="colLast"><code>81</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DOT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOT</code></td>
-<td class="colLast"><code>91</code></td>
+<td class="colLast"><code>97</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DOT_DOT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOT_DOT</code></td>
-<td class="colLast"><code>92</code></td>
+<td class="colLast"><code>98</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DOT_DOT_ASTERISK">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOT_DOT_ASTERISK</code></td>
-<td class="colLast"><code>94</code></td>
+<td class="colLast"><code>100</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DOT_DOT_LESS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOT_DOT_LESS</code></td>
-<td class="colLast"><code>93</code></td>
+<td class="colLast"><code>99</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DOUBLE_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOUBLE_EQUALS</code></td>
-<td class="colLast"><code>98</code></td>
+<td class="colLast"><code>104</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.DOUBLE_STAR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOUBLE_STAR</code></td>
-<td class="colLast"><code>114</code></td>
+<td class="colLast"><code>120</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ELLIPSIS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ELLIPSIS</code></td>
-<td class="colLast"><code>115</code></td>
+<td class="colLast"><code>121</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ELSE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ELSE</code></td>
-<td class="colLast"><code>48</code></td>
+<td class="colLast"><code>54</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ELSE_IF">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ELSE_IF</code></td>
 <td class="colLast"><code>9</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.EMPTY_DIRECTIVE_END">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>EMPTY_DIRECTIVE_END</code></td>
-<td class="colLast"><code>140</code></td>
+<td class="colLast"><code>146</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_ASSIGN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_ASSIGN</code></td>
-<td class="colLast"><code>42</code></td>
+<td class="colLast"><code>45</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_ATTEMPT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_ATTEMPT</code></td>
-<td class="colLast"><code>38</code></td>
+<td class="colLast"><code>41</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.core.ParseException.END_AUTOESC">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>END_AUTOESC</code></td>
+<td class="colLast"><code>49</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_COMPRESS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_COMPRESS</code></td>
-<td class="colLast"><code>45</code></td>
+<td class="colLast"><code>51</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_ESCAPE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_ESCAPE</code></td>
-<td class="colLast"><code>64</code></td>
+<td class="colLast"><code>70</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_FOREACH">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_FOREACH</code></td>
-<td class="colLast"><code>39</code></td>
+<td class="colLast"><code>42</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_FUNCTION">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_FUNCTION</code></td>
-<td class="colLast"><code>43</code></td>
+<td class="colLast"><code>46</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_GLOBAL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_GLOBAL</code></td>
-<td class="colLast"><code>41</code></td>
+<td class="colLast"><code>44</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_IF">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_IF</code></td>
-<td class="colLast"><code>33</code></td>
+<td class="colLast"><code>36</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_ITEMS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_ITEMS</code></td>
-<td class="colLast"><code>35</code></td>
+<td class="colLast"><code>38</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_LIST">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_LIST</code></td>
-<td class="colLast"><code>34</code></td>
+<td class="colLast"><code>37</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_LOCAL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_LOCAL</code></td>
-<td class="colLast"><code>40</code></td>
+<td class="colLast"><code>43</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_MACRO">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_MACRO</code></td>
-<td class="colLast"><code>44</code></td>
+<td class="colLast"><code>47</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="freemarker.core.ParseException.END_NOAUTOESC">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>END_NOAUTOESC</code></td>
+<td class="colLast"><code>50</code></td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_NOESCAPE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_NOESCAPE</code></td>
-<td class="colLast"><code>66</code></td>
+<td class="colLast"><code>72</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.core.ParseException.END_OUTPUTFORMAT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>END_OUTPUTFORMAT</code></td>
+<td class="colLast"><code>48</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_RECOVER">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_RECOVER</code></td>
-<td class="colLast"><code>37</code></td>
+<td class="colLast"><code>40</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_SEP">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_SEP</code></td>
-<td class="colLast"><code>36</code></td>
+<td class="colLast"><code>39</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_SWITCH">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_SWITCH</code></td>
-<td class="colLast"><code>47</code></td>
+<td class="colLast"><code>53</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.END_TAG">
@@ -976,7 +1046,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_TRANSFORM</code></td>
-<td class="colLast"><code>46</code></td>
+<td class="colLast"><code>52</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.EOF">
@@ -990,56 +1060,56 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>EQUALS</code></td>
-<td class="colLast"><code>97</code></td>
+<td class="colLast"><code>103</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ESCAPE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ESCAPE</code></td>
-<td class="colLast"><code>63</code></td>
+<td class="colLast"><code>69</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ESCAPED_CHAR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ESCAPED_CHAR</code></td>
-<td class="colLast"><code>84</code></td>
+<td class="colLast"><code>90</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ESCAPED_GT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ESCAPED_GT</code></td>
-<td class="colLast"><code>109</code></td>
+<td class="colLast"><code>115</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ESCAPED_GTE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ESCAPED_GTE</code></td>
-<td class="colLast"><code>110</code></td>
+<td class="colLast"><code>116</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ESCAPED_ID_CHAR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ESCAPED_ID_CHAR</code></td>
-<td class="colLast"><code>136</code></td>
+<td class="colLast"><code>142</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.EXCLAM">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>EXCLAM</code></td>
-<td class="colLast"><code>120</code></td>
+<td class="colLast"><code>126</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.EXISTS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>EXISTS</code></td>
-<td class="colLast"><code>96</code></td>
+<td class="colLast"><code>102</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.EXPRESSION_COMMENT">
@@ -1053,21 +1123,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>FALLBACK</code></td>
-<td class="colLast"><code>62</code></td>
+<td class="colLast"><code>68</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.FALSE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>FALSE</code></td>
-<td class="colLast"><code>87</code></td>
+<td class="colLast"><code>93</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.FLUSH">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>FLUSH</code></td>
-<td class="colLast"><code>52</code></td>
+<td class="colLast"><code>58</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.FM_EXPRESSION">
@@ -1088,7 +1158,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>FTL_HEADER</code></td>
-<td class="colLast"><code>69</code></td>
+<td class="colLast"><code>75</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.FUNCTION">
@@ -1109,28 +1179,28 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>HALT</code></td>
-<td class="colLast"><code>51</code></td>
+<td class="colLast"><code>57</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.HASH_INTERPOLATION_OPENING">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>HASH_INTERPOLATION_OPENING</code></td>
-<td class="colLast"><code>76</code></td>
+<td class="colLast"><code>82</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ID">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ID</code></td>
-<td class="colLast"><code>133</code></td>
+<td class="colLast"><code>139</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ID_START_CHAR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ID_START_CHAR</code></td>
-<td class="colLast"><code>137</code></td>
+<td class="colLast"><code>143</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.IF">
@@ -1151,7 +1221,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>IN</code></td>
-<td class="colLast"><code>130</code></td>
+<td class="colLast"><code>136</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.IN_PAREN">
@@ -1165,7 +1235,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>INTEGER</code></td>
-<td class="colLast"><code>89</code></td>
+<td class="colLast"><code>95</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.ITEMS">
@@ -1179,21 +1249,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>KEEP_GOING</code></td>
-<td class="colLast"><code>147</code></td>
+<td class="colLast"><code>153</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.LESS_THAN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>LESS_THAN</code></td>
-<td class="colLast"><code>107</code></td>
+<td class="colLast"><code>113</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.LESS_THAN_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>LESS_THAN_EQUALS</code></td>
-<td class="colLast"><code>108</code></td>
+<td class="colLast"><code>114</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.LIST">
@@ -1214,14 +1284,14 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>LONE_LESS_THAN_OR_DASH</code></td>
-<td class="colLast"><code>148</code></td>
+<td class="colLast"><code>154</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.LTRIM">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>LTRIM</code></td>
-<td class="colLast"><code>54</code></td>
+<td class="colLast"><code>60</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.MACRO">
@@ -1235,35 +1305,35 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>MAYBE_END</code></td>
-<td class="colLast"><code>146</code></td>
+<td class="colLast"><code>152</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.MINUS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>MINUS</code></td>
-<td class="colLast"><code>112</code></td>
+<td class="colLast"><code>118</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.MINUS_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>MINUS_EQUALS</code></td>
-<td class="colLast"><code>101</code></td>
+<td class="colLast"><code>107</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.MINUS_MINUS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>MINUS_MINUS</code></td>
-<td class="colLast"><code>106</code></td>
+<td class="colLast"><code>112</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.MOD_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>MOD_EQUALS</code></td>
-<td class="colLast"><code>104</code></td>
+<td class="colLast"><code>110</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.NAMED_PARAMETER_EXPRESSION">
@@ -1277,21 +1347,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>NATURAL_GT</code></td>
-<td class="colLast"><code>141</code></td>
+<td class="colLast"><code>147</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.NATURAL_GTE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>NATURAL_GTE</code></td>
-<td class="colLast"><code>142</code></td>
+<td class="colLast"><code>148</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.NESTED">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>NESTED</code></td>
-<td class="colLast"><code>59</code></td>
+<td class="colLast"><code>65</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.NO_PARSE">
@@ -1308,116 +1378,130 @@
 <td class="colLast"><code>6</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="freemarker.core.ParseException.NODIRECTIVE">
+<td class="colFirst"><a name="freemarker.core.ParseException.NOAUTOESC">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code>NODIRECTIVE</code></td>
-<td class="colLast"><code>1</code></td>
+<td><code>NOAUTOESC</code></td>
+<td class="colLast"><code>31</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="freemarker.core.ParseException.NOESCAPE">
+<td class="colFirst"><a name="freemarker.core.ParseException.NODIRECTIVE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code>NOESCAPE</code></td>
-<td class="colLast"><code>65</code></td>
+<td><code>NODIRECTIVE</code></td>
+<td class="colLast"><code>1</code></td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a name="freemarker.core.ParseException.NOESCAPE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>NOESCAPE</code></td>
+<td class="colLast"><code>71</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.NON_ESCAPED_ID_START_CHAR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>NON_ESCAPED_ID_START_CHAR</code></td>
-<td class="colLast"><code>135</code></td>
+<td class="colLast"><code>141</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.NOPARSE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>NOPARSE</code></td>
-<td class="colLast"><code>32</code></td>
+<td class="colLast"><code>35</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.NOT_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>NOT_EQUALS</code></td>
-<td class="colLast"><code>99</code></td>
+<td class="colLast"><code>105</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.NOTRIM">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>NOTRIM</code></td>
-<td class="colLast"><code>56</code></td>
+<td class="colLast"><code>62</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.OPEN_BRACKET">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>OPEN_BRACKET</code></td>
-<td class="colLast"><code>124</code></td>
+<td class="colLast"><code>130</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.OPEN_MISPLACED_INTERPOLATION">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>OPEN_MISPLACED_INTERPOLATION</code></td>
-<td class="colLast"><code>134</code></td>
+<td class="colLast"><code>140</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.OPEN_PAREN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>OPEN_PAREN</code></td>
-<td class="colLast"><code>126</code></td>
+<td class="colLast"><code>132</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.OPENING_CURLY_BRACKET">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>OPENING_CURLY_BRACKET</code></td>
-<td class="colLast"><code>128</code></td>
+<td class="colLast"><code>134</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.OR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>OR</code></td>
-<td class="colLast"><code>119</code></td>
+<td class="colLast"><code>125</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.core.ParseException.OUTPUTFORMAT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>OUTPUTFORMAT</code></td>
+<td class="colLast"><code>29</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.PERCENT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>PERCENT</code></td>
-<td class="colLast"><code>117</code></td>
+<td class="colLast"><code>123</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.PLUS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>PLUS</code></td>
-<td class="colLast"><code>111</code></td>
+<td class="colLast"><code>117</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.PLUS_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>PLUS_EQUALS</code></td>
-<td class="colLast"><code>100</code></td>
+<td class="colLast"><code>106</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.PLUS_PLUS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>PLUS_PLUS</code></td>
-<td class="colLast"><code>105</code></td>
+<td class="colLast"><code>111</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.RAW_STRING">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>RAW_STRING</code></td>
-<td class="colLast"><code>86</code></td>
+<td class="colLast"><code>92</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.RECOVER">
@@ -1431,7 +1515,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>RECURSE</code></td>
-<td class="colLast"><code>61</code></td>
+<td class="colLast"><code>67</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.RETURN">
@@ -1445,14 +1529,14 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>RTRIM</code></td>
-<td class="colLast"><code>55</code></td>
+<td class="colLast"><code>61</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.SEMICOLON">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>SEMICOLON</code></td>
-<td class="colLast"><code>122</code></td>
+<td class="colLast"><code>128</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.SEP">
@@ -1473,21 +1557,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>SIMPLE_NESTED</code></td>
-<td class="colLast"><code>58</code></td>
+<td class="colLast"><code>64</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.SIMPLE_RECURSE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>SIMPLE_RECURSE</code></td>
-<td class="colLast"><code>60</code></td>
+<td class="colLast"><code>66</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.SIMPLE_RETURN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>SIMPLE_RETURN</code></td>
-<td class="colLast"><code>50</code></td>
+<td class="colLast"><code>56</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.START_TAG">
@@ -1501,21 +1585,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>STATIC_TEXT_FALSE_ALARM</code></td>
-<td class="colLast"><code>74</code></td>
+<td class="colLast"><code>80</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.STATIC_TEXT_NON_WS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>STATIC_TEXT_NON_WS</code></td>
-<td class="colLast"><code>73</code></td>
+<td class="colLast"><code>79</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.STATIC_TEXT_WS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>STATIC_TEXT_WS</code></td>
-<td class="colLast"><code>72</code></td>
+<td class="colLast"><code>78</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.STOP">
@@ -1529,7 +1613,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>STRING_LITERAL</code></td>
-<td class="colLast"><code>85</code></td>
+<td class="colLast"><code>91</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.SWITCH">
@@ -1543,42 +1627,42 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TERMINATING_EXCLAM</code></td>
-<td class="colLast"><code>144</code></td>
+<td class="colLast"><code>150</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.TERMINATING_WHITESPACE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TERMINATING_WHITESPACE</code></td>
-<td class="colLast"><code>143</code></td>
+<td class="colLast"><code>149</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.TERSE_COMMENT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TERSE_COMMENT</code></td>
-<td class="colLast"><code>31</code></td>
+<td class="colLast"><code>34</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.TERSE_COMMENT_END">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TERSE_COMMENT_END</code></td>
-<td class="colLast"><code>145</code></td>
+<td class="colLast"><code>151</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.TIMES">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TIMES</code></td>
-<td class="colLast"><code>113</code></td>
+<td class="colLast"><code>119</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.TIMES_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TIMES_EQUALS</code></td>
-<td class="colLast"><code>102</code></td>
+<td class="colLast"><code>108</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.TRANSFORM">
@@ -1592,49 +1676,49 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TRIM</code></td>
-<td class="colLast"><code>53</code></td>
+<td class="colLast"><code>59</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.TRIVIAL_FTL_HEADER">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TRIVIAL_FTL_HEADER</code></td>
-<td class="colLast"><code>70</code></td>
+<td class="colLast"><code>76</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.TRUE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>TRUE</code></td>
-<td class="colLast"><code>88</code></td>
+<td class="colLast"><code>94</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.UNIFIED_CALL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>UNIFIED_CALL</code></td>
-<td class="colLast"><code>67</code></td>
+<td class="colLast"><code>73</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.UNIFIED_CALL_END">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>UNIFIED_CALL_END</code></td>
-<td class="colLast"><code>68</code></td>
+<td class="colLast"><code>74</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.UNKNOWN_DIRECTIVE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>UNKNOWN_DIRECTIVE</code></td>
-<td class="colLast"><code>71</code></td>
+<td class="colLast"><code>77</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.USING">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>USING</code></td>
-<td class="colLast"><code>132</code></td>
+<td class="colLast"><code>138</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.core.ParseException.VISIT">
@@ -1881,12 +1965,82 @@
 <td class="colLast"><code>"NoCache"</code></td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE</a></code></td>
+<td class="colLast"><code>"OverrideResponseContentType"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">INIT_PARAM_OVERRIDE_RESPONSE_LOCALE</a></code></td>
+<td class="colLast"><code>"OverrideResponseLocale"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_RESPONSE_CHARACTER_ENCODING">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_RESPONSE_CHARACTER_ENCODING">INIT_PARAM_RESPONSE_CHARACTER_ENCODING</a></code></td>
+<td class="colLast"><code>"ResponseCharacterEncoding"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_TEMPLATE_PATH">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_TEMPLATE_PATH">INIT_PARAM_TEMPLATE_PATH</a></code></td>
 <td class="colLast"><code>"TemplatePath"</code></td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_ALWAYS">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_ALWAYS">INIT_PARAM_VALUE_ALWAYS</a></code></td>
+<td class="colLast"><code>"always"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_DO_NOT_SET">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_DO_NOT_SET">INIT_PARAM_VALUE_DO_NOT_SET</a></code></td>
+<td class="colLast"><code>"doNotSet"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_FORCE_PREFIX">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_FORCE_PREFIX">INIT_PARAM_VALUE_FORCE_PREFIX</a></code></td>
+<td class="colLast"><code>"force "</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_FROM_TEMPLATE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_FROM_TEMPLATE">INIT_PARAM_VALUE_FROM_TEMPLATE</a></code></td>
+<td class="colLast"><code>"fromTemplate"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_LEGACY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_LEGACY">INIT_PARAM_VALUE_LEGACY</a></code></td>
+<td class="colLast"><code>"legacy"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_NEVER">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_NEVER">INIT_PARAM_VALUE_NEVER</a></code></td>
+<td class="colLast"><code>"never"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE">INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE</a></code></td>
+<td class="colLast"><code>"whenTemplateHasMimeType"</code></td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.ext.servlet.FreemarkerServlet.KEY_APPLICATION">
 <!--   -->
@@ -2169,96 +2323,138 @@
 <td class="colLast"><code>0</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.AUTO_ESCAPING_POLICY_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY">AUTO_ESCAPING_POLICY_KEY</a></code></td>
+<td class="colLast"><code>"auto_escaping_policy"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.AUTO_ESCAPING_POLICY_KEY_CAMEL_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY_CAMEL_CASE">AUTO_ESCAPING_POLICY_KEY_CAMEL_CASE</a></code></td>
+<td class="colLast"><code>"autoEscapingPolicy"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.AUTO_ESCAPING_POLICY_KEY_SNAKE_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY_SNAKE_CASE">AUTO_ESCAPING_POLICY_KEY_SNAKE_CASE</a></code></td>
+<td class="colLast"><code>"auto_escaping_policy"</code></td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.AUTO_IMPORT_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY">AUTO_IMPORT_KEY</a></code></td>
 <td class="colLast"><code>"auto_import"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.AUTO_IMPORT_KEY_CAMEL_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY_CAMEL_CASE">AUTO_IMPORT_KEY_CAMEL_CASE</a></code></td>
 <td class="colLast"><code>"autoImport"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.AUTO_IMPORT_KEY_SNAKE_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#AUTO_IMPORT_KEY_SNAKE_CASE">AUTO_IMPORT_KEY_SNAKE_CASE</a></code></td>
 <td class="colLast"><code>"auto_import"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.AUTO_INCLUDE_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#AUTO_INCLUDE_KEY">AUTO_INCLUDE_KEY</a></code></td>
 <td class="colLast"><code>"auto_include"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.AUTO_INCLUDE_KEY_CAMEL_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#AUTO_INCLUDE_KEY_CAMEL_CASE">AUTO_INCLUDE_KEY_CAMEL_CASE</a></code></td>
 <td class="colLast"><code>"autoInclude"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.AUTO_INCLUDE_KEY_SNAKE_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#AUTO_INCLUDE_KEY_SNAKE_CASE">AUTO_INCLUDE_KEY_SNAKE_CASE</a></code></td>
 <td class="colLast"><code>"auto_include"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.CACHE_STORAGE_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#CACHE_STORAGE_KEY">CACHE_STORAGE_KEY</a></code></td>
 <td class="colLast"><code>"cache_storage"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.CACHE_STORAGE_KEY_CAMEL_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#CACHE_STORAGE_KEY_CAMEL_CASE">CACHE_STORAGE_KEY_CAMEL_CASE</a></code></td>
 <td class="colLast"><code>"cacheStorage"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.CACHE_STORAGE_KEY_SNAKE_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#CACHE_STORAGE_KEY_SNAKE_CASE">CACHE_STORAGE_KEY_SNAKE_CASE</a></code></td>
 <td class="colLast"><code>"cache_storage"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.CAMEL_CASE_NAMING_CONVENTION">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code><a href="freemarker/template/Configuration.html#CAMEL_CASE_NAMING_CONVENTION">CAMEL_CASE_NAMING_CONVENTION</a></code></td>
 <td class="colLast"><code>12</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.DEFAULT_ENCODING_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#DEFAULT_ENCODING_KEY">DEFAULT_ENCODING_KEY</a></code></td>
 <td class="colLast"><code>"default_encoding"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.DEFAULT_ENCODING_KEY_CAMEL_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#DEFAULT_ENCODING_KEY_CAMEL_CASE">DEFAULT_ENCODING_KEY_CAMEL_CASE</a></code></td>
 <td class="colLast"><code>"defaultEncoding"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.DEFAULT_ENCODING_KEY_SNAKE_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#DEFAULT_ENCODING_KEY_SNAKE_CASE">DEFAULT_ENCODING_KEY_SNAKE_CASE</a></code></td>
 <td class="colLast"><code>"default_encoding"</code></td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.DISABLE_AUTO_ESCAPING_POLICY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="freemarker/template/Configuration.html#DISABLE_AUTO_ESCAPING_POLICY">DISABLE_AUTO_ESCAPING_POLICY</a></code></td>
+<td class="colLast"><code>20</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="freemarker/template/Configuration.html#ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY">ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY</a></code></td>
+<td class="colLast"><code>21</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.ENABLE_IF_SUPPORTED_AUTO_ESCAPING_POLICY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="freemarker/template/Configuration.html#ENABLE_IF_SUPPORTED_AUTO_ESCAPING_POLICY">ENABLE_IF_SUPPORTED_AUTO_ESCAPING_POLICY</a></code></td>
+<td class="colLast"><code>22</code></td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.INCOMPATIBLE_ENHANCEMENTS">
 <!--   -->
@@ -2344,54 +2540,138 @@
 <td class="colLast"><code>"naming_convention"</code></td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.OUTPUT_FORMAT_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#OUTPUT_FORMAT_KEY">OUTPUT_FORMAT_KEY</a></code></td>
+<td class="colLast"><code>"output_format"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.OUTPUT_FORMAT_KEY_CAMEL_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#OUTPUT_FORMAT_KEY_CAMEL_CASE">OUTPUT_FORMAT_KEY_CAMEL_CASE</a></code></td>
+<td class="colLast"><code>"outputFormat"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.OUTPUT_FORMAT_KEY_SNAKE_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#OUTPUT_FORMAT_KEY_SNAKE_CASE">OUTPUT_FORMAT_KEY_SNAKE_CASE</a></code></td>
+<td class="colLast"><code>"output_format"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY">RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY</a></code></td>
+<td class="colLast"><code>"recognize_standard_file_extensions"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_CAMEL_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_CAMEL_CASE">RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_CAMEL_CASE</a></code></td>
+<td class="colLast"><code>"recognizeStandardFileExtensions"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_SNAKE_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_SNAKE_CASE">RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_SNAKE_CASE</a></code></td>
+<td class="colLast"><code>"recognize_standard_file_extensions"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY">REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY</a></code></td>
+<td class="colLast"><code>"registered_custom_output_formats"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_CAMEL_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_CAMEL_CASE">REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_CAMEL_CASE</a></code></td>
+<td class="colLast"><code>"registeredCustomOutputFormats"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_SNAKE_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_SNAKE_CASE">REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_SNAKE_CASE</a></code></td>
+<td class="colLast"><code>"registered_custom_output_formats"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.SQUARE_BRACKET_TAG_SYNTAX">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code><a href="freemarker/template/Configuration.html#SQUARE_BRACKET_TAG_SYNTAX">SQUARE_BRACKET_TAG_SYNTAX</a></code></td>
 <td class="colLast"><code>2</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.STRICT_SYNTAX_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#STRICT_SYNTAX_KEY">STRICT_SYNTAX_KEY</a></code></td>
 <td class="colLast"><code>"strict_syntax"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.STRICT_SYNTAX_KEY_CAMEL_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#STRICT_SYNTAX_KEY_CAMEL_CASE">STRICT_SYNTAX_KEY_CAMEL_CASE</a></code></td>
 <td class="colLast"><code>"strictSyntax"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.STRICT_SYNTAX_KEY_SNAKE_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#STRICT_SYNTAX_KEY_SNAKE_CASE">STRICT_SYNTAX_KEY_SNAKE_CASE</a></code></td>
 <td class="colLast"><code>"strict_syntax"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.TAG_SYNTAX_KEY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#TAG_SYNTAX_KEY">TAG_SYNTAX_KEY</a></code></td>
 <td class="colLast"><code>"tag_syntax"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.TAG_SYNTAX_KEY_CAMEL_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#TAG_SYNTAX_KEY_CAMEL_CASE">TAG_SYNTAX_KEY_CAMEL_CASE</a></code></td>
 <td class="colLast"><code>"tagSyntax"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.TAG_SYNTAX_KEY_SNAKE_CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="freemarker/template/Configuration.html#TAG_SYNTAX_KEY_SNAKE_CASE">TAG_SYNTAX_KEY_SNAKE_CASE</a></code></td>
 <td class="colLast"><code>"tag_syntax"</code></td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.TEMPLATE_CONFIGURATIONS_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#TEMPLATE_CONFIGURATIONS_KEY">TEMPLATE_CONFIGURATIONS_KEY</a></code></td>
+<td class="colLast"><code>"template_configurations"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.TEMPLATE_CONFIGURATIONS_KEY_CAMEL_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#TEMPLATE_CONFIGURATIONS_KEY_CAMEL_CASE">TEMPLATE_CONFIGURATIONS_KEY_CAMEL_CASE</a></code></td>
+<td class="colLast"><code>"templateConfigurations"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Configuration.TEMPLATE_CONFIGURATIONS_KEY_SNAKE_CASE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="freemarker/template/Configuration.html#TEMPLATE_CONFIGURATIONS_KEY_SNAKE_CASE">TEMPLATE_CONFIGURATIONS_KEY_SNAKE_CASE</a></code></td>
+<td class="colLast"><code>"template_configurations"</code></td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Configuration.TEMPLATE_LOADER_KEY">
 <!--   -->
@@ -2547,21 +2827,21 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>AND</code></td>
-<td class="colLast"><code>118</code></td>
+<td class="colLast"><code>124</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.AS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>AS</code></td>
-<td class="colLast"><code>131</code></td>
+<td class="colLast"><code>137</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.ASCII_DIGIT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ASCII_DIGIT</code></td>
-<td class="colLast"><code>138</code></td>
+<td class="colLast"><code>144</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.ASSIGN">
@@ -2578,333 +2858,361 @@
 <td class="colLast"><code>6</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.BLANK">
+<td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.AUTOESC">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code>BLANK</code></td>
-<td class="colLast"><code>1</code></td>
+<td><code>AUTOESC</code></td>
+<td class="colLast"><code>30</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.BLANK">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>BLANK</code></td>
+<td class="colLast"><code>1</code></td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.BREAK">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>BREAK</code></td>
-<td class="colLast"><code>49</code></td>
+<td class="colLast"><code>55</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.BUILT_IN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>BUILT_IN</code></td>
-<td class="colLast"><code>95</code></td>
+<td class="colLast"><code>101</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.CALL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CALL</code></td>
 <td class="colLast"><code>27</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.CASE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CASE</code></td>
 <td class="colLast"><code>15</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.CLOSE_BRACKET">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSE_BRACKET</code></td>
-<td class="colLast"><code>125</code></td>
+<td class="colLast"><code>131</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.CLOSE_PAREN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSE_PAREN</code></td>
-<td class="colLast"><code>127</code></td>
+<td class="colLast"><code>133</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.CLOSE_TAG1">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSE_TAG1</code></td>
 <td class="colLast"><code>4</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.CLOSE_TAG2">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSE_TAG2</code></td>
 <td class="colLast"><code>5</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.CLOSING_CURLY_BRACKET">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>CLOSING_CURLY_BRACKET</code></td>
-<td class="colLast"><code>129</code></td>
+<td class="colLast"><code>135</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.COLON">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>COLON</code></td>
-<td class="colLast"><code>123</code></td>
+<td class="colLast"><code>129</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.COMMA">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>COMMA</code></td>
-<td class="colLast"><code>121</code></td>
+<td class="colLast"><code>127</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.COMMENT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>COMMENT</code></td>
-<td class="colLast"><code>30</code></td>
+<td class="colLast"><code>33</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.COMPRESS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>COMPRESS</code></td>
-<td class="colLast"><code>29</code></td>
+<td class="colLast"><code>32</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DECIMAL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DECIMAL</code></td>
-<td class="colLast"><code>90</code></td>
+<td class="colLast"><code>96</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DEFAUL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DEFAUL</code></td>
-<td class="colLast"><code>57</code></td>
+<td class="colLast"><code>63</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DEFAULT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DEFAULT</code></td>
 <td class="colLast"><code>0</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DIRECTIVE_END">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DIRECTIVE_END</code></td>
-<td class="colLast"><code>139</code></td>
+<td class="colLast"><code>145</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DIV_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DIV_EQUALS</code></td>
-<td class="colLast"><code>103</code></td>
+<td class="colLast"><code>109</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DIVIDE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DIVIDE</code></td>
-<td class="colLast"><code>116</code></td>
+<td class="colLast"><code>122</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DOLLAR_INTERPOLATION_OPENING">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOLLAR_INTERPOLATION_OPENING</code></td>
-<td class="colLast"><code>75</code></td>
+<td class="colLast"><code>81</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DOT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOT</code></td>
-<td class="colLast"><code>91</code></td>
+<td class="colLast"><code>97</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DOT_DOT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOT_DOT</code></td>
-<td class="colLast"><code>92</code></td>
+<td class="colLast"><code>98</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DOT_DOT_ASTERISK">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOT_DOT_ASTERISK</code></td>
-<td class="colLast"><code>94</code></td>
+<td class="colLast"><code>100</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DOT_DOT_LESS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOT_DOT_LESS</code></td>
-<td class="colLast"><code>93</code></td>
+<td class="colLast"><code>99</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DOUBLE_EQUALS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOUBLE_EQUALS</code></td>
-<td class="colLast"><code>98</code></td>
+<td class="colLast"><code>104</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.DOUBLE_STAR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>DOUBLE_STAR</code></td>
-<td class="colLast"><code>114</code></td>
+<td class="colLast"><code>120</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.ELLIPSIS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ELLIPSIS</code></td>
-<td class="colLast"><code>115</code></td>
+<td class="colLast"><code>121</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.ELSE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ELSE</code></td>
-<td class="colLast"><code>48</code></td>
+<td class="colLast"><code>54</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.ELSE_IF">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ELSE_IF</code></td>
 <td class="colLast"><code>9</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.EMPTY_DIRECTIVE_END">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>EMPTY_DIRECTIVE_END</code></td>
-<td class="colLast"><code>140</code></td>
+<td class="colLast"><code>146</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_ASSIGN">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_ASSIGN</code></td>
-<td class="colLast"><code>42</code></td>
+<td class="colLast"><code>45</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_ATTEMPT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_ATTEMPT</code></td>
-<td class="colLast"><code>38</code></td>
+<td class="colLast"><code>41</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_AUTOESC">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>END_AUTOESC</code></td>
+<td class="colLast"><code>49</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_COMPRESS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_COMPRESS</code></td>
-<td class="colLast"><code>45</code></td>
+<td class="colLast"><code>51</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_ESCAPE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_ESCAPE</code></td>
-<td class="colLast"><code>64</code></td>
+<td class="colLast"><code>70</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_FOREACH">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_FOREACH</code></td>
-<td class="colLast"><code>39</code></td>
+<td class="colLast"><code>42</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_FUNCTION">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_FUNCTION</code></td>
-<td class="colLast"><code>43</code></td>
+<td class="colLast"><code>46</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_GLOBAL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_GLOBAL</code></td>
-<td class="colLast"><code>41</code></td>
+<td class="colLast"><code>44</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_IF">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_IF</code></td>
-<td class="colLast"><code>33</code></td>
+<td class="colLast"><code>36</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_ITEMS">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_ITEMS</code></td>
-<td class="colLast"><code>35</code></td>
+<td class="colLast"><code>38</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_LIST">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_LIST</code></td>
-<td class="colLast"><code>34</code></td>
+<td class="colLast"><code>37</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_LOCAL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_LOCAL</code></td>
-<td class="colLast"><code>40</code></td>
+<td class="colLast"><code>43</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_MACRO">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_MACRO</code></td>
-<td class="colLast"><code>44</code></td>
+<td class="colLast"><code>47</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_NOAUTOESC">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>END_NOAUTOESC</code></td>
+<td class="colLast"><code>50</code></td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_NOESCAPE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_NOESCAPE</code></td>
-<td class="colLast"><code>66</code></td>
+<td class="colLast"><code>72</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_OUTPUTFORMAT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code>END_OUTPUTFORMAT</code></td>
+<td class="colLast"><code>48</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_RECOVER">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_RECOVER</code></td>
-<td class="colLast"><code>37</code></td>
+<td class="colLast"><code>40</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_SEP">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_SEP</code></td>
-<td class="colLast"><code>36</code></td>
+<td class="colLast"><code>39</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_SWITCH">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_SWITCH</code></td>
-<td class="colLast"><code>47</code></td>
+<td class="colLast"><code>53</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.END_TAG">
@@ -2918,7 +3226,7 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>END_TRANSFORM</code></td>
-<td class="colLast"><code>46</code></td>
+<td class="colLast"><code>52</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.EOF">
@@ -2932,56 +3240,56 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>EQUALS</code></td>
-<td class="colLast"><code>97</code></td>
+<td class="colLast"><code>103</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="freemarker.template.Template.WrongEncodingException.ESCAPE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
 <td><code>ESCAPE</code></td>
-<td class="colLast"><code>63</code></td>
+<td class="colLast"><code>69</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="free

<TRUNCATED>


[46/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/ConditionalTemplateConfigurationFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/ConditionalTemplateConfigurationFactory.html b/docs/api/freemarker/cache/ConditionalTemplateConfigurationFactory.html
new file mode 100644
index 0000000..9df8b79
--- /dev/null
+++ b/docs/api/freemarker/cache/ConditionalTemplateConfigurationFactory.html
@@ -0,0 +1,355 @@
+<!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>ConditionalTemplateConfigurationFactory (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="ConditionalTemplateConfigurationFactory (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":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/ConditionalTemplateConfigurationFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/ConditionalTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="ConditionalTemplateConfigurationFactory.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.cache</div>
+<h2 title="Class ConditionalTemplateConfigurationFactory" class="title">Class ConditionalTemplateConfigurationFactory</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/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">freemarker.cache.TemplateConfigurationFactory</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.ConditionalTemplateConfigurationFactory</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ConditionalTemplateConfigurationFactory</span>
+extends <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></pre>
+<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>
+<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/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="rowColor">
+<td class="colOne"><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>
+</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/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>
+<div class="block">Returns (maybe creates) the <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Calls <a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.cache.TemplateConfigurationFactory">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.cache.<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></h3>
+<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#getConfiguration--">getConfiguration</a>, <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#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="ConditionalTemplateConfigurationFactory-freemarker.cache.TemplateSourceMatcher-freemarker.cache.TemplateConfigurationFactory-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ConditionalTemplateConfigurationFactory</h4>
+<pre>public&nbsp;ConditionalTemplateConfigurationFactory(<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)</pre>
+</li>
+</ul>
+<a name="ConditionalTemplateConfigurationFactory-freemarker.cache.TemplateSourceMatcher-freemarker.core.TemplateConfiguration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ConditionalTemplateConfigurationFactory</h4>
+<pre>public&nbsp;ConditionalTemplateConfigurationFactory(<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)</pre>
+</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-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>get</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</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;sourceName,
+                                 <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                          throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                                 <a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">TemplateConfigurationFactory</a></code></span></div>
+<div class="block">Returns (maybe creates) the <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">get</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sourceName</code> - The name (path) that was used for <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>. See
+            <a href="../../freemarker/template/Template.html#getSourceName--"><code>Template.getSourceName()</code></a> for details.</dd>
+<dd><code>templateSource</code> - The object returned by <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for
+         this template source.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - Typically, if there factory needs further I/O to find out more about the template source, but that
+             fails.</dd>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></code> - If there's a problem that's specific to the factory logic.</dd>
+</dl>
+</li>
+</ul>
+<a name="setConfigurationOfChildren-freemarker.template.Configuration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setConfigurationOfChildren</h4>
+<pre>protected&nbsp;void&nbsp;setConfigurationOfChildren(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">TemplateConfigurationFactory</a></code></span></div>
+<div class="block">Calls <a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct
+ "children" of this object, not on the children of the children.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ConditionalTemplateConfigurationFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/ConditionalTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="ConditionalTemplateConfigurationFactory.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/FileExtensionMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/FileExtensionMatcher.html b/docs/api/freemarker/cache/FileExtensionMatcher.html
new file mode 100644
index 0000000..758bf8b
--- /dev/null
+++ b/docs/api/freemarker/cache/FileExtensionMatcher.html
@@ -0,0 +1,340 @@
+<!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>FileExtensionMatcher (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="FileExtensionMatcher (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":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/FileExtensionMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/FileExtensionMatcher.html" target="_top">Frames</a></li>
+<li><a href="FileExtensionMatcher.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.cache</div>
+<h2 title="Class FileExtensionMatcher" class="title">Class FileExtensionMatcher</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/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">freemarker.cache.TemplateSourceMatcher</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.FileExtensionMatcher</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FileExtensionMatcher</span>
+extends <a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></pre>
+<div class="block">Matches the file extension; unlike other matchers, by default case <em>insensitive</em>. A name (a path) is
+ considered to have the given extension exactly if it ends with a dot plus the extension.</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/cache/FileExtensionMatcher.html#FileExtensionMatcher-java.lang.String-">FileExtensionMatcher</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;extension)</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/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FileExtensionMatcher.html#caseInsensitive-boolean-">caseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Fluid API variation of <a href="../../freemarker/cache/FileExtensionMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FileExtensionMatcher.html#isCaseInsensitive--">isCaseInsensitive</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FileExtensionMatcher.html#matches-java.lang.String-java.lang.Object-">matches</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;sourceName,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FileExtensionMatcher.html#setCaseInsensitive-boolean-">setCaseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>true</code>.</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="FileExtensionMatcher-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FileExtensionMatcher</h4>
+<pre>public&nbsp;FileExtensionMatcher(<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;extension)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>extension</code> - The file extension (without the initial dot). Can't contain there characters:
+            <code>'/'</code>, <code>'*'</code>, <code>'?'</code>. May contains <code>'.'</code>, but can't start with it.</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="matches-java.lang.String-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>matches</h4>
+<pre>public&nbsp;boolean&nbsp;matches(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isCaseInsensitive--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isCaseInsensitive</h4>
+<pre>public&nbsp;boolean&nbsp;isCaseInsensitive()</pre>
+</li>
+</ul>
+<a name="setCaseInsensitive-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCaseInsensitive</h4>
+<pre>public&nbsp;void&nbsp;setCaseInsensitive(boolean&nbsp;caseInsensitive)</pre>
+<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>true</code>.</div>
+</li>
+</ul>
+<a name="caseInsensitive-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>caseInsensitive</h4>
+<pre>public&nbsp;<a href="../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a>&nbsp;caseInsensitive(boolean&nbsp;caseInsensitive)</pre>
+<div class="block">Fluid API variation of <a href="../../freemarker/cache/FileExtensionMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</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/FileExtensionMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/FileExtensionMatcher.html" target="_top">Frames</a></li>
+<li><a href="FileExtensionMatcher.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/FileNameGlobMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/FileNameGlobMatcher.html b/docs/api/freemarker/cache/FileNameGlobMatcher.html
new file mode 100644
index 0000000..6b38215
--- /dev/null
+++ b/docs/api/freemarker/cache/FileNameGlobMatcher.html
@@ -0,0 +1,342 @@
+<!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>FileNameGlobMatcher (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="FileNameGlobMatcher (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":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/FileNameGlobMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/FileNameGlobMatcher.html" target="_top">Frames</a></li>
+<li><a href="FileNameGlobMatcher.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.cache</div>
+<h2 title="Class FileNameGlobMatcher" class="title">Class FileNameGlobMatcher</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/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">freemarker.cache.TemplateSourceMatcher</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.FileNameGlobMatcher</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FileNameGlobMatcher</span>
+extends <a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></pre>
+<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. For example, the file name glob <code>*.ftlh</code> matches both <code>foo.ftlh</code> and
+ <code>foo/bar.ftlh</code>. With other words, that file name glob is equivalent with the <code>**</code><code>/*.ftlh</code>)
+ <em>path</em> glob ( <a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><code>PathGlobMatcher</code></a>).</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/cache/FileNameGlobMatcher.html#FileNameGlobMatcher-java.lang.String-">FileNameGlobMatcher</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;glob)</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/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FileNameGlobMatcher.html#caseInsensitive-boolean-">caseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Fluid API variation of <a href="../../freemarker/cache/FileNameGlobMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FileNameGlobMatcher.html#isCaseInsensitive--">isCaseInsensitive</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FileNameGlobMatcher.html#matches-java.lang.String-java.lang.Object-">matches</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;sourceName,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FileNameGlobMatcher.html#setCaseInsensitive-boolean-">setCaseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>false</code>.</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="FileNameGlobMatcher-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FileNameGlobMatcher</h4>
+<pre>public&nbsp;FileNameGlobMatcher(<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;glob)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>glob</code> - Glob with the syntax defined by <a href="../../freemarker/template/utility/StringUtil.html#globToRegularExpression-java.lang.String-boolean-"><code>StringUtil.globToRegularExpression(String, boolean)</code></a>. Must not
+            start with <code>/</code>.</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="matches-java.lang.String-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>matches</h4>
+<pre>public&nbsp;boolean&nbsp;matches(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isCaseInsensitive--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isCaseInsensitive</h4>
+<pre>public&nbsp;boolean&nbsp;isCaseInsensitive()</pre>
+</li>
+</ul>
+<a name="setCaseInsensitive-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCaseInsensitive</h4>
+<pre>public&nbsp;void&nbsp;setCaseInsensitive(boolean&nbsp;caseInsensitive)</pre>
+<div class="block">Sets if the matching will be case insensitive (UNICODE compliant); default is <code>false</code>.</div>
+</li>
+</ul>
+<a name="caseInsensitive-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>caseInsensitive</h4>
+<pre>public&nbsp;<a href="../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a>&nbsp;caseInsensitive(boolean&nbsp;caseInsensitive)</pre>
+<div class="block">Fluid API variation of <a href="../../freemarker/cache/FileNameGlobMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</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/FileNameGlobMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/FileNameGlobMatcher.html" target="_top">Frames</a></li>
+<li><a href="FileNameGlobMatcher.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/FileTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/FileTemplateLoader.html b/docs/api/freemarker/cache/FileTemplateLoader.html
index cba7f21..ff2d01b 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>FileTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>FileTemplateLoader (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="FileTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="FileTemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,8 +50,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/FileTemplateLoader.html" target="_top">Frames</a></li>
@@ -315,8 +315,9 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <ul class="blockList">
 <li class="blockList">
 <h4>FileTemplateLoader</h4>
-<pre>public&nbsp;FileTemplateLoader()
-                   throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<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;FileTemplateLoader()
+                                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Relying on what the current directory is is a bad practice; use
              <a href="../../freemarker/cache/FileTemplateLoader.html#FileTemplateLoader-java.io.File-"><code>FileTemplateLoader(File)</code></a> instead.</span></div>
 <div class="block">Creates a new file template cache that will use the current directory (the value of the system property
@@ -627,8 +628,8 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/FileTemplateLoader.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/FirstMatchTemplateConfigurationFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/FirstMatchTemplateConfigurationFactory.html b/docs/api/freemarker/cache/FirstMatchTemplateConfigurationFactory.html
new file mode 100644
index 0000000..d2e3f88
--- /dev/null
+++ b/docs/api/freemarker/cache/FirstMatchTemplateConfigurationFactory.html
@@ -0,0 +1,438 @@
+<!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>FirstMatchTemplateConfigurationFactory (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="FirstMatchTemplateConfigurationFactory (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+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";
+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/FirstMatchTemplateConfigurationFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/FirstMatchTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="FirstMatchTemplateConfigurationFactory.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.cache</div>
+<h2 title="Class FirstMatchTemplateConfigurationFactory" class="title">Class FirstMatchTemplateConfigurationFactory</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/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">freemarker.cache.TemplateConfigurationFactory</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.FirstMatchTemplateConfigurationFactory</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">FirstMatchTemplateConfigurationFactory</span>
+extends <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></pre>
+<div class="block">Returns the first non-<code>null</code> result of the child factories, ignoring all further child factories. The child
+ factories are called in the order as they were added.</div>
+</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/cache/FirstMatchTemplateConfigurationFactory.html#FirstMatchTemplateConfigurationFactory-freemarker.cache.TemplateConfigurationFactory...-">FirstMatchTemplateConfigurationFactory</a></span>(<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>...&nbsp;templateConfigurationFactories)</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/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#allowNoMatch-boolean-">allowNoMatch</a></span>(boolean&nbsp;allow)</code>
+<div class="block">Same as <a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-"><code>setAllowNoMatch(boolean)</code></a>, but return this object to support "fluent API" style.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>
+<div class="block">Returns (maybe creates) the <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#getAllowNoMatch--">getAllowNoMatch</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-"><code>setAllowNoMatch(boolean)</code></a>.</div>
+</td>
+</tr>
+<tr id="i3" 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/FirstMatchTemplateConfigurationFactory.html#getNoMatchErrorDetails--">getNoMatchErrorDetails</a></span>()</code>
+<div class="block">Use this to specify the text added to the exception error message when there was no matching choice.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#noMatchErrorDetails-java.lang.String-">noMatchErrorDetails</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;message)</code>
+<div class="block">Same as <a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setNoMatchErrorDetails-java.lang.String-"><code>setNoMatchErrorDetails(String)</code></a>, but return this object to support "fluent API" style.</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/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-">setAllowNoMatch</a></span>(boolean&nbsp;allowNoMatch)</code>
+<div class="block">Use this to specify if having no matching choice is an error.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Calls <a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setNoMatchErrorDetails-java.lang.String-">setNoMatchErrorDetails</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;noMatchErrorDetails)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.cache.TemplateConfigurationFactory">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.cache.<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></h3>
+<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#getConfiguration--">getConfiguration</a>, <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#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="FirstMatchTemplateConfigurationFactory-freemarker.cache.TemplateConfigurationFactory...-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>FirstMatchTemplateConfigurationFactory</h4>
+<pre>public&nbsp;FirstMatchTemplateConfigurationFactory(<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>...&nbsp;templateConfigurationFactories)</pre>
+</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-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>get</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</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;sourceName,
+                                 <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                          throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                                 <a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">TemplateConfigurationFactory</a></code></span></div>
+<div class="block">Returns (maybe creates) the <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">get</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sourceName</code> - The name (path) that was used for <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>. See
+            <a href="../../freemarker/template/Template.html#getSourceName--"><code>Template.getSourceName()</code></a> for details.</dd>
+<dd><code>templateSource</code> - The object returned by <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for
+         this template source.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - Typically, if there factory needs further I/O to find out more about the template source, but that
+             fails.</dd>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></code> - If there's a problem that's specific to the factory logic.</dd>
+</dl>
+</li>
+</ul>
+<a name="getAllowNoMatch--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAllowNoMatch</h4>
+<pre>public&nbsp;boolean&nbsp;getAllowNoMatch()</pre>
+<div class="block">Getter pair of <a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-"><code>setAllowNoMatch(boolean)</code></a>.</div>
+</li>
+</ul>
+<a name="setAllowNoMatch-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setAllowNoMatch</h4>
+<pre>public&nbsp;void&nbsp;setAllowNoMatch(boolean&nbsp;allowNoMatch)</pre>
+<div class="block">Use this to specify if having no matching choice is an error. The default is <code>false</code>, that is, it's an
+ error if there was no matching choice.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setNoMatchErrorDetails-java.lang.String-"><code>setNoMatchErrorDetails(String)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="getNoMatchErrorDetails--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNoMatchErrorDetails</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getNoMatchErrorDetails()</pre>
+<div class="block">Use this to specify the text added to the exception error message when there was no matching choice.
+ The default is <code>null</code> (no error details).</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-"><code>setAllowNoMatch(boolean)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="setNoMatchErrorDetails-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNoMatchErrorDetails</h4>
+<pre>public&nbsp;void&nbsp;setNoMatchErrorDetails(<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;noMatchErrorDetails)</pre>
+</li>
+</ul>
+<a name="allowNoMatch-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>allowNoMatch</h4>
+<pre>public&nbsp;<a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a>&nbsp;allowNoMatch(boolean&nbsp;allow)</pre>
+<div class="block">Same as <a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-"><code>setAllowNoMatch(boolean)</code></a>, but return this object to support "fluent API" style.</div>
+</li>
+</ul>
+<a name="noMatchErrorDetails-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>noMatchErrorDetails</h4>
+<pre>public&nbsp;<a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a>&nbsp;noMatchErrorDetails(<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;message)</pre>
+<div class="block">Same as <a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setNoMatchErrorDetails-java.lang.String-"><code>setNoMatchErrorDetails(String)</code></a>, but return this object to support "fluent API" style.</div>
+</li>
+</ul>
+<a name="setConfigurationOfChildren-freemarker.template.Configuration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setConfigurationOfChildren</h4>
+<pre>protected&nbsp;void&nbsp;setConfigurationOfChildren(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">TemplateConfigurationFactory</a></code></span></div>
+<div class="block">Calls <a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>TemplateConfigurationFactory.setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct
+ "children" of this object, not on the children of the children.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/FirstMatchTemplateConfigurationFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/FirstMatchTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="FirstMatchTemplateConfigurationFactory.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>



[31/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateCombinedMarkupOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateCombinedMarkupOutputModel.html b/docs/api/freemarker/core/TemplateCombinedMarkupOutputModel.html
new file mode 100644
index 0000000..b8545e5
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateCombinedMarkupOutputModel.html
@@ -0,0 +1,277 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateCombinedMarkupOutputModel (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="TemplateCombinedMarkupOutputModel (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/TemplateCombinedMarkupOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateConfiguration.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/TemplateCombinedMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateCombinedMarkupOutputModel.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>Constr&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>Constr&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 TemplateCombinedMarkupOutputModel" class="title">Class TemplateCombinedMarkupOutputModel</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/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">freemarker.core.CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateCombinedMarkupOutputModel</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">TemplateCombinedMarkupOutputModel</span>
+extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</pre>
+<div class="block">Stores combined markup to be printed; used with <a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.template.TemplateModel">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></h3>
+<code><a href="../../freemarker/template/TemplateModel.html#NOTHING">NOTHING</a></code></li>
+</ul>
+</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/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</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">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a>&nbsp;getOutputFormat()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">TemplateMarkupOutputModel</a></code></span></div>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateCombinedMarkupOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateConfiguration.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/TemplateCombinedMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateCombinedMarkupOutputModel.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>Constr&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>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateConfiguration.html b/docs/api/freemarker/core/TemplateConfiguration.html
new file mode 100644
index 0000000..0eaefb9
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateConfiguration.html
@@ -0,0 +1,907 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateConfiguration (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="TemplateConfiguration (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":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/TemplateConfiguration.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateDateFormat.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/TemplateConfiguration.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfiguration.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><a href="#nested.classes.inherited.from.class.freemarker.core.Configurable">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.freemarker.core.Configurable">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>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 TemplateConfiguration" class="title">Class TemplateConfiguration</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/Configurable.html" title="class in freemarker.core">freemarker.core.Configurable</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateConfiguration</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">TemplateConfiguration</span>
+extends <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a>
+implements <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></pre>
+<div class="block">Used for customizing the configuration settings for individual <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s (or rather groups of templates),
+ relatively to the common setting values coming from the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>. This was designed with the standard
+ template loading mechanism of FreeMarker in mind (<a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a> and <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a>
+ ), though can also be reused for custom template loading and caching solutions.
+ 
+ <p>
+ Note on the <code>locale</code> setting: When used with the standard template loading/caching mechanism (
+ <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a> and its overloads), localized lookup happens before the <code>locale</code>
+ specified here could have effect. The <code>locale</code> will be only set in the template that the localized lookup has
+ already found.
+ 
+ <p>
+ Note on the encoding setting <code>encoding</code>: See <a href="../../freemarker/core/TemplateConfiguration.html#setEncoding-java.lang.String-"><code>setEncoding(String)</code></a>.
+ 
+ <p>
+ Note that the result value of the reader methods (getter and "is" methods) is usually not useful unless the value of
+ that setting was already set on this object. Otherwise you will get the value from the parent <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>,
+ which is <a href="../../freemarker/template/Configuration.html#getDefaultConfiguration--"><code>Configuration.getDefaultConfiguration()</code></a> before this object is associated to a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.
+ 
+ <p>
+ If you are using this class for your own template loading and caching solution, rather than with the standard one,
+ you should be aware of a few more details:
+ 
+ <ul>
+ <li>This class implements both <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> and <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><code>ParserConfiguration</code></a>. This means that it can influence
+ both the template parsing phase and the runtime settings. For both aspects (i.e., <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><code>ParserConfiguration</code></a> and
+ <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a>) to take effect, you have first pass this object to the <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> constructor
+ (this is where the <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><code>ParserConfiguration</code></a> interface is used), and then you have to call <a href="../../freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-"><code>apply(Template)</code></a>
+ on the resulting <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> object (this is where the <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> aspect is used).
+ 
+ <li><a href="../../freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-"><code>apply(Template)</code></a> only change the settings that weren't yet set on the <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> (but are inherited
+ from the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>). This is primarily because if the template configures itself via the <code>#ftl</code>
+ header, those values should have precedence. A consequence of this is that if you want to configure the same
+ <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> with multiple <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>-s, you either should merge them to a single one before
+ that (with <a href="../../freemarker/core/TemplateConfiguration.html#merge-freemarker.core.TemplateConfiguration-"><code>merge(TemplateConfiguration)</code></a>), or you have to apply them in reverse order of their intended
+ precedence.
+ </ul></div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-freemarker.core.ParserConfiguration-java.lang.String-"><code>Template.Template(String, String, Reader, Configuration, ParserConfiguration, String)</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.freemarker.core.Configurable">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></h3>
+<code><a href="../../freemarker/core/Configurable.SettingValueAssignmentException.html" title="class in freemarker.core">Configurable.SettingValueAssignmentException</a>, <a href="../../freemarker/core/Configurable.UnknownSettingException.html" title="class in freemarker.core">Configurable.UnknownSettingException</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.core.Configurable">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></h3>
+<code><a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY">API_BUILTIN_ENABLED_KEY</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_CAMEL_CASE">API_BUILTIN_ENABLED_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_SNAKE_CASE">API_BUILTIN_ENABLED_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY">ARITHMETIC_ENGINE_KEY</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_CAMEL_CASE">ARITHMETIC_ENGINE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_SNAKE_CASE">ARITHMETIC_ENGINE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY">AUTO_FLUSH_KEY</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_CAMEL_CASE">AUTO_FLUSH_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_SNAKE_CASE">AUTO_FLUSH_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY">BOOLEAN_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_CAMEL_CASE">BOOLEAN_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_SNAKE_CASE">BOOLEAN_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY">CLASSIC_COMPATIBLE_KEY</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_CAMEL_CASE">CLASSIC_COMPATIBLE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_SNAKE_CASE">CLASSIC_COMPATIBLE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY">CUSTOM_DATE_FORMATS_KEY</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">CUSTOM_DATE_
 FORMATS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY">CUSTOM_NUMBER_FORMATS_KEY</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY">DATE_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_CAMEL_CASE">DATE_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_SNAKE_CASE">DATE_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY">DATETIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_CAMEL_CASE">DATETIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_SNAKE_CASE">DATETI
 ME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY">LOCALE_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_CAMEL_CASE">LOCALE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_SNAKE_CASE">LOCALE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY">LOG_TEMPLATE_EXCEPTIONS_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY">NEW_BUILTIN_CLASS_RESOLVER_KEY</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTI
 N_CLASS_RESOLVER_KEY_SNAKE_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY">NUMBER_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_CAMEL_CASE">NUMBER_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_SNAKE_CASE">NUMBER_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY">OBJECT_WRAPPER_KEY</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_CAMEL_CASE">OBJECT_WRAPPER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_SNAKE_CASE">OBJECT_WRAPPER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY">OUTPUT_ENCODING_KEY</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_CAMEL_CASE">OUTPUT_ENCODING_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_
 KEY_SNAKE_CASE">OUTPUT_ENCODING_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY">SHOW_ERROR_TIPS_KEY</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_CAMEL_CASE">SHOW_ERROR_TIPS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_SNAKE_CASE">SHOW_ERROR_TIPS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY">SQL_DATE_AND_TIME_TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS">STRICT_BEAN_MODELS</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY">STRICT_BEAN_MODELS_KEY</a>, <a href="../../freema
 rker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_CAMEL_CASE">STRICT_BEAN_MODELS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_SNAKE_CASE">STRICT_BEAN_MODELS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY">TEMPLATE_EXCEPTION_HANDLER_KEY</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY">TIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_CAMEL_CASE">TIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_SNAKE_CASE">TIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY">TIME_ZON
 E_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_CAMEL_CASE">TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_SNAKE_CASE">TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY">URL_ESCAPING_CHARSET_KEY</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_CAMEL_CASE">URL_ESCAPING_CHARSET_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_SNAKE_CASE">URL_ESCAPING_CHARSET_KEY_SNAKE_CASE</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#TemplateConfiguration--">TemplateConfiguration</a></span>()</code>
+<div class="block">Creates a new instance.</div>
+</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>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-">apply</a></span>(<a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</code>
+<div class="block">Sets the settings of the <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> which are not yet set in the <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> and are set in this
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, leaves the other settings as is.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getAutoEscapingPolicy--">getAutoEscapingPolicy</a></span>()</code>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setAutoEscapingPolicy-int-"><code>setAutoEscapingPolicy(int)</code></a>.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getEncoding--">getEncoding</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getIncompatibleImprovements--">getIncompatibleImprovements</a></span>()</code>
+<div class="block">Returns <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a> from the parent <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getNamingConvention--">getNamingConvention</a></span>()</code>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setNamingConvention-int-"><code>setNamingConvention(int)</code></a>.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>setOutputFormat(OutputFormat)</code></a>.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getParentConfiguration--">getParentConfiguration</a></span>()</code>
+<div class="block">Returns the parent <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, or <code>null</code> if none was associated yet.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getRecognizeStandardFileExtensions--">getRecognizeStandardFileExtensions</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setRecognizeStandardFileExtensions-boolean-"><code>setRecognizeStandardFileExtensions(boolean)</code></a>.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getStrictSyntaxMode--">getStrictSyntaxMode</a></span>()</code>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setStrictSyntaxMode-boolean-"><code>setStrictSyntaxMode(boolean)</code></a>.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getTagSyntax--">getTagSyntax</a></span>()</code>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setTagSyntax-int-"><code>setTagSyntax(int)</code></a>.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#getWhitespaceStripping--">getWhitespaceStripping</a></span>()</code>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#getWhitespaceStripping--"><code>getWhitespaceStripping()</code></a>.</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#isAutoEscapingPolicySet--">isAutoEscapingPolicySet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#isEncodingSet--">isEncodingSet</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#isNamingConventionSet--">isNamingConventionSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#isOutputFormatSet--">isOutputFormatSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#isRecognizeStandardFileExtensionsSet--">isRecognizeStandardFileExtensionsSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#isStrictSyntaxModeSet--">isStrictSyntaxModeSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#isTagSyntaxSet--">isTagSyntaxSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#isWhitespaceStrippingSet--">isWhitespaceStrippingSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#merge-freemarker.core.TemplateConfiguration-">merge</a></span>(<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;tc)</code>
+<div class="block">Set all settings in this <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> that were set in the parameter
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, possibly overwriting the earlier value in this object.</div>
+</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setAutoEscapingPolicy-int-">setAutoEscapingPolicy</a></span>(int&nbsp;autoEscapingPolicy)</code>
+<div class="block">Sets the output format of the template; see <a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a> for more.</div>
+</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setEncoding-java.lang.String-">setEncoding</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;encoding)</code>
+<div class="block">When the standard template loading/caching mechanism is used, this forces the charset used for reading the
+ template "file", overriding everything but the encoding coming from the <code>#ftl</code> header.</div>
+</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setNamingConvention-int-">setNamingConvention</a></span>(int&nbsp;namingConvention)</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setNamingConvention-int-"><code>Configuration.setNamingConvention(int)</code></a>.</div>
+</td>
+</tr>
+<tr id="i23" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setOutputFormat-freemarker.core.OutputFormat-">setOutputFormat</a></span>(<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&nbsp;outputFormat)</code>
+<div class="block">Sets the output format of the template; see <a href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a> for more.</div>
+</td>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-">setParentConfiguration</a></span>(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Associates this instance with a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>; usually you don't call this, as it's called internally
+ when this instance is added to a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr id="i25" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setRecognizeStandardFileExtensions-boolean-">setRecognizeStandardFileExtensions</a></span>(boolean&nbsp;recognizeStandardFileExtensions)</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setRecognizeStandardFileExtensions-boolean-"><code>Configuration.setRecognizeStandardFileExtensions(boolean)</code></a>.</div>
+</td>
+</tr>
+<tr id="i26" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setStrictBeanModels-boolean-">setStrictBeanModels</a></span>(boolean&nbsp;strict)</code>&nbsp;</td>
+</tr>
+<tr id="i27" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setStrictSyntaxMode-boolean-">setStrictSyntaxMode</a></span>(boolean&nbsp;strictSyntaxMode)</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setStrictSyntaxMode-boolean-"><code>Configuration.setStrictSyntaxMode(boolean)</code></a>.</div>
+</td>
+</tr>
+<tr id="i28" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setTagSyntax-int-">setTagSyntax</a></span>(int&nbsp;tagSyntax)</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setTagSyntax-int-"><code>Configuration.setTagSyntax(int)</code></a>.</div>
+</td>
+</tr>
+<tr id="i29" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateConfiguration.html#setWhitespaceStripping-boolean-">setWhitespaceStripping</a></span>(boolean&nbsp;whitespaceStripping)</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setWhitespaceStripping-boolean-"><code>Configuration.setWhitespaceStripping(boolean)</code></a>.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.Configurable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></h3>
+<code><a href="../../freemarker/core/Configurable.html#clone--">clone</a>, <a href="../../freemarker/core/Configurable.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes</a>, <a href="../../freemarker/core/Configurable.html#getArithmeticEngine--">getArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#getAutoFlush--">getAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#getBooleanFormat--">getBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#getClassicCompatibleAsInt--">getClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#getCorrectedNameForUnknownSetting-java.lang.String-">getCorrectedNameForUnknownSetting</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttribute-java.lang.String-">getCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttributeNames--">getCustomAttributeNames</a>, <a href="../../freemarker/core/Configurable.html#ge
 tCustomDateFormat-java.lang.String-">getCustomDateFormat</a>, <a href="../../freemarker/core/Configurable.html#getCustomDateFormats--">getCustomDateFormats</a>, <a href="../../freemarker/core/Configurable.html#getCustomNumberFormat-java.lang.String-">getCustomNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#getCustomNumberFormats--">getCustomNumberFormats</a>, <a href="../../freemarker/core/Configurable.html#getDateFormat--">getDateFormat</a>, <a href="../../freemarker/core/Configurable.html#getDateTimeFormat--">getDateTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#getEnvironment--">getEnvironment</a>, <a href="../../freemarker/core/Configurable.html#getLocale--">getLocale</a>, <a href="../../freemarker/core/Configurable.html#getLogTemplateExceptions--">getLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#getNewBuiltinClassResolver--">getNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#getNumb
 erFormat--">getNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#getObjectWrapper--">getObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#getOutputEncoding--">getOutputEncoding</a>, <a href="../../freemarker/core/Configurable.html#getParent--">getParent</a>, <a href="../../freemarker/core/Configurable.html#getSetting-java.lang.String-">getSetting</a>, <a href="../../freemarker/core/Configurable.html#getSettingNames-boolean-">getSettingNames</a>, <a href="../../freemarker/core/Configurable.html#getSettings--">getSettings</a>, <a href="../../freemarker/core/Configurable.html#getShowErrorTips--">getShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#getSQLDateAndTimeTimeZone--">getSQLDateAndTimeTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getTemplateExceptionHandler--">getTemplateExceptionHandler</a>, <a href="../../freemarker/core/Configurable.html#getTimeFormat--">getTimeFormat</a>, <a href="../../freemarker/core/Co
 nfigurable.html#getTimeZone--">getTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getURLEscapingCharset--">getURLEscapingCharset</a>, <a href="../../freemarker/core/Configurable.html#hasCustomFormats--">hasCustomFormats</a>, <a href="../../freemarker/core/Configurable.html#invalidSettingValueException-java.lang.String-java.lang.String-">invalidSettingValueException</a>, <a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabled--">isAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabledSet--">isAPIBuiltinEnabledSet</a>, <a href="../../freemarker/core/Configurable.html#isArithmeticEngineSet--">isArithmeticEngineSet</a>, <a href="../../freemarker/core/Configurable.html#isAutoFlushSet--">isAutoFlushSet</a>, <a href="../../freemarker/core/Configurable.html#isBooleanFormatSet--">isBooleanFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isClassicCompatible--">isClassicCompatible</a>, <a href="../../freemarker/cor
 e/Configurable.html#isClassicCompatibleSet--">isClassicCompatibleSet</a>, <a href="../../freemarker/core/Configurable.html#isCustomDateFormatsSet--">isCustomDateFormatsSet</a>, <a href="../../freemarker/core/Configurable.html#isCustomNumberFormatsSet--">isCustomNumberFormatsSet</a>, <a href="../../freemarker/core/Configurable.html#isDateFormatSet--">isDateFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isDateTimeFormatSet--">isDateTimeFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isLocaleSet--">isLocaleSet</a>, <a href="../../freemarker/core/Configurable.html#isLogTemplateExceptionsSet--">isLogTemplateExceptionsSet</a>, <a href="../../freemarker/core/Configurable.html#isNewBuiltinClassResolverSet--">isNewBuiltinClassResolverSet</a>, <a href="../../freemarker/core/Configurable.html#isNumberFormatSet--">isNumberFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isObjectWrapperSet--">isObjectWrapperSet</a>, <a href="../../freemarker/core/C
 onfigurable.html#isOutputEncodingSet--">isOutputEncodingSet</a>, <a href="../../freemarker/core/Configurable.html#isShowErrorTipsSet--">isShowErrorTipsSet</a>, <a href="../../freemarker/core/Configurable.html#isSQLDateAndTimeTimeZoneSet--">isSQLDateAndTimeTimeZoneSet</a>, <a href="../../freemarker/core/Configurable.html#isTemplateExceptionHandlerSet--">isTemplateExceptionHandlerSet</a>, <a href="../../freemarker/core/Configurable.html#isTimeFormatSet--">isTimeFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isTimeZoneSet--">isTimeZoneSet</a>, <a href="../../freemarker/core/Configurable.html#isURLEscapingCharsetSet--">isURLEscapingCharsetSet</a>, <a href="../../freemarker/core/Configurable.html#parseAsImportList-java.lang.String-">parseAsImportList</a>, <a href="../../freemarker/core/Configurable.html#parseAsList-java.lang.String-">parseAsList</a>, <a href="../../freemarker/core/Configurable.html#parseAsSegmentedList-java.lang.String-">parseAsSegmentedList</a>, <a href
 ="../../freemarker/core/Configurable.html#removeCustomAttribute-java.lang.String-">removeCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setAPIBuiltinEnabled-boolean-">setAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-">setArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#setAutoFlush-boolean-">setAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#setBooleanFormat-java.lang.String-">setBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#setClassicCompatible-boolean-">setClassicCompatible</a>, <a href="../../freemarker/core/Configurable.html#setClassicCompatibleAsInt-int-">setClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#setCustomAttribute-java.lang.String-java.lang.Object-">setCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-">setCustomDateFormats</a
 >, <a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-">setCustomNumberFormats</a>, <a href="../../freemarker/core/Configurable.html#setDateFormat-java.lang.String-">setDateFormat</a>, <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-">setDateTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-">setLocale</a>, <a href="../../freemarker/core/Configurable.html#setLogTemplateExceptions-boolean-">setLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#setNewBuiltinClassResolver-freemarker.core.TemplateClassResolver-">setNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-">setNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#setObjectWrapper-freemarker.template.ObjectWrapper-">setObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#setOutputEncoding-java.lang.String-
 ">setOutputEncoding</a>, <a href="../../freemarker/core/Configurable.html#setSetting-java.lang.String-java.lang.String-">setSetting</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.io.InputStream-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.util.Properties-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setShowErrorTips-boolean-">setShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#setSQLDateAndTimeTimeZone-java.util.TimeZone-">setSQLDateAndTimeTimeZone</a>, <a href="../../freemarker/core/Configurable.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-">setTemplateExceptionHandler</a>, <a href="../../freemarker/core/Configurable.html#setTimeFormat-java.lang.String-">setTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#setTimeZone-java.util.TimeZone-">setTimeZone</a>, <a href="../../freemarker/core/Configurable.html#settingValueAssignmentExcept
 ion-java.lang.String-java.lang.String-java.lang.Throwable-">settingValueAssignmentException</a>, <a href="../../freemarker/core/Configurable.html#setURLEscapingCharset-java.lang.String-">setURLEscapingCharset</a>, <a href="../../freemarker/core/Configurable.html#unknownSettingException-java.lang.String-">unknownSettingException</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#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/j
 ava/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>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.ParserConfiguration">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;freemarker.core.<a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></h3>
+<code><a href="../../freemarker/core/ParserConfiguration.html#getArithmeticEngine--">getArithmeticEngine</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="TemplateConfiguration--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateConfiguration</h4>
+<pre>public&nbsp;TemplateConfiguration()</pre>
+<div class="block">Creates a new instance. The parent will be <a href="../../freemarker/template/Configuration.html#getDefaultConfiguration--"><code>Configuration.getDefaultConfiguration()</code></a> initially, but it will
+ be changed to the real parent <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> when this object is added to the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>. (It's
+ not allowed to add the same instance to multiple <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>-s).</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="setParentConfiguration-freemarker.template.Configuration-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setParentConfiguration</h4>
+<pre>public&nbsp;void&nbsp;setParentConfiguration(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</pre>
+<div class="block">Associates this instance with a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>; usually you don't call this, as it's called internally
+ when this instance is added to a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>. This method can be called only once (except with the same
+ <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> parameter again, as that changes nothing anyway).</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true" title="class or interface in java.lang">IllegalArgumentException</a></code> - if the argument is <code>null</code> or not a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a></dd>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalStateException.html?is-external=true" title="class or interface in java.lang">IllegalStateException</a></code> - if this object is already associated to a different <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> object,
+             or if the <code>Configuration</code> has <code>#getIncompatibleImprovements()</code> less than 2.3.22 and
+             this object tries to change any non-parser settings</dd>
+</dl>
+</li>
+</ul>
+<a name="getParentConfiguration--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getParentConfiguration</h4>
+<pre>public&nbsp;<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;getParentConfiguration()</pre>
+<div class="block">Returns the parent <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, or <code>null</code> if none was associated yet.</div>
+</li>
+</ul>
+<a name="merge-freemarker.core.TemplateConfiguration-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>merge</h4>
+<pre>public&nbsp;void&nbsp;merge(<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;tc)</pre>
+<div class="block">Set all settings in this <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> that were set in the parameter
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, possibly overwriting the earlier value in this object. (A setting is said to be
+ set in a <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> if it was explicitly set via a setter method, as opposed to be inherited.)</div>
+</li>
+</ul>
+<a name="apply-freemarker.template.Template-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>apply</h4>
+<pre>public&nbsp;void&nbsp;apply(<a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template)</pre>
+<div class="block">Sets the settings of the <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> which are not yet set in the <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> and are set in this
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, leaves the other settings as is. A setting is said to be set in a
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> or <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> if it was explicitly set via a setter method on that object, as
+ opposed to be inherited from the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.
+ 
+ <p>
+ Note that the <code>encoding</code> setting of the <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> counts as unset if it's <code>null</code>,
+ even if <code>null</code> was set via <a href="../../freemarker/template/Template.html#setEncoding-java.lang.String-"><code>Template.setEncoding(String)</code></a>.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalStateException.html?is-external=true" title="class or interface in java.lang">IllegalStateException</a></code> - If the parent configuration wasn't yet set.</dd>
+</dl>
+</li>
+</ul>
+<a name="setTagSyntax-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTagSyntax</h4>
+<pre>public&nbsp;void&nbsp;setTagSyntax(int&nbsp;tagSyntax)</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setTagSyntax-int-"><code>Configuration.setTagSyntax(int)</code></a>.</div>
+</li>
+</ul>
+<a name="getTagSyntax--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTagSyntax</h4>
+<pre>public&nbsp;int&nbsp;getTagSyntax()</pre>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setTagSyntax-int-"><code>setTagSyntax(int)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/ParserConfiguration.html#getTagSyntax--">getTagSyntax</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isTagSyntaxSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isTagSyntaxSet</h4>
+<pre>public&nbsp;boolean&nbsp;isTagSyntaxSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</li>
+</ul>
+<a name="setNamingConvention-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNamingConvention</h4>
+<pre>public&nbsp;void&nbsp;setNamingConvention(int&nbsp;namingConvention)</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setNamingConvention-int-"><code>Configuration.setNamingConvention(int)</code></a>.</div>
+</li>
+</ul>
+<a name="getNamingConvention--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNamingConvention</h4>
+<pre>public&nbsp;int&nbsp;getNamingConvention()</pre>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setNamingConvention-int-"><code>setNamingConvention(int)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/ParserConfiguration.html#getNamingConvention--">getNamingConvention</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isNamingConventionSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isNamingConventionSet</h4>
+<pre>public&nbsp;boolean&nbsp;isNamingConventionSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</li>
+</ul>
+<a name="setWhitespaceStripping-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setWhitespaceStripping</h4>
+<pre>public&nbsp;void&nbsp;setWhitespaceStripping(boolean&nbsp;whitespaceStripping)</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setWhitespaceStripping-boolean-"><code>Configuration.setWhitespaceStripping(boolean)</code></a>.</div>
+</li>
+</ul>
+<a name="getWhitespaceStripping--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getWhitespaceStripping</h4>
+<pre>public&nbsp;boolean&nbsp;getWhitespaceStripping()</pre>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#getWhitespaceStripping--"><code>getWhitespaceStripping()</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/ParserConfiguration.html#getWhitespaceStripping--">getWhitespaceStripping</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isWhitespaceStrippingSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isWhitespaceStrippingSet</h4>
+<pre>public&nbsp;boolean&nbsp;isWhitespaceStrippingSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</li>
+</ul>
+<a name="setAutoEscapingPolicy-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setAutoEscapingPolicy</h4>
+<pre>public&nbsp;void&nbsp;setAutoEscapingPolicy(int&nbsp;autoEscapingPolicy)</pre>
+<div class="block">Sets the output format of the template; see <a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a> for more.</div>
+</li>
+</ul>
+<a name="getAutoEscapingPolicy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAutoEscapingPolicy</h4>
+<pre>public&nbsp;int&nbsp;getAutoEscapingPolicy()</pre>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setAutoEscapingPolicy-int-"><code>setAutoEscapingPolicy(int)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/ParserConfiguration.html#getAutoEscapingPolicy--">getAutoEscapingPolicy</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isAutoEscapingPolicySet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isAutoEscapingPolicySet</h4>
+<pre>public&nbsp;boolean&nbsp;isAutoEscapingPolicySet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</li>
+</ul>
+<a name="setOutputFormat-freemarker.core.OutputFormat-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setOutputFormat</h4>
+<pre>public&nbsp;void&nbsp;setOutputFormat(<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&nbsp;outputFormat)</pre>
+<div class="block">Sets the output format of the template; see <a href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a> for more.</div>
+</li>
+</ul>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&nbsp;getOutputFormat()</pre>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>setOutputFormat(OutputFormat)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/ParserConfiguration.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isOutputFormatSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOutputFormatSet</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputFormatSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</li>
+</ul>
+<a name="setRecognizeStandardFileExtensions-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setRecognizeStandardFileExtensions</h4>
+<pre>public&nbsp;void&nbsp;setRecognizeStandardFileExtensions(boolean&nbsp;recognizeStandardFileExtensions)</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setRecognizeStandardFileExtensions-boolean-"><code>Configuration.setRecognizeStandardFileExtensions(boolean)</code></a>.</div>
+</li>
+</ul>
+<a name="getRecognizeStandardFileExtensions--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRecognizeStandardFileExtensions</h4>
+<pre>public&nbsp;boolean&nbsp;getRecognizeStandardFileExtensions()</pre>
+<div class="block">Getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setRecognizeStandardFileExtensions-boolean-"><code>setRecognizeStandardFileExtensions(boolean)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/ParserConfiguration.html#getRecognizeStandardFileExtensions--">getRecognizeStandardFileExtensions</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isRecognizeStandardFileExtensionsSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isRecognizeStandardFileExtensionsSet</h4>
+<pre>public&nbsp;boolean&nbsp;isRecognizeStandardFileExtensionsSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</li>
+</ul>
+<a name="setStrictSyntaxMode-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setStrictSyntaxMode</h4>
+<pre>public&nbsp;void&nbsp;setStrictSyntaxMode(boolean&nbsp;strictSyntaxMode)</pre>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#setStrictSyntaxMode-boolean-"><code>Configuration.setStrictSyntaxMode(boolean)</code></a>.</div>
+</li>
+</ul>
+<a name="getStrictSyntaxMode--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getStrictSyntaxMode</h4>
+<pre>public&nbsp;boolean&nbsp;getStrictSyntaxMode()</pre>
+<div class="block">The getter pair of <a href="../../freemarker/core/TemplateConfiguration.html#setStrictSyntaxMode-boolean-"><code>setStrictSyntaxMode(boolean)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/ParserConfiguration.html#getStrictSyntaxMode--">getStrictSyntaxMode</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isStrictSyntaxModeSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isStrictSyntaxModeSet</h4>
+<pre>public&nbsp;boolean&nbsp;isStrictSyntaxModeSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</li>
+</ul>
+<a name="setStrictBeanModels-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setStrictBeanModels</h4>
+<pre>public&nbsp;void&nbsp;setStrictBeanModels(boolean&nbsp;strict)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../freemarker/core/Configurable.html#setStrictBeanModels-boolean-">setStrictBeanModels</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getEncoding--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getEncoding</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getEncoding()</pre>
+</li>
+</ul>
+<a name="setEncoding-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setEncoding</h4>
+<pre>public&nbsp;void&nbsp;setEncoding(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</pre>
+<div class="block">When the standard template loading/caching mechanism is used, this forces the charset used for reading the
+ template "file", overriding everything but the encoding coming from the <code>#ftl</code> header. This setting
+ overrides the locale-specific encodings set via <a href="../../freemarker/template/Configuration.html#setEncoding-java.util.Locale-java.lang.String-"><code>Configuration.setEncoding(java.util.Locale, String)</code></a>. It
+ also overrides the <code>encoding</code> parameter of <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.lang.String-"><code>Configuration.getTemplate(String, String)</code></a> (and of its
+ overloads) and the <code>encoding</code> parameter of the <code>#include</code> directive. This works like that because
+ specifying the encoding where you are requesting the template is error prone and deprecated.
+ 
+ <p>
+ If you are developing your own template loading/caching mechanism instead of the standard one, note that the
+ above behavior is not guaranteed by this class alone; you have to ensure it. Also, read the note on
+ <code>encoding</code> in the documentation of <a href="../../freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-"><code>apply(Template)</code></a>.</div>
+</li>
+</ul>
+<a name="isEncodingSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isEncodingSet</h4>
+<pre>public&nbsp;boolean&nbsp;isEncodingSet()</pre>
+</li>
+</ul>
+<a name="getIncompatibleImprovements--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getIncompatibleImprovements</h4>
+<pre>public&nbsp;<a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a>&nbsp;getIncompatibleImprovements()</pre>
+<div class="block">Returns <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a> from the parent <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>. This mostly
+ just exist to satisfy the <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><code>ParserConfiguration</code></a> interface.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/ParserConfiguration.html#getIncompatibleImprovements--">getIncompatibleImprovements</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalStateException.html?is-external=true" title="class or interface in java.lang">IllegalStateException</a></code> - If the parent configuration wasn't yet set.</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/TemplateConfiguration.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateDateFormat.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/TemplateConfiguration.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfiguration.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><a href="#nested.classes.inherited.from.class.freemarker.core.Configurable">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.freemarker.core.Configurable">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>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>



[12/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/Template.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/Template.html b/docs/api/freemarker/template/Template.html
index 6644142..ff95320 100644
--- a/docs/api/freemarker/template/Template.html
+++ b/docs/api/freemarker/template/Template.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>Template (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Template (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Template (FreeMarker 2.3.23 API)";
+            parent.document.title="Template (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":42,"i1":42,"i2":42,"i3":42,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":42,"i15":42,"i16":10,"i17":10,"i18":9,"i19":9,"i20":10,"i21":10,"i22":42,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":42,"i30":10};
+var methods = {"i0":42,"i1":42,"i2":42,"i3":42,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":42,"i16":42,"i17":10,"i18":10,"i19":10,"i20":10,"i21":9,"i22":9,"i23":10,"i24":10,"i25":42,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":42,"i33":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -117,20 +117,24 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public class <span class="typeNameLabel">Template</span>
 extends <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></pre>
-<div class="block"><p>Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from
- multiple threads.
+<div class="block"><p>
+ Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from multiple
+ threads.
  
- <p>Typically, you will use <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a> to create/get <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> objects, so
- you don't construct them directly. But you can also construct a template from a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a> or 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"><code>String</code></a>
- that contains the template source code. But then it's
- important to know that while the resulting <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> is efficient for later processing, creating a new
- <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> itself is relatively expensive. So try to re-use <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> objects if possible.
- <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a> does that (caching <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s) for you, but the constructor of
- course doesn't, so it's up to you to solve then.
+ <p>
+ Typically, you will use <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a> to create/get <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> objects, so you
+ don't construct them directly. But you can also construct a template from a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a> or 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"><code>String</code></a> that
+ contains the template source code. But then it's important to know that while the resulting <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> is
+ efficient for later processing, creating a new <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> itself is relatively expensive. So try to re-use
+ <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> objects if possible. <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a> (and its overloads) does that
+ (caching <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s) for you, but the constructor of course doesn't, so it's up to you to solve then.
  
- <p>Objects of this class meant to be handled as immutable and thus thread-safe. However, it has some setter methods
- for changing FreeMarker settings. Those must not be used while the template is being processed, or if the
- template object is already accessible from multiple threads.</div>
+ <p>
+ Objects of this class meant to be handled as immutable and thus thread-safe. However, it has some setter methods for
+ changing FreeMarker settings. Those must not be used while the template is being processed, or if the template object
+ is already accessible from multiple threads. If some templates need different settings that those coming from the
+ shared <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, and you are using <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-"><code>Configuration.getTemplate(String)</code></a> (or its overloads), then
+ see <a href="../../freemarker/template/Configuration.html#setTemplateConfigurations-freemarker.cache.TemplateConfigurationFactory-"><code>Configuration.setTemplateConfigurations(freemarker.cache.TemplateConfigurationFactory)</code></a>.</div>
 </li>
 </ul>
 </div>
@@ -192,7 +196,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></h3>
-<code><a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY">API_BUILTIN_ENABLED_KEY</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_CAMEL_CASE">API_BUILTIN_ENABLED_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_SNAKE_CASE">API_BUILTIN_ENABLED_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY">ARITHMETIC_ENGINE_KEY</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_CAMEL_CASE">ARITHMETIC_ENGINE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_SNAKE_CASE">ARITHMETIC_ENGINE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY">AUTO_FLUSH_KEY</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_CAMEL_CASE">AUTO_FLUSH_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_SNAKE_CASE">AUTO_FLUSH_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY">BOOLEAN_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_CAMEL_CASE">BOOLEAN_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_SNAKE_CASE">BOOLEAN_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY">CLASSIC_COMPATIBLE_KEY</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_CAMEL_CASE">CLASSIC_COMPATIBLE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_SNAKE_CASE">CLASSIC_COMPATIBLE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY">DATE_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_CAMEL_CASE">DATE_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_SNAKE_CASE">DATE_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freem
 arker/core/Configurable.html#DATETIME_FORMAT_KEY">DATETIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_CAMEL_CASE">DATETIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_SNAKE_CASE">DATETIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY">LOCALE_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_CAMEL_CASE">LOCALE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_SNAKE_CASE">LOCALE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY">LOG_TEMPLATE_EXCEPTIONS_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Confi
 gurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY">NEW_BUILTIN_CLASS_RESOLVER_KEY</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY">NUMBER_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_CAMEL_CASE">NUMBER_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_SNAKE_CASE">NUMBER_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY">OBJECT_WRAPPER_KEY</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_CAMEL_CASE">OBJECT_WRAPPER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_SNAKE_CASE">OBJECT_WRAPPER_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY">OUTPUT_ENCODING_KEY</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_CAMEL_CASE">OUTPUT_ENCODING_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_SNAKE_CASE">OUTPUT_ENCODING_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY">SHOW_ERROR_TIPS_KEY</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_CAMEL_CASE">SHOW_ERROR_TIPS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_SNAKE_CASE">SHOW_ERROR_TIPS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY">SQL_DATE_AND_TIME_TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_
 KEY_SNAKE_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS">STRICT_BEAN_MODELS</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY">STRICT_BEAN_MODELS_KEY</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_CAMEL_CASE">STRICT_BEAN_MODELS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_SNAKE_CASE">STRICT_BEAN_MODELS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY">TEMPLATE_EXCEPTION_HANDLER_KEY</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY">TIME_FORMAT_KEY</a>, <a href="..
 /../freemarker/core/Configurable.html#TIME_FORMAT_KEY_CAMEL_CASE">TIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_SNAKE_CASE">TIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY">TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_CAMEL_CASE">TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_SNAKE_CASE">TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY">URL_ESCAPING_CHARSET_KEY</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_CAMEL_CASE">URL_ESCAPING_CHARSET_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_SNAKE_CASE">URL_ESCAPING_CHARSET_KEY_SNAKE_CASE</a></code></li>
+<code><a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY">API_BUILTIN_ENABLED_KEY</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_CAMEL_CASE">API_BUILTIN_ENABLED_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_SNAKE_CASE">API_BUILTIN_ENABLED_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY">ARITHMETIC_ENGINE_KEY</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_CAMEL_CASE">ARITHMETIC_ENGINE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_SNAKE_CASE">ARITHMETIC_ENGINE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY">AUTO_FLUSH_KEY</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_CAMEL_CASE">AUTO_FLUSH_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_SNAKE_CASE">AUTO_FLUSH_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY">BOOLEAN_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_CAMEL_CASE">BOOLEAN_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_SNAKE_CASE">BOOLEAN_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY">CLASSIC_COMPATIBLE_KEY</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_CAMEL_CASE">CLASSIC_COMPATIBLE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_SNAKE_CASE">CLASSIC_COMPATIBLE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY">CUSTOM_DATE_FORMATS_KEY</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">CUSTOM_DATE_
 FORMATS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY">CUSTOM_NUMBER_FORMATS_KEY</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY">DATE_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_CAMEL_CASE">DATE_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_SNAKE_CASE">DATE_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY">DATETIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_CAMEL_CASE">DATETIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_SNAKE_CASE">DATETI
 ME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY">LOCALE_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_CAMEL_CASE">LOCALE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_SNAKE_CASE">LOCALE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY">LOG_TEMPLATE_EXCEPTIONS_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY">NEW_BUILTIN_CLASS_RESOLVER_KEY</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTI
 N_CLASS_RESOLVER_KEY_SNAKE_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY">NUMBER_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_CAMEL_CASE">NUMBER_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_SNAKE_CASE">NUMBER_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY">OBJECT_WRAPPER_KEY</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_CAMEL_CASE">OBJECT_WRAPPER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_SNAKE_CASE">OBJECT_WRAPPER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY">OUTPUT_ENCODING_KEY</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_CAMEL_CASE">OUTPUT_ENCODING_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_
 KEY_SNAKE_CASE">OUTPUT_ENCODING_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY">SHOW_ERROR_TIPS_KEY</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_CAMEL_CASE">SHOW_ERROR_TIPS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_SNAKE_CASE">SHOW_ERROR_TIPS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY">SQL_DATE_AND_TIME_TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS">STRICT_BEAN_MODELS</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY">STRICT_BEAN_MODELS_KEY</a>, <a href="../../freema
 rker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_CAMEL_CASE">STRICT_BEAN_MODELS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_SNAKE_CASE">STRICT_BEAN_MODELS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY">TEMPLATE_EXCEPTION_HANDLER_KEY</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY">TIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_CAMEL_CASE">TIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_SNAKE_CASE">TIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY">TIME_ZON
 E_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_CAMEL_CASE">TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_SNAKE_CASE">TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY">URL_ESCAPING_CHARSET_KEY</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_CAMEL_CASE">URL_ESCAPING_CHARSET_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_SNAKE_CASE">URL_ESCAPING_CHARSET_KEY_SNAKE_CASE</a></code></li>
 </ul>
 </li>
 </ul>
@@ -251,6 +255,17 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-freemarker.core.ParserConfiguration-java.lang.String-">Template</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+        <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
+        <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>&nbsp;customParserConfiguration,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
+<div class="block">Same as <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template(String, String, Reader, Configuration, String)</code></a>, but also specifies a
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-">Template</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
         <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
@@ -303,7 +318,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/javax/swing/tree/TreePath.html?is-external=true" title="class or interface in javax.swing.tree">TreePath</a></code></td>
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#containingElements-int-int-">containingElements</a></span>(int&nbsp;column,
                   int&nbsp;line)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -352,28 +367,34 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </td>
 </tr>
 <tr id="i10" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getAutoEscaping--">getAutoEscaping</a></span>()</code>
+<div class="block">Returns if the template actually uses auto-escaping (see <a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a>).</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getConfiguration--">getConfiguration</a></span>()</code>
 <div class="block">Returns the Configuration object associated with this template.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getCustomLookupCondition--">getCustomLookupCondition</a></span>()</code>
 <div class="block">Gets the custom lookup condition with which this template was found.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" 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/template/Template.html#getDefaultNS--">getDefaultNS</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
 <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/template/Template.html#getEncoding--">getEncoding</a></span>()</code>
 <div class="block">Returns the default character encoding used for reading included files.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getImports--">getImports</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -381,7 +402,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getMacros--">getMacros</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -389,18 +410,30 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i17" 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/template/Template.html#getName--">getName</a></span>()</code>
 <div class="block">The usually path-like (or URL-like) identifier of the template, or possibly <code>null</code> for non-stored
  templates.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
 <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/template/Template.html#getNamespaceForPrefix-java.lang.String-">getNamespaceForPrefix</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;prefix)</code>&nbsp;</td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the output format (see <a href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a>) used for this template.</div>
+</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getParserConfiguration--">getParserConfiguration</a></span>()</code>
+<div class="block">Returns the <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><code>ParserConfiguration</code></a> that was used for parsing this template.</div>
+</td>
+</tr>
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>static <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getPlainTextTemplate-java.lang.String-java.lang.String-freemarker.template.Configuration-">getPlainTextTemplate</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;content,
@@ -409,25 +442,25 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
  argument.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>static <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getPlainTextTemplate-java.lang.String-java.lang.String-java.lang.String-freemarker.template.Configuration-">getPlainTextTemplate</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;content,
                     <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
-<div class="block">Creates a <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
+<div class="block">Creates (not "get"-s) a <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i23" 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/template/Template.html#getPrefixedName-java.lang.String-java.lang.String-">getPrefixedName</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;localName,
                <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;nsURI)</code>&nbsp;</td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i24" class="altColor">
 <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/template/Template.html#getPrefixForNamespace-java.lang.String-">getPrefixForNamespace</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;nsURI)</code>&nbsp;</td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>freemarker.core.TemplateElement</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#getRootTreeNode--">getRootTreeNode</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -435,7 +468,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i26" class="altColor">
 <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/template/Template.html#getSource-int-int-int-int-">getSource</a></span>(int&nbsp;beginColumn,
          int&nbsp;beginLine,
@@ -444,22 +477,21 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <div class="block">Returns the template source at the location specified by the coordinates given, or <code>null</code> if unavailable.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i27" 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/template/Template.html#getSourceName--">getSourceName</a></span>()</code>
 <div class="block">The name that was actually used to load this template from the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> (or from other custom
  storage mechanism).</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-">process</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;dataModel,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
-<div class="block">Executes template, using the data-model provided, writing the generated output
- to the supplied <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
+<div class="block">Executes template, using the data-model provided, writing the generated output to the supplied <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-freemarker.template.ObjectWrapper-">process</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;dataModel,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
@@ -467,7 +499,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <div class="block">Like <a href="../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>process(Object, Writer)</code></a>, but overrides the <a href="../../freemarker/core/Configurable.html#getObjectWrapper--"><code>Configurable.getObjectWrapper()</code></a>.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-freemarker.template.ObjectWrapper-freemarker.template.TemplateNodeModel-">process</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;dataModel,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out,
@@ -476,13 +508,13 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <div class="block">Like <a href="../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>process(Object, Writer)</code></a>, but also sets a (XML-)node to be recursively processed by the template.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#setCustomLookupCondition-java.lang.Object-">setCustomLookupCondition</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;customLookupCondition)</code>
 <div class="block">Mostly only used internally; setter pair of <a href="../../freemarker/template/Template.html#getCustomLookupCondition--"><code>getCustomLookupCondition()</code></a>.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.html#setEncoding-java.lang.String-">setEncoding</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;encoding)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -490,7 +522,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i33" 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/template/Template.html#toString--">toString</a></span>()</code>
 <div class="block">Returns a string representing the raw template
@@ -503,7 +535,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></h3>
-<code><a href="../../freemarker/core/Configurable.html#clone--">clone</a>, <a href="../../freemarker/core/Configurable.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes</a>, <a href="../../freemarker/core/Configurable.html#getArithmeticEngine--">getArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#getAutoFlush--">getAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#getBooleanFormat--">getBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#getClassicCompatibleAsInt--">getClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#getCorrectedNameForUnknownSetting-java.lang.String-">getCorrectedNameForUnknownSetting</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttribute-java.lang.String-">getCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttributeNames--">getCustomAttributeNames</a>, <a href="../../freemarker/core/Configurable.html#ge
 tDateFormat--">getDateFormat</a>, <a href="../../freemarker/core/Configurable.html#getDateTimeFormat--">getDateTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#getEnvironment--">getEnvironment</a>, <a href="../../freemarker/core/Configurable.html#getLocale--">getLocale</a>, <a href="../../freemarker/core/Configurable.html#getLogTemplateExceptions--">getLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#getNewBuiltinClassResolver--">getNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#getNumberFormat--">getNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#getObjectWrapper--">getObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#getOutputEncoding--">getOutputEncoding</a>, <a href="../../freemarker/core/Configurable.html#getParent--">getParent</a>, <a href="../../freemarker/core/Configurable.html#getSetting-java.lang.String-">getSetting</a>, <a href="../../freemarker/core/Configurable
 .html#getSettings--">getSettings</a>, <a href="../../freemarker/core/Configurable.html#getShowErrorTips--">getShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#getSQLDateAndTimeTimeZone--">getSQLDateAndTimeTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getTemplateExceptionHandler--">getTemplateExceptionHandler</a>, <a href="../../freemarker/core/Configurable.html#getTimeFormat--">getTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#getTimeZone--">getTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getURLEscapingCharset--">getURLEscapingCharset</a>, <a href="../../freemarker/core/Configurable.html#invalidSettingValueException-java.lang.String-java.lang.String-">invalidSettingValueException</a>, <a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabled--">isAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#isClassicCompatible--">isClassicCompatible</a>, <a href="../../freemarker/core/Config
 urable.html#parseAsImportList-java.lang.String-">parseAsImportList</a>, <a href="../../freemarker/core/Configurable.html#parseAsList-java.lang.String-">parseAsList</a>, <a href="../../freemarker/core/Configurable.html#parseAsSegmentedList-java.lang.String-">parseAsSegmentedList</a>, <a href="../../freemarker/core/Configurable.html#removeCustomAttribute-java.lang.String-">removeCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setAPIBuiltinEnabled-boolean-">setAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-">setArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#setAutoFlush-boolean-">setAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#setBooleanFormat-java.lang.String-">setBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#setClassicCompatible-boolean-">setClassicCompatible</a>, <a href="../../freemarker/core/Configurable.html#setClassi
 cCompatibleAsInt-int-">setClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#setCustomAttribute-java.lang.String-java.lang.Object-">setCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setDateFormat-java.lang.String-">setDateFormat</a>, <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-">setDateTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-">setLocale</a>, <a href="../../freemarker/core/Configurable.html#setLogTemplateExceptions-boolean-">setLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#setNewBuiltinClassResolver-freemarker.core.TemplateClassResolver-">setNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-">setNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#setObjectWrapper-freemarker.template.ObjectWrapper-">setObjectWrapper</a>, <a href="../../freema
 rker/core/Configurable.html#setOutputEncoding-java.lang.String-">setOutputEncoding</a>, <a href="../../freemarker/core/Configurable.html#setSetting-java.lang.String-java.lang.String-">setSetting</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.io.InputStream-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.util.Properties-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setShowErrorTips-boolean-">setShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#setSQLDateAndTimeTimeZone-java.util.TimeZone-">setSQLDateAndTimeTimeZone</a>, <a href="../../freemarker/core/Configurable.html#setStrictBeanModels-boolean-">setStrictBeanModels</a>, <a href="../../freemarker/core/Configurable.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-">setTemplateExceptionHandler</a>, <a href="../../freemarker/core/Configurable.html#setTimeFormat-java.lang.String-">setTimeFormat</a>, <a href="
 ../../freemarker/core/Configurable.html#setTimeZone-java.util.TimeZone-">setTimeZone</a>, <a href="../../freemarker/core/Configurable.html#settingValueAssignmentException-java.lang.String-java.lang.String-java.lang.Throwable-">settingValueAssignmentException</a>, <a href="../../freemarker/core/Configurable.html#setURLEscapingCharset-java.lang.String-">setURLEscapingCharset</a>, <a href="../../freemarker/core/Configurable.html#unknownSettingException-java.lang.String-">unknownSettingException</a></code></li>
+<code><a href="../../freemarker/core/Configurable.html#clone--">clone</a>, <a href="../../freemarker/core/Configurable.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes</a>, <a href="../../freemarker/core/Configurable.html#getArithmeticEngine--">getArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#getAutoFlush--">getAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#getBooleanFormat--">getBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#getClassicCompatibleAsInt--">getClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#getCorrectedNameForUnknownSetting-java.lang.String-">getCorrectedNameForUnknownSetting</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttribute-java.lang.String-">getCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttributeNames--">getCustomAttributeNames</a>, <a href="../../freemarker/core/Configurable.html#ge
 tCustomDateFormat-java.lang.String-">getCustomDateFormat</a>, <a href="../../freemarker/core/Configurable.html#getCustomDateFormats--">getCustomDateFormats</a>, <a href="../../freemarker/core/Configurable.html#getCustomNumberFormat-java.lang.String-">getCustomNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#getCustomNumberFormats--">getCustomNumberFormats</a>, <a href="../../freemarker/core/Configurable.html#getDateFormat--">getDateFormat</a>, <a href="../../freemarker/core/Configurable.html#getDateTimeFormat--">getDateTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#getEnvironment--">getEnvironment</a>, <a href="../../freemarker/core/Configurable.html#getLocale--">getLocale</a>, <a href="../../freemarker/core/Configurable.html#getLogTemplateExceptions--">getLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#getNewBuiltinClassResolver--">getNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#getNumb
 erFormat--">getNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#getObjectWrapper--">getObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#getOutputEncoding--">getOutputEncoding</a>, <a href="../../freemarker/core/Configurable.html#getParent--">getParent</a>, <a href="../../freemarker/core/Configurable.html#getSetting-java.lang.String-">getSetting</a>, <a href="../../freemarker/core/Configurable.html#getSettingNames-boolean-">getSettingNames</a>, <a href="../../freemarker/core/Configurable.html#getSettings--">getSettings</a>, <a href="../../freemarker/core/Configurable.html#getShowErrorTips--">getShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#getSQLDateAndTimeTimeZone--">getSQLDateAndTimeTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getTemplateExceptionHandler--">getTemplateExceptionHandler</a>, <a href="../../freemarker/core/Configurable.html#getTimeFormat--">getTimeFormat</a>, <a href="../../freemarker/core/Co
 nfigurable.html#getTimeZone--">getTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getURLEscapingCharset--">getURLEscapingCharset</a>, <a href="../../freemarker/core/Configurable.html#hasCustomFormats--">hasCustomFormats</a>, <a href="../../freemarker/core/Configurable.html#invalidSettingValueException-java.lang.String-java.lang.String-">invalidSettingValueException</a>, <a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabled--">isAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabledSet--">isAPIBuiltinEnabledSet</a>, <a href="../../freemarker/core/Configurable.html#isArithmeticEngineSet--">isArithmeticEngineSet</a>, <a href="../../freemarker/core/Configurable.html#isAutoFlushSet--">isAutoFlushSet</a>, <a href="../../freemarker/core/Configurable.html#isBooleanFormatSet--">isBooleanFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isClassicCompatible--">isClassicCompatible</a>, <a href="../../freemarker/cor
 e/Configurable.html#isClassicCompatibleSet--">isClassicCompatibleSet</a>, <a href="../../freemarker/core/Configurable.html#isCustomDateFormatsSet--">isCustomDateFormatsSet</a>, <a href="../../freemarker/core/Configurable.html#isCustomNumberFormatsSet--">isCustomNumberFormatsSet</a>, <a href="../../freemarker/core/Configurable.html#isDateFormatSet--">isDateFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isDateTimeFormatSet--">isDateTimeFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isLocaleSet--">isLocaleSet</a>, <a href="../../freemarker/core/Configurable.html#isLogTemplateExceptionsSet--">isLogTemplateExceptionsSet</a>, <a href="../../freemarker/core/Configurable.html#isNewBuiltinClassResolverSet--">isNewBuiltinClassResolverSet</a>, <a href="../../freemarker/core/Configurable.html#isNumberFormatSet--">isNumberFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isObjectWrapperSet--">isObjectWrapperSet</a>, <a href="../../freemarker/core/C
 onfigurable.html#isOutputEncodingSet--">isOutputEncodingSet</a>, <a href="../../freemarker/core/Configurable.html#isShowErrorTipsSet--">isShowErrorTipsSet</a>, <a href="../../freemarker/core/Configurable.html#isSQLDateAndTimeTimeZoneSet--">isSQLDateAndTimeTimeZoneSet</a>, <a href="../../freemarker/core/Configurable.html#isTemplateExceptionHandlerSet--">isTemplateExceptionHandlerSet</a>, <a href="../../freemarker/core/Configurable.html#isTimeFormatSet--">isTimeFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isTimeZoneSet--">isTimeZoneSet</a>, <a href="../../freemarker/core/Configurable.html#isURLEscapingCharsetSet--">isURLEscapingCharsetSet</a>, <a href="../../freemarker/core/Configurable.html#parseAsImportList-java.lang.String-">parseAsImportList</a>, <a href="../../freemarker/core/Configurable.html#parseAsList-java.lang.String-">parseAsList</a>, <a href="../../freemarker/core/Configurable.html#parseAsSegmentedList-java.lang.String-">parseAsSegmentedList</a>, <a href
 ="../../freemarker/core/Configurable.html#removeCustomAttribute-java.lang.String-">removeCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setAPIBuiltinEnabled-boolean-">setAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-">setArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#setAutoFlush-boolean-">setAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#setBooleanFormat-java.lang.String-">setBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#setClassicCompatible-boolean-">setClassicCompatible</a>, <a href="../../freemarker/core/Configurable.html#setClassicCompatibleAsInt-int-">setClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#setCustomAttribute-java.lang.String-java.lang.Object-">setCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-">setCustomDateFormats</a
 >, <a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-">setCustomNumberFormats</a>, <a href="../../freemarker/core/Configurable.html#setDateFormat-java.lang.String-">setDateFormat</a>, <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-">setDateTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-">setLocale</a>, <a href="../../freemarker/core/Configurable.html#setLogTemplateExceptions-boolean-">setLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#setNewBuiltinClassResolver-freemarker.core.TemplateClassResolver-">setNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-">setNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#setObjectWrapper-freemarker.template.ObjectWrapper-">setObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#setOutputEncoding-java.lang.String-
 ">setOutputEncoding</a>, <a href="../../freemarker/core/Configurable.html#setSetting-java.lang.String-java.lang.String-">setSetting</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.io.InputStream-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.util.Properties-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setShowErrorTips-boolean-">setShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#setSQLDateAndTimeTimeZone-java.util.TimeZone-">setSQLDateAndTimeTimeZone</a>, <a href="../../freemarker/core/Configurable.html#setStrictBeanModels-boolean-">setStrictBeanModels</a>, <a href="../../freemarker/core/Configurable.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-">setTemplateExceptionHandler</a>, <a href="../../freemarker/core/Configurable.html#setTimeFormat-java.lang.String-">setTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#setTimeZone-java.util.T
 imeZone-">setTimeZone</a>, <a href="../../freemarker/core/Configurable.html#settingValueAssignmentException-java.lang.String-java.lang.String-java.lang.Throwable-">settingValueAssignmentException</a>, <a href="../../freemarker/core/Configurable.html#setURLEscapingCharset-java.lang.String-">setURLEscapingCharset</a>, <a href="../../freemarker/core/Configurable.html#unknownSettingException-java.lang.String-">unknownSettingException</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -602,11 +634,12 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>Template</h4>
-<pre>public&nbsp;Template(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
-                <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)
-         throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public&nbsp;Template(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+                             <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+                             <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
+                             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)
+                      throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">In most applications, use <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, Reader, Configuration)</code></a> instead, which doesn't
              specify the encoding.</span></div>
 <div class="block">Convenience constructor for <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template(name, null,
@@ -665,12 +698,13 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>Template</h4>
-<pre>public&nbsp;Template(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
-                <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)
-         throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public&nbsp;Template(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+                             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                             <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+                             <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
+                             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)
+                      throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">In most applications, use <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, String, Reader, Configuration)</code></a> instead, which
              doesn't specify the encoding.</span></div>
 <div class="block">Same as <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-"><code>Template(String, String, Reader, Configuration)</code></a>, but also specifies the template's encoding (not
@@ -691,15 +725,54 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </dl>
 </li>
 </ul>
-<a name="Template-java.lang.String-java.io.Reader-">
+<a name="Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-freemarker.core.ParserConfiguration-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>Template</h4>
 <pre>public&nbsp;Template(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
-                <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)
+                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+                <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
+                <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>&nbsp;customParserConfiguration,
+                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)
          throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Same as <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template(String, String, Reader, Configuration, String)</code></a>, but also specifies a
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>. This is mostly meant to be used by FreeMarker internally, but advanced users might
+ still find this useful.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>customParserConfiguration</code> - Overrides the parsing related configuration settings of the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> parameter; can be
+            <code>null</code>. This is useful as the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> is normally a singleton shared by all
+            templates, and so it's not good for specifying template-specific settings. (While <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>
+            itself has methods to specify settings just for that template, those don't influence the parsing, and
+            you only have opportunity to call them after the parsing anyway.) This objects is often a
+            <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> whose parent is the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> parameter, and then it
+            practically just overrides some of the parser settings, as the others are inherited from the
+            <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>. Note that if this is a <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, you will also want to
+            call <a href="../../freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-"><code>TemplateConfiguration.apply(Template)</code></a> on the resulting <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> so that
+            <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> settings will be set too, because this constructor only uses it as a
+            <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><code>ParserConfiguration</code></a>.</dd>
+<dd><code>encoding</code> - Same as in <a href="../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template(String, String, Reader, Configuration, String)</code></a>. When it's non-<code>null</code>, it overrides the value coming from the <a href="../../freemarker/core/TemplateConfiguration.html#getEncoding--"><code>TemplateConfiguration.getEncoding()</code></a> method of
+            the <code>templateConfiguration</code> parameter.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="Template-java.lang.String-java.io.Reader-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Template</h4>
+<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
+public&nbsp;Template(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+                             <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader)
+                      throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This constructor uses the "default" <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>
  instance, which can easily lead to erroneous, unpredictable behavior.
  See more <a href="../../freemarker/template/Configuration.html#getDefaultConfiguration--"><code>here...</code></a>.</span></div>
@@ -741,7 +814,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
                                             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
                                             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;content,
                                             <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</pre>
-<div class="block">Creates a <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
+<div class="block">Creates (not "get"-s) a <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> that only contains a single block of static text, no dynamic content.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>name</code> - See <a href="../../freemarker/template/Template.html#getName--"><code>getName()</code></a> for more details.</dd>
@@ -763,21 +836,22 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
                     <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
              throws <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a>,
                     <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
-<div class="block">Executes template, using the data-model provided, writing the generated output
- to the supplied <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.
+<div class="block">Executes template, using the data-model provided, writing the generated output to the supplied <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a>.
  
- <p>For finer control over the runtime environment setup, such as per-HTTP-request configuring of FreeMarker
+ <p>
+ For finer control over the runtime environment setup, such as per-HTTP-request configuring of FreeMarker
  settings, you may need to use <a href="../../freemarker/template/Template.html#createProcessingEnvironment-java.lang.Object-java.io.Writer-"><code>createProcessingEnvironment(Object, Writer)</code></a> instead.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>dataModel</code> - the holder of the variables visible from the template (name-value pairs); usually a
-     <code>Map&lt;String, Object&gt;</code> or a JavaBean (where the JavaBean properties will be the variables).
-     Can be any object that the <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> in use turns into a <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a>.
-     You can also use an object that already implements <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a>; in that case it won't be
-     wrapped. If it's <code>null</code>, an empty data model is used.</dd>
+            <code>Map&lt;String, Object&gt;</code> or a JavaBean (where the JavaBean properties will be the variables). Can
+            be any object that the <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> in use turns into a <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a>. You can
+            also use an object that already implements <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a>; in that case it won't be
+            wrapped. If it's <code>null</code>, an empty data model is used.</dd>
 <dd><code>out</code> - The <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a> where the output of the template will go. Note that unless you have used
-    <a href="../../freemarker/core/Configurable.html#setAutoFlush-boolean-"><code>Configurable.setAutoFlush(boolean)</code></a> to disable this, <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#flush--" title="class or interface in java.io"><code>Writer.flush()</code></a> will be called at the
-    when the template processing was finished. <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#close--" title="class or interface in java.io"><code>Writer.close()</code></a> is not called.</dd>
+            <a href="../../freemarker/core/Configurable.html#setAutoFlush-boolean-"><code>Configurable.setAutoFlush(boolean)</code></a> to disable this, <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#flush--" title="class or interface in java.io"><code>Writer.flush()</code></a> will be called at
+            the when the template processing was finished. <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#close--" title="class or interface in java.io"><code>Writer.close()</code></a> is not called. Can't be
+            <code>null</code>.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></code> - if an exception occurs during template processing</dd>
 <dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - if an I/O exception occurs during writing to the writer.</dd>
@@ -989,14 +1063,37 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <div class="block">Returns the Configuration object associated with this template.</div>
 </li>
 </ul>
+<a name="getParserConfiguration--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getParserConfiguration</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>&nbsp;getParserConfiguration()</pre>
+<div class="block">Returns the <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><code>ParserConfiguration</code></a> that was used for parsing this template. This is most often the same
+ object as <a href="../../freemarker/template/Template.html#getConfiguration--"><code>getConfiguration()</code></a>, but sometimes it's a <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, or something else. It's
+ never <code>null</code>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setEncoding-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setEncoding</h4>
-<pre>public&nbsp;void&nbsp;setEncoding(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</pre>
+<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;void&nbsp;setEncoding(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>encoding</code> - The encoding that was used to read this template. When this template <code>#include</code>-s or
+            <code>#import</code>-s another template, by default it will use this encoding for those. For backward
+            compatibility, this can be <code>null</code>, which will unset this setting.</dd>
+</dl>
 </li>
 </ul>
 <a name="getEncoding--">
@@ -1078,6 +1175,42 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </dl>
 </li>
 </ul>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&nbsp;getOutputFormat()</pre>
+<div class="block">Returns the output format (see <a href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a>) used for this template.
+ The output format of a template can come from various places, in order of increasing priority:
+ <a href="../../freemarker/template/Configuration.html#getOutputFormat--"><code>Configuration.getOutputFormat()</code></a>, <a href="../../freemarker/core/ParserConfiguration.html#getOutputFormat--"><code>ParserConfiguration.getOutputFormat()</code></a> (which is usually
+ provided by <a href="../../freemarker/template/Configuration.html#getTemplateConfigurations--"><code>Configuration.getTemplateConfigurations()</code></a>) and the <code>#ftl</code> header's <code>output_format</code>
+ option in the template.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="getAutoEscaping--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAutoEscaping</h4>
+<pre>public&nbsp;boolean&nbsp;getAutoEscaping()</pre>
+<div class="block">Returns if the template actually uses auto-escaping (see <a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a>). This value
+ is decided by the parser based on the actual <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>, and the auto-escaping enums, in order of
+ increasing priority: <a href="../../freemarker/template/Configuration.html#getAutoEscapingPolicy--"><code>Configuration.getAutoEscapingPolicy()</code></a>, <a href="../../freemarker/core/ParserConfiguration.html#getAutoEscapingPolicy--"><code>ParserConfiguration.getAutoEscapingPolicy()</code></a>
+ (which is usually provided by <a href="../../freemarker/template/Configuration.html#getTemplateConfigurations--"><code>Configuration.getTemplateConfigurations()</code></a>), and finally on the <code>#ftl</code>
+ header's <code>auto_esc</code> option in the template.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="dump-java.io.PrintStream-">
 <!--   -->
 </a>
@@ -1109,7 +1242,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>addMacro</h4>
-<pre>public&nbsp;void&nbsp;addMacro(freemarker.core.Macro&nbsp;macro)</pre>
+<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;void&nbsp;addMacro(freemarker.core.Macro&nbsp;macro)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
 <div class="block">Called by code internally to maintain a table of macros</div>
 </li>
@@ -1120,7 +1254,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>addImport</h4>
-<pre>public&nbsp;void&nbsp;addImport(freemarker.core.LibraryLoad&nbsp;ll)</pre>
+<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;void&nbsp;addImport(freemarker.core.LibraryLoad&nbsp;ll)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
 <div class="block">Called by code internally to maintain a list of imports</div>
 </li>
@@ -1153,7 +1288,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>getRootTreeNode</h4>
-<pre>public&nbsp;freemarker.core.TemplateElement&nbsp;getRootTreeNode()</pre>
+<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;freemarker.core.TemplateElement&nbsp;getRootTreeNode()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
 </li>
 </ul>
@@ -1163,7 +1299,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>getMacros</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;getMacros()</pre>
+<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;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;getMacros()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
 </li>
 </ul>
@@ -1173,7 +1310,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>getImports</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getImports()</pre>
+<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;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;getImports()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
 </li>
 </ul>
@@ -1183,8 +1321,9 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>addPrefixNSMapping</h4>
-<pre>public&nbsp;void&nbsp;addPrefixNSMapping(<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;prefix,
-                               <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;nsURI)</pre>
+<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;void&nbsp;addPrefixNSMapping(<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;prefix,
+                                            <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;nsURI)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
 <div class="block">This is used internally.</div>
 </li>
@@ -1246,8 +1385,9 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockListLast">
 <li class="blockList">
 <h4>containingElements</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/javax/swing/tree/TreePath.html?is-external=true" title="class or interface in javax.swing.tree">TreePath</a>&nbsp;containingElements(int&nbsp;column,
-                                   int&nbsp;line)</pre>
+<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;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;containingElements(int&nbsp;column,
+                                            int&nbsp;line)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>



[28/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateValueFormatException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateValueFormatException.html b/docs/api/freemarker/core/TemplateValueFormatException.html
new file mode 100644
index 0000000..d05ccae
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateValueFormatException.html
@@ -0,0 +1,285 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateValueFormatException (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="TemplateValueFormatException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateValueFormatException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateValueFormatFactory.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/TemplateValueFormatException.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormatException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 TemplateValueFormatException" class="title">Class TemplateValueFormatException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateValueFormatException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a>, <a href="../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core">ParsingNotSupportedException</a>, <a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a>, <a href="../../freemarker/core/UnparsableValueException.html" title="class in freemarker.core">UnparsableValueException</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateValueFormatException</span>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<div class="block">Error while getting, creating or applying <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a>-s (including its subclasses, like
+ <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>).</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.TemplateValueFormatException">Serialized Form</a></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/TemplateValueFormatException.html#TemplateValueFormatException-java.lang.String-">TemplateValueFormatException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateValueFormatException.html#TemplateValueFormatException-java.lang.String-java.lang.Throwable-">TemplateValueFormatException</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;message,
+                            <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TemplateValueFormatException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>TemplateValueFormatException</h4>
+<pre>public&nbsp;TemplateValueFormatException(<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;message,
+                                    <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="TemplateValueFormatException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateValueFormatException</h4>
+<pre>public&nbsp;TemplateValueFormatException(<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;message)</pre>
+</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/TemplateValueFormatException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateValueFormatFactory.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/TemplateValueFormatException.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormatException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateValueFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateValueFormatFactory.html b/docs/api/freemarker/core/TemplateValueFormatFactory.html
new file mode 100644
index 0000000..160f88a
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateValueFormatFactory.html
@@ -0,0 +1,247 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateValueFormatFactory (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="TemplateValueFormatFactory (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateValueFormatFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateXHTMLOutputModel.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/TemplateValueFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormatFactory.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="#methods.inherited.from.class.java.lang.Object">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>Method</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 TemplateValueFormatFactory" class="title">Class TemplateValueFormatFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateValueFormatFactory</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a>, <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateValueFormatFactory</span>
+extends <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></pre>
+<div class="block">Superclass of all format factories.</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/TemplateValueFormatFactory.html#TemplateValueFormatFactory--">TemplateValueFormatFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<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="TemplateValueFormatFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateValueFormatFactory</h4>
+<pre>public&nbsp;TemplateValueFormatFactory()</pre>
+</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/TemplateValueFormatFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateXHTMLOutputModel.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/TemplateValueFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormatFactory.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="#methods.inherited.from.class.java.lang.Object">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateXHTMLOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateXHTMLOutputModel.html b/docs/api/freemarker/core/TemplateXHTMLOutputModel.html
new file mode 100644
index 0000000..1c0193c
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateXHTMLOutputModel.html
@@ -0,0 +1,277 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateXHTMLOutputModel (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="TemplateXHTMLOutputModel (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/TemplateXHTMLOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateXMLOutputModel.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/TemplateXHTMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateXHTMLOutputModel.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>Constr&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>Constr&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 TemplateXHTMLOutputModel" class="title">Class TemplateXHTMLOutputModel</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/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">freemarker.core.CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateXHTMLOutputModel</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">TemplateXHTMLOutputModel</span>
+extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</pre>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.template.TemplateModel">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></h3>
+<code><a href="../../freemarker/template/TemplateModel.html#NOTHING">NOTHING</a></code></li>
+</ul>
+</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/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateXHTMLOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</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">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a>&nbsp;getOutputFormat()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">TemplateMarkupOutputModel</a></code></span></div>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateXHTMLOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateXMLOutputModel.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/TemplateXHTMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateXHTMLOutputModel.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>Constr&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>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateXMLOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateXMLOutputModel.html b/docs/api/freemarker/core/TemplateXMLOutputModel.html
new file mode 100644
index 0000000..11f9f49
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateXMLOutputModel.html
@@ -0,0 +1,277 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateXMLOutputModel (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="TemplateXMLOutputModel (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/TemplateXMLOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UndefinedCustomFormatException.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/TemplateXMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateXMLOutputModel.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>Constr&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>Constr&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 TemplateXMLOutputModel" class="title">Class TemplateXMLOutputModel</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/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">freemarker.core.CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateXMLOutputModel</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">TemplateXMLOutputModel</span>
+extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</pre>
+<div class="block">Stores XML markup to be printed; used with <a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.template.TemplateModel">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></h3>
+<code><a href="../../freemarker/template/TemplateModel.html#NOTHING">NOTHING</a></code></li>
+</ul>
+</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/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateXMLOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</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">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a>&nbsp;getOutputFormat()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">TemplateMarkupOutputModel</a></code></span></div>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateXMLOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UndefinedCustomFormatException.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/TemplateXMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateXMLOutputModel.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>Constr&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>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/UndefinedCustomFormatException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/UndefinedCustomFormatException.html b/docs/api/freemarker/core/UndefinedCustomFormatException.html
new file mode 100644
index 0000000..5ab71dc
--- /dev/null
+++ b/docs/api/freemarker/core/UndefinedCustomFormatException.html
@@ -0,0 +1,289 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>UndefinedCustomFormatException (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="UndefinedCustomFormatException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UndefinedCustomFormatException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UndefinedOutputFormat.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/UndefinedCustomFormatException.html" target="_top">Frames</a></li>
+<li><a href="UndefinedCustomFormatException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 UndefinedCustomFormatException" class="title">Class UndefinedCustomFormatException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">freemarker.core.InvalidFormatStringException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.UndefinedCustomFormatException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">UndefinedCustomFormatException</span>
+extends <a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a></pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.UndefinedCustomFormatException">Serialized Form</a></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/UndefinedCustomFormatException.html#UndefinedCustomFormatException-java.lang.String-">UndefinedCustomFormatException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/UndefinedCustomFormatException.html#UndefinedCustomFormatException-java.lang.String-java.lang.Throwable-">UndefinedCustomFormatException</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;message,
+                              <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UndefinedCustomFormatException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UndefinedCustomFormatException</h4>
+<pre>public&nbsp;UndefinedCustomFormatException(<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;message,
+                                      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="UndefinedCustomFormatException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UndefinedCustomFormatException</h4>
+<pre>public&nbsp;UndefinedCustomFormatException(<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;message)</pre>
+</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/UndefinedCustomFormatException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UndefinedOutputFormat.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/UndefinedCustomFormatException.html" target="_top">Frames</a></li>
+<li><a href="UndefinedCustomFormatException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>


[26/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/UnregisteredOutputFormatException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/UnregisteredOutputFormatException.html b/docs/api/freemarker/core/UnregisteredOutputFormatException.html
new file mode 100644
index 0000000..091f80a
--- /dev/null
+++ b/docs/api/freemarker/core/UnregisteredOutputFormatException.html
@@ -0,0 +1,279 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>UnregisteredOutputFormatException (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="UnregisteredOutputFormatException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UnregisteredOutputFormatException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnparsableValueException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/XHTMLOutputFormat.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/UnregisteredOutputFormatException.html" target="_top">Frames</a></li>
+<li><a href="UnregisteredOutputFormatException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 UnregisteredOutputFormatException" class="title">Class UnregisteredOutputFormatException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.UnregisteredOutputFormatException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">UnregisteredOutputFormatException</span>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.UnregisteredOutputFormatException">Serialized Form</a></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/UnregisteredOutputFormatException.html#UnregisteredOutputFormatException-java.lang.String-">UnregisteredOutputFormatException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/UnregisteredOutputFormatException.html#UnregisteredOutputFormatException-java.lang.String-java.lang.Throwable-">UnregisteredOutputFormatException</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;message,
+                                 <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UnregisteredOutputFormatException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UnregisteredOutputFormatException</h4>
+<pre>public&nbsp;UnregisteredOutputFormatException(<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;message)</pre>
+</li>
+</ul>
+<a name="UnregisteredOutputFormatException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UnregisteredOutputFormatException</h4>
+<pre>public&nbsp;UnregisteredOutputFormatException(<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;message,
+                                         <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</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/UnregisteredOutputFormatException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnparsableValueException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/XHTMLOutputFormat.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/UnregisteredOutputFormatException.html" target="_top">Frames</a></li>
+<li><a href="UnregisteredOutputFormatException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/XHTMLOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/XHTMLOutputFormat.html b/docs/api/freemarker/core/XHTMLOutputFormat.html
new file mode 100644
index 0000000..31fcd93
--- /dev/null
+++ b/docs/api/freemarker/core/XHTMLOutputFormat.html
@@ -0,0 +1,443 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>XHTMLOutputFormat (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="XHTMLOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":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/XHTMLOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/XMLOutputFormat.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/XHTMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="XHTMLOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 XHTMLOutputFormat" class="title">Class XHTMLOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.MarkupOutputFormat</a>&lt;MO&gt;</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.XHTMLOutputFormat</li>
+</ul>
+</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">XHTMLOutputFormat</span>
+extends <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</pre>
+<div class="block">Represents the XML output format (MIME type "application/xhtml+xml", name "XHTML"). This format escapes by default
+ (via <a href="../../freemarker/template/utility/StringUtil.html#XHTMLEnc-java.lang.String-"><code>StringUtil.XHTMLEnc(String)</code></a>). The <code>?xml</code> built-in silently bypasses template output values of the
+ type produced by this output format (<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateXHTMLOutputModel</code></a>).</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XHTMLOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XHTMLOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</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;plainTextContent)</code>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XHTMLOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XHTMLOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XHTMLOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</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;builtInName)</code>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>protected <a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XHTMLOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</code>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</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/core/XHTMLOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.CommonMarkupOutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></h3>
+<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isEmpty-MO-">isEmpty</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a> INSTANCE</pre>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="output-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public&nbsp;void&nbsp;output(<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;textToEsc,
+                   <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+            throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                   <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="escapePlainText-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>escapePlainText</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;escapePlainText(<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;plainTextContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="isLegacyBuiltInBypassed-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLegacyBuiltInBypassed</h4>
+<pre>public&nbsp;boolean&nbsp;isLegacyBuiltInBypassed(<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;builtInName)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is. A typical such case would be when a <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateHTMLOutputModel</code></a> of "HTML" format bypasses
+ <code>?html</code>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>newTemplateMarkupOutputModel</h4>
+<pre>protected&nbsp;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&nbsp;newTemplateMarkupOutputModel(<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;plainTextContent,
+                                                                <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;markupContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonMarkupOutputFormat</a></code></span></div>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/XHTMLOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/XMLOutputFormat.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/XHTMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="XHTMLOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/XMLOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/XMLOutputFormat.html b/docs/api/freemarker/core/XMLOutputFormat.html
new file mode 100644
index 0000000..fe15aa5
--- /dev/null
+++ b/docs/api/freemarker/core/XMLOutputFormat.html
@@ -0,0 +1,443 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>XMLOutputFormat (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="XMLOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":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/XMLOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/core/XMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="XMLOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 XMLOutputFormat" class="title">Class XMLOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.MarkupOutputFormat</a>&lt;MO&gt;</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.XMLOutputFormat</li>
+</ul>
+</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">XMLOutputFormat</span>
+extends <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</pre>
+<div class="block">Represents the XML output format (MIME type "application/xml", name "XML"). This format escapes by default (via
+ <a href="../../freemarker/template/utility/StringUtil.html#XMLEnc-java.lang.String-"><code>StringUtil.XMLEnc(String)</code></a>). The <code>?html</code>, <code>?xhtml</code> and <code>?xml</code> built-ins silently bypass
+ template output values of the type produced by this output format (<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateXHTMLOutputModel</code></a>).</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XMLOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XMLOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</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;plainTextContent)</code>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XMLOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XMLOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XMLOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</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;builtInName)</code>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>protected <a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/XMLOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</code>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</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/core/XMLOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.CommonMarkupOutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></h3>
+<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isEmpty-MO-">isEmpty</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a> INSTANCE</pre>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="output-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public&nbsp;void&nbsp;output(<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;textToEsc,
+                   <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+            throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                   <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="escapePlainText-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>escapePlainText</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;escapePlainText(<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;plainTextContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="isLegacyBuiltInBypassed-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLegacyBuiltInBypassed</h4>
+<pre>public&nbsp;boolean&nbsp;isLegacyBuiltInBypassed(<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;builtInName)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is. A typical such case would be when a <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateHTMLOutputModel</code></a> of "HTML" format bypasses
+ <code>?html</code>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>newTemplateMarkupOutputModel</h4>
+<pre>protected&nbsp;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&nbsp;newTemplateMarkupOutputModel(<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;plainTextContent,
+                                                              <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;markupContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonMarkupOutputFormat</a></code></span></div>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/XMLOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/core/XMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="XMLOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/AliasTemplateDateFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/AliasTemplateDateFormatFactory.html b/docs/api/freemarker/core/class-use/AliasTemplateDateFormatFactory.html
new file mode 100644
index 0000000..c629da0
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/AliasTemplateDateFormatFactory.html
@@ -0,0 +1,125 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.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="Uses of Class freemarker.core.AliasTemplateDateFormatFactory (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/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">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/core/class-use/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>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class freemarker.core.AliasTemplateDateFormatFactory" class="title">Uses of Class<br>freemarker.core.AliasTemplateDateFormatFactory</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.AliasTemplateDateFormatFactory</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/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">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/core/class-use/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>
+<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/core/class-use/AliasTemplateNumberFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/AliasTemplateNumberFormatFactory.html b/docs/api/freemarker/core/class-use/AliasTemplateNumberFormatFactory.html
new file mode 100644
index 0000000..eebdee3
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/AliasTemplateNumberFormatFactory.html
@@ -0,0 +1,125 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.AliasTemplateNumberFormatFactory (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.core.AliasTemplateNumberFormatFactory (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/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">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/core/class-use/AliasTemplateNumberFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="AliasTemplateNumberFormatFactory.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.core.AliasTemplateNumberFormatFactory" class="title">Uses of Class<br>freemarker.core.AliasTemplateNumberFormatFactory</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.AliasTemplateNumberFormatFactory</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/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">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/core/class-use/AliasTemplateNumberFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="AliasTemplateNumberFormatFactory.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/core/class-use/ArithmeticEngine.BigDecimalEngine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/ArithmeticEngine.BigDecimalEngine.html b/docs/api/freemarker/core/class-use/ArithmeticEngine.BigDecimalEngine.html
index dc45655..c7256ba 100644
--- a/docs/api/freemarker/core/class-use/ArithmeticEngine.BigDecimalEngine.html
+++ b/docs/api/freemarker/core/class-use/ArithmeticEngine.BigDecimalEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.ArithmeticEngine.BigDecimalEngine (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.ArithmeticEngine.BigDecimalEngine (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.core.ArithmeticEngine.BigDecimalEngine (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.ArithmeticEngine.BigDecimalEngine (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/ArithmeticEngine.ConservativeEngine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/ArithmeticEngine.ConservativeEngine.html b/docs/api/freemarker/core/class-use/ArithmeticEngine.ConservativeEngine.html
index 768ef6a..0885182 100644
--- a/docs/api/freemarker/core/class-use/ArithmeticEngine.ConservativeEngine.html
+++ b/docs/api/freemarker/core/class-use/ArithmeticEngine.ConservativeEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.ArithmeticEngine.ConservativeEngine (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.ArithmeticEngine.ConservativeEngine (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.core.ArithmeticEngine.ConservativeEngine (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.ArithmeticEngine.ConservativeEngine (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {


[39/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/CommandLine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CommandLine.html b/docs/api/freemarker/core/CommandLine.html
index 8159cad..18fd151 100644
--- a/docs/api/freemarker/core/CommandLine.html
+++ b/docs/api/freemarker/core/CommandLine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>CommandLine (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>CommandLine (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="CommandLine (FreeMarker 2.3.23 API)";
+            parent.document.title="CommandLine (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,8 +50,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.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/CommandLine.html" target="_top">Frames</a></li>
@@ -113,7 +113,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">CommandLine</span>
+<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 class <span class="typeNameLabel">CommandLine</span>
 extends <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></pre>
 <div class="block">FreeMarker command-line utility, the Main-Class of <tt>freemarker.jar</tt>.
  Currently it just prints the version number.</div>
@@ -238,8 +239,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.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/CommandLine.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/CommonMarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CommonMarkupOutputFormat.html b/docs/api/freemarker/core/CommonMarkupOutputFormat.html
new file mode 100644
index 0000000..5c0e6da
--- /dev/null
+++ b/docs/api/freemarker/core/CommonMarkupOutputFormat.html
@@ -0,0 +1,609 @@
+<!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>CommonMarkupOutputFormat (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="CommonMarkupOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":6,"i9":10,"i10":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/CommonMarkupOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/CommandLine.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.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/CommonMarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CommonMarkupOutputFormat.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 CommonMarkupOutputFormat" class="title">Class CommonMarkupOutputFormat&lt;MO extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.MarkupOutputFormat</a>&lt;MO&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.CommonMarkupOutputFormat&lt;MO&gt;</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a>, <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a>, <a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a>, <a href="../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a>, <a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">CommonMarkupOutputFormat&lt;MO extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</span>
+extends <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;MO&gt;</pre>
+<div class="block">Common superclass for implementing <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
+ subclass.</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="colFirst" scope="col">Modifier</th>
+<th class="colLast" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected </code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#CommonMarkupOutputFormat--">CommonMarkupOutputFormat</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat</a></span>(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo1,
+      <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo2)</code>
+<div class="block">Returns a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> that contains the content of both <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>
+ objects concatenated.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</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;markupText)</code>
+<div class="block">Wraps 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"><code>String</code></a> that's already markup to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> interface, to indicate its
+ format.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</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;textToEsc)</code>
+<div class="block">Converts 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"><code>String</code></a> that's assumed to be plain text to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
+ special characters in the plain text.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a></span>(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">Returns the content as markup text; never <code>null</code>.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a></span>(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">If this <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created with <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>, it returns
+ the original plain text, otherwise it returns <code>null</code>.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a></span>()</code>
+<div class="block">Tells if by default auto-escaping should be on for this format.</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/core/CommonMarkupOutputFormat.html#isEmpty-MO-">isEmpty</a></span>(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">Returns if the markup is empty (0 length).</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></span>()</code>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>protected abstract <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</code>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></span>(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Prints the parameter model to the output.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.MarkupOutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></h3>
+<code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</a>, <a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a>, <a href="../../freemarker/core/OutputFormat.html#getName--">getName</a>, <a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="CommonMarkupOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CommonMarkupOutputFormat</h4>
+<pre>protected&nbsp;CommonMarkupOutputFormat()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="fromPlainTextByEscaping-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fromPlainTextByEscaping</h4>
+<pre>public final&nbsp;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;fromPlainTextByEscaping(<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;textToEsc)
+                                 throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Converts 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"><code>String</code></a> that's assumed to be plain text to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
+ special characters in the plain text. This corresponds to <code>?esc</code>, or, to outputting with auto-escaping if
+ that wasn't using <a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-"><code>MarkupOutputFormat.output(String, Writer)</code></a> as an optimization.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-"><code>MarkupOutputFormat.escapePlainText(String)</code></a>, 
+<a href="../../freemarker/core/MarkupOutputFormat.html#getSourcePlainText-MO-"><code>MarkupOutputFormat.getSourcePlainText(TemplateMarkupOutputModel)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="fromMarkup-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fromMarkup</h4>
+<pre>public final&nbsp;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;fromMarkup(<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;markupText)
+                    throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Wraps 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"><code>String</code></a> that's already markup to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> interface, to indicate its
+ format. This corresponds to <code>?noEsc</code>. (This methods is allowed to throw <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> if
+ the parameter markup text is malformed, but it's unlikely that an implementation chooses to parse the parameter
+ until, and if ever, that becomes necessary.)</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="output-freemarker.core.CommonTemplateMarkupOutputModel-java.io.Writer-">
+<!--   -->
+</a><a name="output-MO-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public final&nbsp;void&nbsp;output(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo,
+                         <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+                  throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                         <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Prints the parameter model to the output.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="output-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public abstract&nbsp;void&nbsp;output(<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;textToEsc,
+                            <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+                     throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                            <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getSourcePlainText-freemarker.core.CommonTemplateMarkupOutputModel-">
+<!--   -->
+</a><a name="getSourcePlainText-MO-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSourcePlainText</h4>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getSourcePlainText(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)
+                                throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#getSourcePlainText-MO-">MarkupOutputFormat</a></code></span></div>
+<div class="block">If this <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created with <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a>, it returns
+ the original plain text, otherwise it returns <code>null</code>. Useful for converting between different types
+ of markups, as if the source format can be converted to plain text without loss, then that just has to be
+ re-escaped with the target format to do the conversion.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMarkupString-freemarker.core.CommonTemplateMarkupOutputModel-">
+<!--   -->
+</a><a name="getMarkupString-MO-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMarkupString</h4>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMarkupString(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)
+                             throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Returns the content as markup text; never <code>null</code>. If this <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created
+ with <a href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-"><code>MarkupOutputFormat.fromMarkup(String)</code></a>, it might returns the original markup text literally, but this is not required
+ as far as the returned markup means the same. If this <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> wasn't created
+ with <a href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-"><code>MarkupOutputFormat.fromMarkup(String)</code></a> and it doesn't yet have the markup, it has to generate the markup now.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="concat-freemarker.core.CommonTemplateMarkupOutputModel-freemarker.core.CommonTemplateMarkupOutputModel-">
+<!--   -->
+</a><a name="concat-MO-MO-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>concat</h4>
+<pre>public final&nbsp;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;concat(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo1,
+                       <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo2)
+                throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#concat-MO-MO-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Returns a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> that contains the content of both <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>
+ objects concatenated.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#concat-MO-MO-">concat</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isEmpty-freemarker.core.CommonTemplateMarkupOutputModel-">
+<!--   -->
+</a><a name="isEmpty-MO-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isEmpty</h4>
+<pre>public&nbsp;boolean&nbsp;isEmpty(<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;mo)
+                throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#isEmpty-MO-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Returns if the markup is empty (0 length). This is used by at least <code>?hasContent</code>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#isEmpty-MO-">isEmpty</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isOutputFormatMixingAllowed--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOutputFormatMixingAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputFormatMixingAllowed()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
+ if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
+ application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
+ inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
+ inserted value is made by escaping plain text and the target format is non-escaping, in which case format
+ conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
+ will be demand for that.)
+ 
+ <p>
+ <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isAutoEscapedByDefault--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isAutoEscapedByDefault</h4>
+<pre>public&nbsp;boolean&nbsp;isAutoEscapedByDefault()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#isAutoEscapedByDefault--">MarkupOutputFormat</a></code></span></div>
+<div class="block">Tells if by default auto-escaping should be on for this format. It should be <code>true</code> if you need to escape
+ on most of the places where you insert values.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>newTemplateMarkupOutputModel</h4>
+<pre>protected abstract&nbsp;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a>&nbsp;newTemplateMarkupOutputModel(<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;plainTextContent,
+                                                   <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;markupContent)
+                                            throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</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/CommonMarkupOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/CommandLine.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.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/CommonMarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CommonMarkupOutputFormat.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html b/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
new file mode 100644
index 0000000..d5f5162
--- /dev/null
+++ b/docs/api/freemarker/core/CommonTemplateMarkupOutputModel.html
@@ -0,0 +1,322 @@
+<!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>CommonTemplateMarkupOutputModel (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="CommonTemplateMarkupOutputModel (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/CommonTemplateMarkupOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/Configurable.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/CommonTemplateMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="CommonTemplateMarkupOutputModel.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 CommonTemplateMarkupOutputModel" class="title">Class CommonTemplateMarkupOutputModel&lt;MO extends CommonTemplateMarkupOutputModel&lt;MO&gt;&gt;</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.CommonTemplateMarkupOutputModel&lt;MO&gt;</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>, <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>, <a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a>, <a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>, <a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">CommonTemplateMarkupOutputModel&lt;MO extends CommonTemplateMarkupOutputModel&lt;MO&gt;&gt;</span>
+extends <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>
+implements <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;</pre>
+<div class="block">Common superclass for implementing <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
+ <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.
+ 
+ <p>
+ Thread-safe after proper publishing. Calculated fields (typically, the markup calculated from plain text) might will
+ be re-calculated for multiple times if accessed from multiple threads (this only affects performance, not
+ functionality).</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.template.TemplateModel">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></h3>
+<code><a href="../../freemarker/template/TemplateModel.html#NOTHING">NOTHING</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier</th>
+<th class="colLast" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected </code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#CommonTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonTemplateMarkupOutputModel</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;plainTextContent,
+                               <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;markupContent)</code>
+<div class="block">A least one of the parameters must be non-<code>null</code>!</div>
+</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="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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>abstract <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="type parameter in CommonTemplateMarkupOutputModel">MO</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</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="CommonTemplateMarkupOutputModel-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CommonTemplateMarkupOutputModel</h4>
+<pre>protected&nbsp;CommonTemplateMarkupOutputModel(<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;plainTextContent,
+                                          <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;markupContent)</pre>
+<div class="block">A least one of the parameters must be non-<code>null</code>!</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre>public abstract&nbsp;<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="type parameter in CommonTemplateMarkupOutputModel">MO</a>&gt;&nbsp;getOutputFormat()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">TemplateMarkupOutputModel</a></code></span></div>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="type parameter in CommonTemplateMarkupOutputModel">MO</a> extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="type parameter in CommonTemplateMarkupOutputModel">MO</a>&gt;&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CommonTemplateMarkupOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/Configurable.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/CommonTemplateMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="CommonTemplateMarkupOutputModel.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html b/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
index b5882b1..b05245f 100644
--- a/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
+++ b/docs/api/freemarker/core/Configurable.SettingValueAssignmentException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>Configurable.SettingValueAssignmentException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Configurable.SettingValueAssignmentException (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="Configurable.SettingValueAssignmentException (FreeMarker 2.3.23 API)";
+            parent.document.title="Configurable.SettingValueAssignmentException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/Configurable.UnknownSettingException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/Configurable.UnknownSettingException.html b/docs/api/freemarker/core/Configurable.UnknownSettingException.html
index 7d2e0c0..820c859 100644
--- a/docs/api/freemarker/core/Configurable.UnknownSettingException.html
+++ b/docs/api/freemarker/core/Configurable.UnknownSettingException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>Configurable.UnknownSettingException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Configurable.UnknownSettingException (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="Configurable.UnknownSettingException (FreeMarker 2.3.23 API)";
+            parent.document.title="Configurable.UnknownSettingException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -45,7 +45,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/Configurable.SettingValueAssignmentException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/CustomAttribute.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CSSOutputFormat.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/Configurable.UnknownSettingException.html" target="_top">Frames</a></li>
@@ -201,7 +201,7 @@ extends freemarker.core._MiscTemplateException</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/Configurable.SettingValueAssignmentException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/CustomAttribute.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CSSOutputFormat.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/Configurable.UnknownSettingException.html" target="_top">Frames</a></li>


[42/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/FirstMatchTemplateConfigurationFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/FirstMatchTemplateConfigurationFactory.html b/docs/api/freemarker/cache/class-use/FirstMatchTemplateConfigurationFactory.html
new file mode 100644
index 0000000..7592c8c
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/FirstMatchTemplateConfigurationFactory.html
@@ -0,0 +1,175 @@
+<!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.FirstMatchTemplateConfigurationFactory (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.FirstMatchTemplateConfigurationFactory (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/FirstMatchTemplateConfigurationFactory.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/FirstMatchTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="FirstMatchTemplateConfigurationFactory.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.FirstMatchTemplateConfigurationFactory" class="title">Uses of Class<br>freemarker.cache.FirstMatchTemplateConfigurationFactory</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/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</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/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> that return <a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FirstMatchTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#allowNoMatch-boolean-">allowNoMatch</a></span>(boolean&nbsp;allow)</code>
+<div class="block">Same as <a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-"><code>setAllowNoMatch(boolean)</code></a>, but return this object to support "fluent API" style.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FirstMatchTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#noMatchErrorDetails-java.lang.String-">noMatchErrorDetails</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;message)</code>
+<div class="block">Same as <a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setNoMatchErrorDetails-java.lang.String-"><code>setNoMatchErrorDetails(String)</code></a>, but return this object to support "fluent API" style.</div>
+</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/FirstMatchTemplateConfigurationFactory.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/FirstMatchTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="FirstMatchTemplateConfigurationFactory.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/MergingTemplateConfigurationFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/MergingTemplateConfigurationFactory.html b/docs/api/freemarker/cache/class-use/MergingTemplateConfigurationFactory.html
new file mode 100644
index 0000000..610d735
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/MergingTemplateConfigurationFactory.html
@@ -0,0 +1,125 @@
+<!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.MergingTemplateConfigurationFactory (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.MergingTemplateConfigurationFactory (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/MergingTemplateConfigurationFactory.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/MergingTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="MergingTemplateConfigurationFactory.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.MergingTemplateConfigurationFactory" class="title">Uses of Class<br>freemarker.cache.MergingTemplateConfigurationFactory</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.cache.MergingTemplateConfigurationFactory</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/MergingTemplateConfigurationFactory.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/MergingTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="MergingTemplateConfigurationFactory.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/MruCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/MruCacheStorage.html b/docs/api/freemarker/cache/class-use/MruCacheStorage.html
index 9f52d98..fa0d719 100644
--- a/docs/api/freemarker/cache/class-use/MruCacheStorage.html
+++ b/docs/api/freemarker/cache/class-use/MruCacheStorage.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.MruCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.MruCacheStorage (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.MruCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.MruCacheStorage (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/MultiTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/MultiTemplateLoader.html b/docs/api/freemarker/cache/class-use/MultiTemplateLoader.html
index 05cc10c..6048a98 100644
--- a/docs/api/freemarker/cache/class-use/MultiTemplateLoader.html
+++ b/docs/api/freemarker/cache/class-use/MultiTemplateLoader.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.MultiTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.MultiTemplateLoader (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.MultiTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.MultiTemplateLoader (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/NotMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/NotMatcher.html b/docs/api/freemarker/cache/class-use/NotMatcher.html
new file mode 100644
index 0000000..c71fcbf
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/NotMatcher.html
@@ -0,0 +1,125 @@
+<!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.NotMatcher (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.NotMatcher (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/NotMatcher.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/NotMatcher.html" target="_top">Frames</a></li>
+<li><a href="NotMatcher.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.NotMatcher" class="title">Uses of Class<br>freemarker.cache.NotMatcher</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.cache.NotMatcher</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/NotMatcher.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/NotMatcher.html" target="_top">Frames</a></li>
+<li><a href="NotMatcher.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/NullCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/NullCacheStorage.html b/docs/api/freemarker/cache/class-use/NullCacheStorage.html
index 3bbdf5e..302a1dd 100644
--- a/docs/api/freemarker/cache/class-use/NullCacheStorage.html
+++ b/docs/api/freemarker/cache/class-use/NullCacheStorage.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.NullCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.NullCacheStorage (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.NullCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.NullCacheStorage (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/OrMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/OrMatcher.html b/docs/api/freemarker/cache/class-use/OrMatcher.html
new file mode 100644
index 0000000..babdc77
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/OrMatcher.html
@@ -0,0 +1,125 @@
+<!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.OrMatcher (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.OrMatcher (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/OrMatcher.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/OrMatcher.html" target="_top">Frames</a></li>
+<li><a href="OrMatcher.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.OrMatcher" class="title">Uses of Class<br>freemarker.cache.OrMatcher</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.cache.OrMatcher</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/OrMatcher.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/OrMatcher.html" target="_top">Frames</a></li>
+<li><a href="OrMatcher.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/PathGlobMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/PathGlobMatcher.html b/docs/api/freemarker/cache/class-use/PathGlobMatcher.html
new file mode 100644
index 0000000..5906991
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/PathGlobMatcher.html
@@ -0,0 +1,169 @@
+<!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.PathGlobMatcher (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.PathGlobMatcher (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/PathGlobMatcher.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/PathGlobMatcher.html" target="_top">Frames</a></li>
+<li><a href="PathGlobMatcher.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.PathGlobMatcher" class="title">Uses of Class<br>freemarker.cache.PathGlobMatcher</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/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</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/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> that return <a href="../../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></code></td>
+<td class="colLast"><span class="typeNameLabel">PathGlobMatcher.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/PathGlobMatcher.html#caseInsensitive-boolean-">caseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Fluid API variation of <a href="../../../freemarker/cache/PathGlobMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</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/PathGlobMatcher.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/PathGlobMatcher.html" target="_top">Frames</a></li>
+<li><a href="PathGlobMatcher.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/PathRegexMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/PathRegexMatcher.html b/docs/api/freemarker/cache/class-use/PathRegexMatcher.html
new file mode 100644
index 0000000..23d5158
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/PathRegexMatcher.html
@@ -0,0 +1,125 @@
+<!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.PathRegexMatcher (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.PathRegexMatcher (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/PathRegexMatcher.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/PathRegexMatcher.html" target="_top">Frames</a></li>
+<li><a href="PathRegexMatcher.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.PathRegexMatcher" class="title">Uses of Class<br>freemarker.cache.PathRegexMatcher</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.cache.PathRegexMatcher</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/PathRegexMatcher.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/PathRegexMatcher.html" target="_top">Frames</a></li>
+<li><a href="PathRegexMatcher.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/SoftCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/SoftCacheStorage.html b/docs/api/freemarker/cache/class-use/SoftCacheStorage.html
index 141a4ac..b295498 100644
--- a/docs/api/freemarker/cache/class-use/SoftCacheStorage.html
+++ b/docs/api/freemarker/cache/class-use/SoftCacheStorage.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.SoftCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.SoftCacheStorage (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.SoftCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.SoftCacheStorage (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/StatefulTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/StatefulTemplateLoader.html b/docs/api/freemarker/cache/class-use/StatefulTemplateLoader.html
index 6f18f7c..39cd329 100644
--- a/docs/api/freemarker/cache/class-use/StatefulTemplateLoader.html
+++ b/docs/api/freemarker/cache/class-use/StatefulTemplateLoader.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 Interface freemarker.cache.StatefulTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.cache.StatefulTemplateLoader (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.cache.StatefulTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.cache.StatefulTemplateLoader (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/StringTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/StringTemplateLoader.html b/docs/api/freemarker/cache/class-use/StringTemplateLoader.html
index 7f9bf37..4ad67a5 100644
--- a/docs/api/freemarker/cache/class-use/StringTemplateLoader.html
+++ b/docs/api/freemarker/cache/class-use/StringTemplateLoader.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.StringTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.StringTemplateLoader (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.StringTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.StringTemplateLoader (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/StrongCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/StrongCacheStorage.html b/docs/api/freemarker/cache/class-use/StrongCacheStorage.html
index 5e42a4b..0dba30b 100644
--- a/docs/api/freemarker/cache/class-use/StrongCacheStorage.html
+++ b/docs/api/freemarker/cache/class-use/StrongCacheStorage.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.StrongCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.StrongCacheStorage (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.StrongCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.StrongCacheStorage (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/TemplateCache.MaybeMissingTemplate.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateCache.MaybeMissingTemplate.html b/docs/api/freemarker/cache/class-use/TemplateCache.MaybeMissingTemplate.html
index 19fa19a..aa8aace 100644
--- a/docs/api/freemarker/cache/class-use/TemplateCache.MaybeMissingTemplate.html
+++ b/docs/api/freemarker/cache/class-use/TemplateCache.MaybeMissingTemplate.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.TemplateCache.MaybeMissingTemplate (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.TemplateCache.MaybeMissingTemplate (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.TemplateCache.MaybeMissingTemplate (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.TemplateCache.MaybeMissingTemplate (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/TemplateCache.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateCache.html b/docs/api/freemarker/cache/class-use/TemplateCache.html
index 41fe202..95f74ba 100644
--- a/docs/api/freemarker/cache/class-use/TemplateCache.html
+++ b/docs/api/freemarker/cache/class-use/TemplateCache.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.TemplateCache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.TemplateCache (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.TemplateCache (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.TemplateCache (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/TemplateConfigurationFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateConfigurationFactory.html b/docs/api/freemarker/cache/class-use/TemplateConfigurationFactory.html
new file mode 100644
index 0000000..94d22d0
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/TemplateConfigurationFactory.html
@@ -0,0 +1,265 @@
+<!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.TemplateConfigurationFactory (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.TemplateConfigurationFactory (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/TemplateConfigurationFactory.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/TemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfigurationFactory.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.TemplateConfigurationFactory" class="title">Uses of Class<br>freemarker.cache.TemplateConfigurationFactory</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/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</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>
+<tr class="rowColor">
+<td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
+<td class="colLast">
+<div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
+start with <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> (see also the
+<a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</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/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</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/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</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/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache">ConditionalTemplateConfigurationFactory</a></span></code>
+<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="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></span></code>
+<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"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache">MergingTemplateConfigurationFactory</a></span></code>
+<div class="block">Returns the merged results of all the child factories.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> that return <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateCache.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#getTemplateConfigurations--">getTemplateConfigurations</a></span>()</code>&nbsp;</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/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</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/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/FirstMatchTemplateConfigurationFactory.html#FirstMatchTemplateConfigurationFactory-freemarker.cache.TemplateConfigurationFactory...-">FirstMatchTemplateConfigurationFactory</a></span>(<a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>...&nbsp;templateConfigurationFactories)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/MergingTemplateConfigurationFactory.html#MergingTemplateConfigurationFactory-freemarker.cache.TemplateConfigurationFactory...-">MergingTemplateConfigurationFactory</a></span>(<a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>...&nbsp;templateConfigurationFactories)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.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>
+</table>
+</li>
+<li class="blockList"><a name="freemarker.template">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that return <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#getTemplateConfigurations--">getTemplateConfigurations</a></span>()</code>
+<div class="block">The getter pair of <a href="../../../freemarker/template/Configuration.html#setTemplateConfigurations-freemarker.cache.TemplateConfigurationFactory-"><code>Configuration.setTemplateConfigurations(TemplateConfigurationFactory)</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> with parameters of type <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#setTemplateConfigurations-freemarker.cache.TemplateConfigurationFactory-">setTemplateConfigurations</a></span>(<a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>&nbsp;templateConfigurations)</code>
+<div class="block">Sets a <a href="../../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> that will configure individual templates where their settings differ
+ from those coming from the common <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> object.</div>
+</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/TemplateConfigurationFactory.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/TemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfigurationFactory.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/TemplateConfigurationFactoryException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateConfigurationFactoryException.html b/docs/api/freemarker/cache/class-use/TemplateConfigurationFactoryException.html
new file mode 100644
index 0000000..7989673
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/TemplateConfigurationFactoryException.html
@@ -0,0 +1,185 @@
+<!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.TemplateConfigurationFactoryException (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.TemplateConfigurationFactoryException (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/TemplateConfigurationFactoryException.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/TemplateConfigurationFactoryException.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfigurationFactoryException.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.TemplateConfigurationFactoryException" class="title">Uses of Class<br>freemarker.cache.TemplateConfigurationFactoryException</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/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</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/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> that throw <a href="../../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>
+<div class="block">Returns (maybe creates) the <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MergingTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/MergingTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FirstMatchTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ConditionalTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/ConditionalTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</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/TemplateConfigurationFactoryException.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/TemplateConfigurationFactoryException.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfigurationFactoryException.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/TemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateLoader.html b/docs/api/freemarker/cache/class-use/TemplateLoader.html
index 47fe88c..5312347 100644
--- a/docs/api/freemarker/cache/class-use/TemplateLoader.html
+++ b/docs/api/freemarker/cache/class-use/TemplateLoader.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 Interface freemarker.cache.TemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.cache.TemplateLoader (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.cache.TemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.cache.TemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -124,7 +124,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>interface&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache">StatefulTemplateLoader</a></span></code>
-<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>
@@ -139,37 +139,43 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></span></code>
+<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="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache">ClassTemplateLoader</a></span></code>
 <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">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></span></code>
 <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="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a></span></code>
 <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">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/StringTemplateLoader.html" title="class in freemarker.cache">StringTemplateLoader</a></span></code>
-<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="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache">URLTemplateLoader</a></span></code>
 <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"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache">WebappTemplateLoader</a></span></code>
 <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
@@ -245,9 +251,21 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
              <a href="../../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
              <a href="../../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
              <a href="../../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
-             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
+             <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
+<div class="block">Same as
+ <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, TemplateLookupStrategy, TemplateNameFormat,
+ TemplateConfigurationFactory, Configuration)</code></a> with <code>null</code> for <code>templateConfigurations</code>-s.</div>
+</td>
 </tr>
 <tr class="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>
+<tr class="altColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
              <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
 <div class="block">Same as <a href="../../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> with a new <a href="../../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache"><code>SoftCacheStorage</code></a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/TemplateLookupContext.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/TemplateLookupContext.html b/docs/api/freemarker/cache/class-use/TemplateLookupContext.html
index a28e753..165c79f 100644
--- a/docs/api/freemarker/cache/class-use/TemplateLookupContext.html
+++ b/docs/api/freemarker/cache/class-use/TemplateLookupContext.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.TemplateLookupContext (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.TemplateLookupContext (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.TemplateLookupContext (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.TemplateLookupContext (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {



[20/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/UnformattableValueException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/UnformattableValueException.html b/docs/api/freemarker/core/class-use/UnformattableValueException.html
new file mode 100644
index 0000000..bfa102b
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/UnformattableValueException.html
@@ -0,0 +1,192 @@
+<!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.core.UnformattableValueException (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.core.UnformattableValueException (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/core/UnformattableValueException.html" title="class in freemarker.core">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/core/class-use/UnformattableValueException.html" target="_top">Frames</a></li>
+<li><a href="UnformattableValueException.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.core.UnformattableValueException" class="title">Uses of Class<br>freemarker.core.UnformattableValueException</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/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeFormattingUnsupportedException</a></span></code>
+<div class="block">Thrown when a <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> can't be formatted because its type is <a href="../../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeParsingUnsupportedException</a></span></code>
+<div class="block">Thrown when a string can't be parsed to <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, because the provided target type is
+ <a href="../../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that throw <a href="../../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#getNonNullNumber-freemarker.template.TemplateNumberModel-">getNonNullNumber</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a> from an <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a>, and throws
+ <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</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/core/UnformattableValueException.html" title="class in freemarker.core">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/core/class-use/UnformattableValueException.html" target="_top">Frames</a></li>
+<li><a href="UnformattableValueException.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/core/class-use/UnknownDateTypeFormattingUnsupportedException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/UnknownDateTypeFormattingUnsupportedException.html b/docs/api/freemarker/core/class-use/UnknownDateTypeFormattingUnsupportedException.html
new file mode 100644
index 0000000..8196b65
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/UnknownDateTypeFormattingUnsupportedException.html
@@ -0,0 +1,125 @@
+<!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.core.UnknownDateTypeFormattingUnsupportedException (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.core.UnknownDateTypeFormattingUnsupportedException (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/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core">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/core/class-use/UnknownDateTypeFormattingUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="UnknownDateTypeFormattingUnsupportedException.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.core.UnknownDateTypeFormattingUnsupportedException" class="title">Uses of Class<br>freemarker.core.UnknownDateTypeFormattingUnsupportedException</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.UnknownDateTypeFormattingUnsupportedException</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/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core">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/core/class-use/UnknownDateTypeFormattingUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="UnknownDateTypeFormattingUnsupportedException.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/core/class-use/UnknownDateTypeParsingUnsupportedException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/UnknownDateTypeParsingUnsupportedException.html b/docs/api/freemarker/core/class-use/UnknownDateTypeParsingUnsupportedException.html
new file mode 100644
index 0000000..f740b40
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/UnknownDateTypeParsingUnsupportedException.html
@@ -0,0 +1,125 @@
+<!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.core.UnknownDateTypeParsingUnsupportedException (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.core.UnknownDateTypeParsingUnsupportedException (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/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core">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/core/class-use/UnknownDateTypeParsingUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="UnknownDateTypeParsingUnsupportedException.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.core.UnknownDateTypeParsingUnsupportedException" class="title">Uses of Class<br>freemarker.core.UnknownDateTypeParsingUnsupportedException</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.UnknownDateTypeParsingUnsupportedException</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/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core">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/core/class-use/UnknownDateTypeParsingUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="UnknownDateTypeParsingUnsupportedException.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/core/class-use/UnparsableValueException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/UnparsableValueException.html b/docs/api/freemarker/core/class-use/UnparsableValueException.html
new file mode 100644
index 0000000..b4f6abf
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/UnparsableValueException.html
@@ -0,0 +1,125 @@
+<!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.core.UnparsableValueException (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.core.UnparsableValueException (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/core/UnparsableValueException.html" title="class in freemarker.core">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/core/class-use/UnparsableValueException.html" target="_top">Frames</a></li>
+<li><a href="UnparsableValueException.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.core.UnparsableValueException" class="title">Uses of Class<br>freemarker.core.UnparsableValueException</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.UnparsableValueException</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/core/UnparsableValueException.html" title="class in freemarker.core">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/core/class-use/UnparsableValueException.html" target="_top">Frames</a></li>
+<li><a href="UnparsableValueException.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/core/class-use/UnregisteredOutputFormatException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/UnregisteredOutputFormatException.html b/docs/api/freemarker/core/class-use/UnregisteredOutputFormatException.html
new file mode 100644
index 0000000..821c9a0
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/UnregisteredOutputFormatException.html
@@ -0,0 +1,171 @@
+<!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.core.UnregisteredOutputFormatException (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.core.UnregisteredOutputFormatException (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/core/UnregisteredOutputFormatException.html" title="class in freemarker.core">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/core/class-use/UnregisteredOutputFormatException.html" target="_top">Frames</a></li>
+<li><a href="UnregisteredOutputFormatException.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.core.UnregisteredOutputFormatException" class="title">Uses of Class<br>freemarker.core.UnregisteredOutputFormatException</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/core/UnregisteredOutputFormatException.html" title="class in freemarker.core">UnregisteredOutputFormatException</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.template">freemarker.template</a></td>
+<td class="colLast">
+<div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
+start with <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> (see also the
+<a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.template">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core">UnregisteredOutputFormatException</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that throw <a href="../../../freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core">UnregisteredOutputFormatException</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#getOutputFormat-java.lang.String-">getOutputFormat</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">Returns the output format for a name.</div>
+</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/core/UnregisteredOutputFormatException.html" title="class in freemarker.core">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/core/class-use/UnregisteredOutputFormatException.html" target="_top">Frames</a></li>
+<li><a href="UnregisteredOutputFormatException.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/core/class-use/XHTMLOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/XHTMLOutputFormat.html b/docs/api/freemarker/core/class-use/XHTMLOutputFormat.html
new file mode 100644
index 0000000..d2b486d
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/XHTMLOutputFormat.html
@@ -0,0 +1,182 @@
+<!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.core.XHTMLOutputFormat (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.core.XHTMLOutputFormat (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/core/XHTMLOutputFormat.html" title="class in freemarker.core">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/core/class-use/XHTMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="XHTMLOutputFormat.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.core.XHTMLOutputFormat" class="title">Uses of Class<br>freemarker.core.XHTMLOutputFormat</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/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">XHTMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/XHTMLOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateXHTMLOutputModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXHTMLOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</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/core/XHTMLOutputFormat.html" title="class in freemarker.core">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/core/class-use/XHTMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="XHTMLOutputFormat.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/core/class-use/XMLOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/XMLOutputFormat.html b/docs/api/freemarker/core/class-use/XMLOutputFormat.html
new file mode 100644
index 0000000..fd94b5f
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/XMLOutputFormat.html
@@ -0,0 +1,182 @@
+<!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.core.XMLOutputFormat (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.core.XMLOutputFormat (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/core/XMLOutputFormat.html" title="class in freemarker.core">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/core/class-use/XMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="XMLOutputFormat.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.core.XMLOutputFormat" class="title">Uses of Class<br>freemarker.core.XMLOutputFormat</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/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">XMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/XMLOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateXMLOutputModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXMLOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</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/core/XMLOutputFormat.html" title="class in freemarker.core">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/core/class-use/XMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="XMLOutputFormat.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/core/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/package-frame.html b/docs/api/freemarker/core/package-frame.html
index d36f95e..3b6f7ea 100644
--- a/docs/api/freemarker/core/package-frame.html
+++ b/docs/api/freemarker/core/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.core (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.core (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>
@@ -15,19 +15,50 @@
 <h2 title="Interfaces">Interfaces</h2>
 <ul title="Interfaces">
 <li><a href="DirectiveCallPlace.html" title="interface in freemarker.core" target="classFrame"><span class="interfaceName">DirectiveCallPlace</span></a></li>
+<li><a href="ParserConfiguration.html" title="interface in freemarker.core" target="classFrame"><span class="interfaceName">ParserConfiguration</span></a></li>
 <li><a href="TemplateClassResolver.html" title="interface in freemarker.core" target="classFrame"><span class="interfaceName">TemplateClassResolver</span></a></li>
+<li><a href="TemplateMarkupOutputModel.html" title="interface in freemarker.core" target="classFrame"><span class="interfaceName">TemplateMarkupOutputModel</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
+<li><a href="AliasTemplateDateFormatFactory.html" title="class in freemarker.core" target="classFrame">AliasTemplateDateFormatFactory</a></li>
+<li><a href="AliasTemplateNumberFormatFactory.html" title="class in freemarker.core" target="classFrame">AliasTemplateNumberFormatFactory</a></li>
 <li><a href="ArithmeticEngine.html" title="class in freemarker.core" target="classFrame">ArithmeticEngine</a></li>
 <li><a href="ArithmeticEngine.BigDecimalEngine.html" title="class in freemarker.core" target="classFrame">ArithmeticEngine.BigDecimalEngine</a></li>
 <li><a href="ArithmeticEngine.ConservativeEngine.html" title="class in freemarker.core" target="classFrame">ArithmeticEngine.ConservativeEngine</a></li>
+<li><a href="CombinedMarkupOutputFormat.html" title="class in freemarker.core" target="classFrame">CombinedMarkupOutputFormat</a></li>
 <li><a href="CommandLine.html" title="class in freemarker.core" target="classFrame">CommandLine</a></li>
+<li><a href="CommonMarkupOutputFormat.html" title="class in freemarker.core" target="classFrame">CommonMarkupOutputFormat</a></li>
+<li><a href="CommonTemplateMarkupOutputModel.html" title="class in freemarker.core" target="classFrame">CommonTemplateMarkupOutputModel</a></li>
 <li><a href="Configurable.html" title="class in freemarker.core" target="classFrame">Configurable</a></li>
+<li><a href="CSSOutputFormat.html" title="class in freemarker.core" target="classFrame">CSSOutputFormat</a></li>
 <li><a href="CustomAttribute.html" title="class in freemarker.core" target="classFrame">CustomAttribute</a></li>
 <li><a href="Environment.html" title="class in freemarker.core" target="classFrame">Environment</a></li>
 <li><a href="FreeMarkerTree.html" title="class in freemarker.core" target="classFrame">FreeMarkerTree</a></li>
+<li><a href="HTMLOutputFormat.html" title="class in freemarker.core" target="classFrame">HTMLOutputFormat</a></li>
+<li><a href="JavaScriptOutputFormat.html" title="class in freemarker.core" target="classFrame">JavaScriptOutputFormat</a></li>
+<li><a href="JSONOutputFormat.html" title="class in freemarker.core" target="classFrame">JSONOutputFormat</a></li>
+<li><a href="MarkupOutputFormat.html" title="class in freemarker.core" target="classFrame">MarkupOutputFormat</a></li>
 <li><a href="OptInTemplateClassResolver.html" title="class in freemarker.core" target="classFrame">OptInTemplateClassResolver</a></li>
+<li><a href="OutputFormat.html" title="class in freemarker.core" target="classFrame">OutputFormat</a></li>
+<li><a href="PlainTextOutputFormat.html" title="class in freemarker.core" target="classFrame">PlainTextOutputFormat</a></li>
+<li><a href="RTFOutputFormat.html" title="class in freemarker.core" target="classFrame">RTFOutputFormat</a></li>
+<li><a href="TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateCombinedMarkupOutputModel</a></li>
+<li><a href="TemplateConfiguration.html" title="class in freemarker.core" target="classFrame">TemplateConfiguration</a></li>
+<li><a href="TemplateDateFormat.html" title="class in freemarker.core" target="classFrame">TemplateDateFormat</a></li>
+<li><a href="TemplateDateFormatFactory.html" title="class in freemarker.core" target="classFrame">TemplateDateFormatFactory</a></li>
+<li><a href="TemplateFormatUtil.html" title="class in freemarker.core" target="classFrame">TemplateFormatUtil</a></li>
+<li><a href="TemplateHTMLOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateHTMLOutputModel</a></li>
+<li><a href="TemplateNumberFormat.html" title="class in freemarker.core" target="classFrame">TemplateNumberFormat</a></li>
+<li><a href="TemplateNumberFormatFactory.html" title="class in freemarker.core" target="classFrame">TemplateNumberFormatFactory</a></li>
+<li><a href="TemplateRTFOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateRTFOutputModel</a></li>
+<li><a href="TemplateValueFormat.html" title="class in freemarker.core" target="classFrame">TemplateValueFormat</a></li>
+<li><a href="TemplateValueFormatFactory.html" title="class in freemarker.core" target="classFrame">TemplateValueFormatFactory</a></li>
+<li><a href="TemplateXHTMLOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateXHTMLOutputModel</a></li>
+<li><a href="TemplateXMLOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateXMLOutputModel</a></li>
+<li><a href="UndefinedOutputFormat.html" title="class in freemarker.core" target="classFrame">UndefinedOutputFormat</a></li>
+<li><a href="XHTMLOutputFormat.html" title="class in freemarker.core" target="classFrame">XHTMLOutputFormat</a></li>
+<li><a href="XMLOutputFormat.html" title="class in freemarker.core" target="classFrame">XMLOutputFormat</a></li>
 </ul>
 <h2 title="Exceptions">Exceptions</h2>
 <ul title="Exceptions">
@@ -35,20 +66,32 @@
 <li><a href="CallPlaceCustomDataInitializationException.html" title="class in freemarker.core" target="classFrame">CallPlaceCustomDataInitializationException</a></li>
 <li><a href="Configurable.SettingValueAssignmentException.html" title="class in freemarker.core" target="classFrame">Configurable.SettingValueAssignmentException</a></li>
 <li><a href="Configurable.UnknownSettingException.html" title="class in freemarker.core" target="classFrame">Configurable.UnknownSettingException</a></li>
+<li><a href="InvalidFormatParametersException.html" title="class in freemarker.core" target="classFrame">InvalidFormatParametersException</a></li>
+<li><a href="InvalidFormatStringException.html" title="class in freemarker.core" target="classFrame">InvalidFormatStringException</a></li>
 <li><a href="InvalidReferenceException.html" title="class in freemarker.core" target="classFrame">InvalidReferenceException</a></li>
 <li><a href="NonBooleanException.html" title="class in freemarker.core" target="classFrame">NonBooleanException</a></li>
 <li><a href="NonDateException.html" title="class in freemarker.core" target="classFrame">NonDateException</a></li>
 <li><a href="NonExtendedHashException.html" title="class in freemarker.core" target="classFrame">NonExtendedHashException</a></li>
 <li><a href="NonHashException.html" title="class in freemarker.core" target="classFrame">NonHashException</a></li>
+<li><a href="NonMarkupOutputException.html" title="class in freemarker.core" target="classFrame">NonMarkupOutputException</a></li>
 <li><a href="NonMethodException.html" title="class in freemarker.core" target="classFrame">NonMethodException</a></li>
 <li><a href="NonNodeException.html" title="class in freemarker.core" target="classFrame">NonNodeException</a></li>
 <li><a href="NonNumericalException.html" title="class in freemarker.core" target="classFrame">NonNumericalException</a></li>
 <li><a href="NonSequenceException.html" title="class in freemarker.core" target="classFrame">NonSequenceException</a></li>
 <li><a href="NonSequenceOrCollectionException.html" title="class in freemarker.core" target="classFrame">NonSequenceOrCollectionException</a></li>
 <li><a href="NonStringException.html" title="class in freemarker.core" target="classFrame">NonStringException</a></li>
+<li><a href="NonStringOrTemplateOutputException.html" title="class in freemarker.core" target="classFrame">NonStringOrTemplateOutputException</a></li>
 <li><a href="ParseException.html" title="class in freemarker.core" target="classFrame">ParseException</a></li>
+<li><a href="ParsingNotSupportedException.html" title="class in freemarker.core" target="classFrame">ParsingNotSupportedException</a></li>
 <li><a href="StopException.html" title="class in freemarker.core" target="classFrame">StopException</a></li>
+<li><a href="TemplateValueFormatException.html" title="class in freemarker.core" target="classFrame">TemplateValueFormatException</a></li>
+<li><a href="UndefinedCustomFormatException.html" title="class in freemarker.core" target="classFrame">UndefinedCustomFormatException</a></li>
 <li><a href="UnexpectedTypeException.html" title="class in freemarker.core" target="classFrame">UnexpectedTypeException</a></li>
+<li><a href="UnformattableValueException.html" title="class in freemarker.core" target="classFrame">UnformattableValueException</a></li>
+<li><a href="UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core" target="classFrame">UnknownDateTypeFormattingUnsupportedException</a></li>
+<li><a href="UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core" target="classFrame">UnknownDateTypeParsingUnsupportedException</a></li>
+<li><a href="UnparsableValueException.html" title="class in freemarker.core" target="classFrame">UnparsableValueException</a></li>
+<li><a href="UnregisteredOutputFormatException.html" title="class in freemarker.core" target="classFrame">UnregisteredOutputFormatException</a></li>
 </ul>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/package-summary.html b/docs/api/freemarker/core/package-summary.html
index 27c8ba9..173b39b 100644
--- a/docs/api/freemarker/core/package-summary.html
+++ b/docs/api/freemarker/core/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.core (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.core (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.core (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.core (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -95,12 +95,25 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></td>
+<td class="colLast">
+<div class="block"><b>Don't implement this interface yourself</b>; use the existing implementation(s).</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core">TemplateClassResolver</a></td>
 <td class="colLast">
 <div class="block">Used by built-ins and other template language features that get a class
  based on a string.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO extends <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</td>
+<td class="colLast">
+<div class="block">"markup output" template language data-type; stores markup (some kind of "rich text" / structured format, as opposed
+ to plain text) that meant to be printed as template output.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -113,6 +126,20 @@
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">AliasTemplateDateFormatFactory</a></td>
+<td class="colLast">
+<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>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">AliasTemplateNumberFormatFactory</a></td>
+<td class="colLast">
+<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>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/core/ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></td>
 <td class="colLast">
 <div class="block">Class to perform arithmetic operations.</div>
@@ -132,18 +159,44 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents two markup formats nested into each other.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/core/CommandLine.html" title="class in freemarker.core">CommandLine</a></td>
 <td class="colLast">Deprecated
 <div class="block"><span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;MO extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</td>
+<td class="colLast">
+<div class="block">Common superclass for implementing <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
+ subclass.</div>
+</td>
+</tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</td>
+<td class="colLast">
+<div class="block">Common superclass for implementing <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
+ <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></td>
 <td class="colLast">
 <div class="block">This is a common superclass of <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>,
  <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>, and <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> classes.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the CSS output format (MIME type "text/css", name "CSS").</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/core/CustomAttribute.html" title="class in freemarker.core">CustomAttribute</a></td>
 <td class="colLast">
@@ -164,12 +217,152 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the HTML output format (MIME type "text/html", name "HTML").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the JSON output format (MIME type "application/json", name "JSON").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;MO extends <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</td>
+<td class="colLast">
+<div class="block">Superclass of <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>-s that represent a "markup" format, which is any format where certain character
+ sequences have special meaning and thus may need escaping.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core">OptInTemplateClassResolver</a></td>
 <td class="colLast">
 <div class="block">A <a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> that resolves only the classes whose name 
  was specified in the constructor.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents an output format.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the plain text output format (MIME type "text/plain", name "plainText").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></td>
+<td class="colLast">
+<div class="block">Stores combined markup to be printed; used with <a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></td>
+<td class="colLast">
+<div class="block">Used for customizing the configuration settings for individual <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s (or rather groups of templates),
+ relatively to the common setting values coming from the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></td>
+<td class="colLast">
+<div class="block">Represents a date/time/dateTime format; used in templates for formatting and parsing with that format.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></td>
+<td class="colLast">
+<div class="block">Factory for a certain kind of date/time/dateTime formatting (<a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>).</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateFormatUtil.html" title="class in freemarker.core">TemplateFormatUtil</a></td>
+<td class="colLast">
+<div class="block">Utility classes for implementing <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a>-s.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></td>
+<td class="colLast">
+<div class="block">Stores HTML markup to be printed; used with <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></td>
+<td class="colLast">
+<div class="block">Represents a number format; used in templates for formatting and parsing with that format.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></td>
+<td class="colLast">
+<div class="block">Factory for a certain kind of number formatting (<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>).</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></td>
+<td class="colLast">
+<div class="block">Stores RTF markup to be printed; used with <a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><code>RTFOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></td>
+<td class="colLast">
+<div class="block">Superclass of all value format objects; objects that convert values to strings, or parse strings.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</a></td>
+<td class="colLast">
+<div class="block">Superclass of all format factories.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></td>
+<td class="colLast">
+<div class="block">Stores HTML markup to be printed; used with <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></td>
+<td class="colLast">
+<div class="block">Stores XML markup to be printed; used with <a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the output format used when the template output format is undecided.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the XML output format (MIME type "application/xhtml+xml", name "XHTML").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></td>
+<td class="colLast">
+<div class="block">Represents the XML output format (MIME type "application/xml", name "XML").</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -207,6 +400,20 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></td>
+<td class="colLast">
+<div class="block">Used when creating <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the parameters
+ part of the format string (like some kind of pattern) is malformed.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a></td>
+<td class="colLast">
+<div class="block">Used when creating <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the format
+ string (like the value of the <code>dateFormat</code> setting) is malformed.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/core/InvalidReferenceException.html" title="class in freemarker.core">InvalidReferenceException</a></td>
 <td class="colLast">
 <div class="block">A subclass of <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template"><code>TemplateException</code></a> that says that an FTL expression has evaluated to <code>null</code> or it refers
@@ -238,43 +445,56 @@
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">NonMarkupOutputException</a></td>
+<td class="colLast">
+<div class="block">Indicates that a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a></td>
 <td class="colLast">
 <div class="block">Indicates that a <a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><code>TemplateMethodModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a></td>
 <td class="colLast">
 <div class="block">Indicates that a <a href="../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template"><code>TemplateNodeModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a></td>
 <td class="colLast">
 <div class="block">Indicates that a <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/core/NonSequenceException.html" title="class in freemarker.core">NonSequenceException</a></td>
 <td class="colLast">
 <div class="block">Indicates that a <a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a></td>
 <td class="colLast">
 <div class="block">Indicates that a <a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> or <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a> value was expected, but the value
  had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a></td>
 <td class="colLast">
 <div class="block">Indicates that a <a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> value was expected (or maybe something that can be automatically coerced
  to that), but the value had a different type.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">NonStringOrTemplateOutputException</a></td>
+<td class="colLast">
+<div class="block">Indicates that a <a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> (or maybe something that can be automatically coerced
+ to that) or <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/core/ParseException.html" title="class in freemarker.core">ParseException</a></td>
 <td class="colLast">
@@ -282,17 +502,65 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core">ParsingNotSupportedException</a></td>
+<td class="colLast">
+<div class="block">Thrown when the <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> doesn't support parsing, and parsing was invoked.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/core/StopException.html" title="class in freemarker.core">StopException</a></td>
 <td class="colLast">
 <div class="block">This exception is thrown when a <tt>#stop</tt> directive is encountered.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></td>
+<td class="colLast">
+<div class="block">Error while getting, creating or applying <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a>-s (including its subclasses, like
+ <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>).</div>
+</td>
+</tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core">UndefinedCustomFormatException</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">UnexpectedTypeException</a></td>
 <td class="colLast">
 <div class="block">The type of a value differs from what was expected.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a></td>
+<td class="colLast">
+<div class="block">Thrown when a <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> can't be formatted because of the value/properties of it are outside of that the
+ <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> supports.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeFormattingUnsupportedException</a></td>
+<td class="colLast">
+<div class="block">Thrown when a <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> can't be formatted because its type is <a href="../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeParsingUnsupportedException</a></td>
+<td class="colLast">
+<div class="block">Thrown when a string can't be parsed to <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, because the provided target type is
+ <a href="../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../freemarker/core/UnparsableValueException.html" title="class in freemarker.core">UnparsableValueException</a></td>
+<td class="colLast">
+<div class="block">Thrown when the content of the string that should be parsed by the <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> doesn't match what the
+ format expects.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core">UnregisteredOutputFormatException</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>


[49/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/allclasses-noframe.html
----------------------------------------------------------------------
diff --git a/docs/api/allclasses-noframe.html b/docs/api/allclasses-noframe.html
index de60285..c27ee1b 100644
--- a/docs/api/allclasses-noframe.html
+++ b/docs/api/allclasses-noframe.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>All Classes (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>All Classes (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>
@@ -14,7 +14,10 @@
 <div class="indexContainer">
 <ul>
 <li><a href="freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template"><span class="interfaceName">AdapterTemplateModel</span></a></li>
+<li><a href="freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">AliasTemplateDateFormatFactory</a></li>
+<li><a href="freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">AliasTemplateNumberFormatFactory</a></li>
 <li><a href="freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet">AllHttpScopesHashModel</a></li>
+<li><a href="freemarker/cache/AndMatcher.html" title="class in freemarker.cache">AndMatcher</a></li>
 <li><a href="freemarker/core/ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></li>
 <li><a href="freemarker/core/ArithmeticEngine.BigDecimalEngine.html" title="class in freemarker.core">ArithmeticEngine.BigDecimalEngine</a></li>
 <li><a href="freemarker/core/ArithmeticEngine.ConservativeEngine.html" title="class in freemarker.core">ArithmeticEngine.ConservativeEngine</a></li>
@@ -29,6 +32,7 @@
 <li><a href="freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans">BooleanModel</a></li>
 <li><a href="freemarker/debug/Breakpoint.html" title="class in freemarker.debug">Breakpoint</a></li>
 <li><a href="freemarker/core/BugException.html" title="class in freemarker.core">BugException</a></li>
+<li><a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></li>
 <li><a href="freemarker/cache/CacheStorage.html" title="interface in freemarker.cache"><span class="interfaceName">CacheStorage</span></a></li>
 <li><a href="freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache"><span class="interfaceName">CacheStorageWithGetSize</span></a></li>
 <li><a href="freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core">CallPlaceCustomDataInitializationException</a></li>
@@ -38,13 +42,18 @@
 <li><a href="freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a></li>
 <li><a href="freemarker/template/utility/Collections12.html" title="class in freemarker.template.utility">Collections12</a></li>
 <li><a href="freemarker/template/utility/CollectionUtils.html" title="class in freemarker.template.utility">CollectionUtils</a></li>
+<li><a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></li>
 <li><a href="freemarker/core/CommandLine.html" title="class in freemarker.core">CommandLine</a></li>
+<li><a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></li>
+<li><a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a></li>
 <li><a href="freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache"><span class="interfaceName">ConcurrentCacheStorage</span></a></li>
+<li><a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache">ConditionalTemplateConfigurationFactory</a></li>
 <li><a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></li>
 <li><a href="freemarker/core/Configurable.SettingValueAssignmentException.html" title="class in freemarker.core">Configurable.SettingValueAssignmentException</a></li>
 <li><a href="freemarker/core/Configurable.UnknownSettingException.html" title="class in freemarker.core">Configurable.UnknownSettingException</a></li>
 <li><a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></li>
 <li><a href="freemarker/template/utility/Constants.html" title="class in freemarker.template.utility">Constants</a></li>
+<li><a href="freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></li>
 <li><a href="freemarker/core/CustomAttribute.html" title="class in freemarker.core">CustomAttribute</a></li>
 <li><a href="freemarker/ext/beans/DateModel.html" title="class in freemarker.ext.beans">DateModel</a></li>
 <li><a href="freemarker/template/utility/DateUtil.html" title="class in freemarker.template.utility">DateUtil</a></li>
@@ -74,21 +83,29 @@
 <li><a href="freemarker/debug/EnvironmentSuspendedEvent.html" title="class in freemarker.debug">EnvironmentSuspendedEvent</a></li>
 <li><a href="freemarker/ext/jsp/EventForwarding.html" title="class in freemarker.ext.jsp">EventForwarding</a></li>
 <li><a href="freemarker/template/utility/Execute.html" title="class in freemarker.template.utility">Execute</a></li>
+<li><a href="freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></li>
+<li><a href="freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></li>
 <li><a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></li>
+<li><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></li>
 <li><a href="freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet">FreemarkerServlet</a></li>
 <li><a href="freemarker/ext/jsp/FreemarkerTag.html" title="class in freemarker.ext.jsp">FreemarkerTag</a></li>
 <li><a href="freemarker/core/FreeMarkerTree.html" title="class in freemarker.core">FreeMarkerTree</a></li>
 <li><a href="freemarker/ext/ant/FreemarkerXmlTask.html" title="class in freemarker.ext.ant">FreemarkerXmlTask</a></li>
 <li><a href="freemarker/ext/beans/HashAdapter.html" title="class in freemarker.ext.beans">HashAdapter</a></li>
 <li><a href="freemarker/template/utility/HtmlEscape.html" title="class in freemarker.template.utility">HtmlEscape</a></li>
+<li><a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></li>
 <li><a href="freemarker/ext/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.servlet">HttpRequestHashModel</a></li>
 <li><a href="freemarker/ext/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.servlet">HttpRequestParametersHashModel</a></li>
 <li><a href="freemarker/ext/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.servlet">HttpSessionHashModel</a></li>
 <li><a href="freemarker/ext/util/IdentityHashMap.html" title="class in freemarker.ext.util">IdentityHashMap</a></li>
 <li><a href="freemarker/ext/servlet/IncludePage.html" title="class in freemarker.ext.servlet">IncludePage</a></li>
+<li><a href="freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></li>
+<li><a href="freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a></li>
 <li><a href="freemarker/ext/beans/InvalidPropertyException.html" title="class in freemarker.ext.beans">InvalidPropertyException</a></li>
 <li><a href="freemarker/core/InvalidReferenceException.html" title="class in freemarker.core">InvalidReferenceException</a></li>
 <li><a href="freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a></li>
+<li><a href="freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></li>
+<li><a href="freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></li>
 <li><a href="freemarker/ext/ant/JythonAntTask.html" title="class in freemarker.ext.ant">JythonAntTask</a></li>
 <li><a href="freemarker/ext/jython/JythonHashModel.html" title="class in freemarker.ext.jython">JythonHashModel</a></li>
 <li><a href="freemarker/ext/jython/JythonModel.html" title="class in freemarker.ext.jython">JythonModel</a></li>
@@ -101,6 +118,8 @@
 <li><a href="freemarker/log/Logger.html" title="class in freemarker.log">Logger</a></li>
 <li><a href="freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template">MalformedTemplateNameException</a></li>
 <li><a href="freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a></li>
+<li><a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></li>
+<li><a href="freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache">MergingTemplateConfigurationFactory</a></li>
 <li><a href="freemarker/ext/beans/MethodAppearanceFineTuner.html" title="interface in freemarker.ext.beans"><span class="interfaceName">MethodAppearanceFineTuner</span></a></li>
 <li><a href="freemarker/ext/util/ModelCache.html" title="class in freemarker.ext.util">ModelCache</a></li>
 <li><a href="freemarker/ext/util/ModelFactory.html" title="interface in freemarker.ext.util"><span class="interfaceName">ModelFactory</span></a></li>
@@ -113,13 +132,16 @@
 <li><a href="freemarker/core/NonDateException.html" title="class in freemarker.core">NonDateException</a></li>
 <li><a href="freemarker/core/NonExtendedHashException.html" title="class in freemarker.core">NonExtendedHashException</a></li>
 <li><a href="freemarker/core/NonHashException.html" title="class in freemarker.core">NonHashException</a></li>
+<li><a href="freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">NonMarkupOutputException</a></li>
 <li><a href="freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a></li>
 <li><a href="freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a></li>
 <li><a href="freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a></li>
 <li><a href="freemarker/core/NonSequenceException.html" title="class in freemarker.core">NonSequenceException</a></li>
 <li><a href="freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a></li>
 <li><a href="freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a></li>
+<li><a href="freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">NonStringOrTemplateOutputException</a></li>
 <li><a href="freemarker/template/utility/NormalizeNewlines.html" title="class in freemarker.template.utility">NormalizeNewlines</a></li>
+<li><a href="freemarker/cache/NotMatcher.html" title="class in freemarker.cache">NotMatcher</a></li>
 <li><a href="freemarker/template/utility/NullArgumentException.html" title="class in freemarker.template.utility">NullArgumentException</a></li>
 <li><a href="freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache">NullCacheStorage</a></li>
 <li><a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility">NullWriter</a></li>
@@ -132,14 +154,22 @@
 <li><a href="freemarker/template/utility/ObjectWrapperWithAPISupport.html" title="interface in freemarker.template.utility"><span class="interfaceName">ObjectWrapperWithAPISupport</span></a></li>
 <li><a href="freemarker/template/utility/OptimizerUtil.html" title="class in freemarker.template.utility">OptimizerUtil</a></li>
 <li><a href="freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core">OptInTemplateClassResolver</a></li>
+<li><a href="freemarker/cache/OrMatcher.html" title="class in freemarker.cache">OrMatcher</a></li>
+<li><a href="freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></li>
 <li><a href="freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans">OverloadedMethodsModel</a></li>
 <li><a href="freemarker/core/ParseException.html" title="class in freemarker.core">ParseException</a></li>
+<li><a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><span class="interfaceName">ParserConfiguration</span></a></li>
+<li><a href="freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core">ParsingNotSupportedException</a></li>
+<li><a href="freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></li>
+<li><a href="freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache">PathRegexMatcher</a></li>
+<li><a href="freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></li>
 <li><a href="freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a></li>
 <li><a href="freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a></li>
 <li><a href="freemarker/ext/rhino/RhinoFunctionModel.html" title="class in freemarker.ext.rhino">RhinoFunctionModel</a></li>
 <li><a href="freemarker/ext/rhino/RhinoScriptableModel.html" title="class in freemarker.ext.rhino">RhinoScriptableModel</a></li>
 <li><a href="freemarker/ext/rhino/RhinoWrapper.html" title="class in freemarker.ext.rhino">RhinoWrapper</a></li>
 <li><a href="freemarker/template/utility/RichObjectWrapper.html" title="interface in freemarker.template.utility"><span class="interfaceName">RichObjectWrapper</span></a></li>
+<li><a href="freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></li>
 <li><a href="freemarker/template/utility/SecurityUtilities.html" title="class in freemarker.template.utility">SecurityUtilities</a></li>
 <li><a href="freemarker/ext/servlet/ServletContextHashModel.html" title="class in freemarker.ext.servlet">ServletContextHashModel</a></li>
 <li><a href="freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a></li>
@@ -174,17 +204,26 @@
 <li><a href="freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><span class="interfaceName">TemplateClassResolver</span></a></li>
 <li><a href="freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateCollectionModel</span></a></li>
 <li><a href="freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template"><span class="interfaceName">TemplateCollectionModelEx</span></a></li>
+<li><a href="freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></li>
+<li><a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></li>
+<li><a href="freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></li>
+<li><a href="freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></li>
+<li><a href="freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></li>
+<li><a href="freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></li>
 <li><a href="freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateDateModel</span></a></li>
 <li><a href="freemarker/template/TemplateDirectiveBody.html" title="interface in freemarker.template"><span class="interfaceName">TemplateDirectiveBody</span></a></li>
 <li><a href="freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateDirectiveModel</span></a></li>
 <li><a href="freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></li>
 <li><a href="freemarker/template/TemplateExceptionHandler.html" title="interface in freemarker.template"><span class="interfaceName">TemplateExceptionHandler</span></a></li>
+<li><a href="freemarker/core/TemplateFormatUtil.html" title="class in freemarker.core">TemplateFormatUtil</a></li>
 <li><a href="freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateHashModel</span></a></li>
 <li><a href="freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><span class="interfaceName">TemplateHashModelEx</span></a></li>
+<li><a href="freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></li>
 <li><a href="freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><span class="interfaceName">TemplateLoader</span></a></li>
 <li><a href="freemarker/cache/TemplateLookupContext.html" title="class in freemarker.cache">TemplateLookupContext</a></li>
 <li><a href="freemarker/cache/TemplateLookupResult.html" title="class in freemarker.cache">TemplateLookupResult</a></li>
 <li><a href="freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a></li>
+<li><a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><span class="interfaceName">TemplateMarkupOutputModel</span></a></li>
 <li><a href="freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateMethodModel</span></a></li>
 <li><a href="freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template"><span class="interfaceName">TemplateMethodModelEx</span></a></li>
 <li><a href="freemarker/template/TemplateModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateModel</span></a></li>
@@ -196,17 +235,33 @@
 <li><a href="freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a></li>
 <li><a href="freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateNodeModel</span></a></li>
 <li><a href="freemarker/template/TemplateNotFoundException.html" title="class in freemarker.template">TemplateNotFoundException</a></li>
+<li><a href="freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></li>
+<li><a href="freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></li>
 <li><a href="freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateNumberModel</span></a></li>
+<li><a href="freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></li>
 <li><a href="freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateScalarModel</span></a></li>
 <li><a href="freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateSequenceModel</span></a></li>
+<li><a href="freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></li>
 <li><a href="freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template"><span class="interfaceName">TemplateTransformModel</span></a></li>
+<li><a href="freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></li>
+<li><a href="freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></li>
+<li><a href="freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</a></li>
+<li><a href="freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></li>
+<li><a href="freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></li>
 <li><a href="freemarker/template/utility/ToCanonical.html" title="class in freemarker.template.utility">ToCanonical</a></li>
 <li><a href="freemarker/ext/dom/Transform.html" title="class in freemarker.ext.dom">Transform</a></li>
 <li><a href="freemarker/template/TransformControl.html" title="interface in freemarker.template"><span class="interfaceName">TransformControl</span></a></li>
 <li><a href="freemarker/template/utility/UndeclaredThrowableException.html" title="class in freemarker.template.utility">UndeclaredThrowableException</a></li>
+<li><a href="freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core">UndefinedCustomFormatException</a></li>
+<li><a href="freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></li>
 <li><a href="freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">UnexpectedTypeException</a></li>
+<li><a href="freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a></li>
+<li><a href="freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeFormattingUnsupportedException</a></li>
+<li><a href="freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeParsingUnsupportedException</a></li>
 <li><a href="freemarker/ext/ant/UnlinkedJythonOperationsImpl.html" title="class in freemarker.ext.ant">UnlinkedJythonOperationsImpl</a></li>
+<li><a href="freemarker/core/UnparsableValueException.html" title="class in freemarker.core">UnparsableValueException</a></li>
 <li><a href="freemarker/template/utility/UnrecognizedTimeZoneException.html" title="class in freemarker.template.utility">UnrecognizedTimeZoneException</a></li>
+<li><a href="freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core">UnregisteredOutputFormatException</a></li>
 <li><a href="freemarker/template/utility/UnsupportedNumberClassException.html" title="class in freemarker.template.utility">UnsupportedNumberClassException</a></li>
 <li><a href="freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache">URLTemplateLoader</a></li>
 <li><a href="freemarker/template/Version.html" title="class in freemarker.template">Version</a></li>
@@ -214,7 +269,9 @@
 <li><a href="freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util"><span class="interfaceName">WrapperTemplateModel</span></a></li>
 <li><a href="freemarker/template/WrappingTemplateModel.html" title="class in freemarker.template">WrappingTemplateModel</a></li>
 <li><a href="freemarker/template/utility/WriteProtectable.html" title="interface in freemarker.template.utility"><span class="interfaceName">WriteProtectable</span></a></li>
+<li><a href="freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></li>
 <li><a href="freemarker/template/utility/XmlEscape.html" title="class in freemarker.template.utility">XmlEscape</a></li>
+<li><a href="freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></li>
 <li><a href="freemarker/ext/dom/XPathSupport.html" title="interface in freemarker.ext.dom"><span class="interfaceName">XPathSupport</span></a></li>
 </ul>
 </div>


[50/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/alphaidx.html
----------------------------------------------------------------------
diff --git a/docs/alphaidx.html b/docs/alphaidx.html
index ec1fd5f..95343df 100644
--- a/docs/alphaidx.html
+++ b/docs/alphaidx.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-index">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>Alphabetical Index - FreeMarker Manual</title>
+<title>Alphabetical Index - Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
 <meta property="og:title" content="Alphabetical Index">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/alphaidx.html">
-<link rel="canoical" href="http://freemarker.org/docs/alphaidx.html">
+<link rel="canonical" href="http://freemarker.org/docs/alphaidx.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,17 +25,16 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
   <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="alphaidx.html"><span itemprop="name">Alphabetical Index</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li>Alpha. index</li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a>
 </li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
+</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">Apache FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="alphaidx.html"><span itemprop="name">Alphabetical Index</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li>Alpha. index</li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressi
 ons</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
-      <script>var breadcrumb = ["FreeMarker Manual","Alphabetical Index"];</script>
+      <script>var breadcrumb = ["Apache FreeMarker Manual","Alphabetical Index"];</script>
       <script src="toc.js"></script>
       <script src="docgen-resources/main.min.js"></script>
   </div>
@@ -99,7 +99,7 @@ ga('send', 'pageview');
       adding sequences,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_sequenceop_cat">Concatenation</a>
     </dt>
     <dt>
-      adding strings,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation (or concatenation)</a>
+      adding strings,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation and concatenation</a>
     </dt>
     <dt>
       addition,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_arit">Arithmetical calculations</a>
@@ -132,6 +132,19 @@ ga('send', 'pageview');
     <dt>
       attempt directive,&nbsp;&nbsp;<a href="ref_directive_attempt.html">attempt, recover</a>
     </dt>
+    <dt>
+      auto_esc,&nbsp;&nbsp;<a href="ref_specvar.html">Special Variable Reference</a>
+    </dt>
+    <dt>
+      auto-escaping,&nbsp;&nbsp;<a href="dgui_misc_autoescaping.html">Auto-escaping and output formats</a>,
+<a href="pgui_config_outputformatsautoesc.html">Associating output formats with templates</a>,
+<a href="ref_directive_autoesc.html">autoesc</a>,
+<a href="ref_directive_noautoesc.html">noautoesc</a>,
+<a href="ref_directive_outputformat.html">outputformat</a>
+    </dt>
+    <dt>
+      autoesc directive,&nbsp;&nbsp;<a href="ref_directive_autoesc.html">autoesc</a>
+    </dt>
 </dl></div>
 <div class="indexdiv">
 <a name="idx_B"></a>
@@ -159,13 +172,13 @@ ga('send', 'pageview');
         <dt>the FTL value type, <a href="dgui_datamodel_types.html#dgui_datamodel_scalar">Scalars</a></dt>
       </dl></dd>
     <dt>
-      boolean_format,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_112">setting</a>
+      boolean_format,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_125">setting</a>
     </dt>
     <dt>
       boolean built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_boolean">boolean</a>
     </dt>
     <dt>
-      break directive,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_97">list, else, items, sep, break</a>,
+      break directive,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_106">list, else, items, sep, break</a>,
 <a href="ref_directive_switch.html">switch, case, default, break</a>
     </dt>
     <dt>
@@ -197,7 +210,7 @@ ga('send', 'pageview');
       case directive,&nbsp;&nbsp;<a href="ref_directive_switch.html">switch, case, default, break</a>
     </dt>
     <dt>
-      catch-all parameter,&nbsp;&nbsp;<a href="ref_directive_macro.html#autoid_103">macro, nested, return</a>
+      catch-all parameter,&nbsp;&nbsp;<a href="ref_directive_macro.html#autoid_112">macro, nested, return</a>
     </dt>
     <dt>
       c built-in,&nbsp;&nbsp;<a href="ref_builtins_number.html#ref_builtin_c">c (when used with numerical value)</a>,
@@ -223,12 +236,12 @@ ga('send', 'pageview');
       chunk built-in,&nbsp;&nbsp;<a href="ref_builtins_sequence.html#ref_builtin_chunk">chunk</a>
     </dt>
     <dt>
-      classic_compatible,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_112">setting</a>
+      classic_compatible,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_125">setting</a>
     </dt>
     <dt>
       collection    </dt>
       <dd><dl>
-        <dt>Java side, <a href="pgui_datamodel_parent.html#autoid_32">Containers</a></dt>
+        <dt>Java side, <a href="pgui_datamodel_parent.html#autoid_34">Containers</a></dt>
         <dt>the FTL value type, <a href="dgui_datamodel_types.html#dgui_datamodel_container">Containers</a></dt>
       </dl></dd>
     <dt>
@@ -253,7 +266,7 @@ ga('send', 'pageview');
       concatenate sequences,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_sequenceop_cat">Concatenation</a>
     </dt>
     <dt>
-      concatenate strings,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation (or concatenation)</a>
+      concatenate strings,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation and concatenation</a>
     </dt>
     <dt>
       configuration,&nbsp;&nbsp;<a href="pgui_quickstart_createconfiguration.html">Create a configuration instance</a>
@@ -326,7 +339,7 @@ ga('send', 'pageview');
       custom object wrapper,&nbsp;&nbsp;<a href="pgui_datamodel_objectWrapper.html#pgui_datamodel_customObjectWrappingExample">Custom object wrapping example</a>
     </dt>
     <dt>
-      custom tags,&nbsp;&nbsp;<a href="pgui_misc_servlet.html#autoid_56">Using FreeMarker with servlets</a>
+      custom tags,&nbsp;&nbsp;<a href="pgui_misc_servlet.html#autoid_63">Using FreeMarker with servlets</a>
     </dt>
 </dl></div>
 <div class="indexdiv">
@@ -344,7 +357,7 @@ ga('send', 'pageview');
       date    </dt>
       <dd><dl>
         <dt>built-ins, <a href="ref_builtins_date.html">Built-ins for date/time/date-time values</a></dt>
-        <dt>Java API related difficulties, <a href="pgui_datamodel_scalar.html#autoid_29">Scalars</a></dt>
+        <dt>Java API related difficulties, <a href="pgui_datamodel_scalar.html#autoid_31">Scalars</a></dt>
         <dt>Java side, <a href="pgui_datamodel_scalar.html">Scalars</a></dt>
         <dt>the FTL value type, <a href="dgui_datamodel_types.html#dgui_datamodel_scalar">Scalars</a></dt>
       </dl></dd>
@@ -430,7 +443,7 @@ ga('send', 'pageview');
       else directive,&nbsp;&nbsp;<a href="ref_directive_if.html">if, else, elseif</a>
     </dt>
     <dt>
-      else directive inside list,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_94">list, else, items, sep, break</a>
+      else directive inside list,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_103">list, else, items, sep, break</a>
     </dt>
     <dt>
       elseif directive,&nbsp;&nbsp;<a href="ref_directive_if.html">if, else, elseif</a>
@@ -462,19 +475,26 @@ ga('send', 'pageview');
 <a href="ref_directive_attempt.html">attempt, recover</a>
     </dt>
     <dt>
-      escape directive,&nbsp;&nbsp;<a href="ref_directive_escape.html">escape, noescape</a>
+      escape directive,&nbsp;&nbsp;<a href="ref_directive_escape.html">escape, noescape (deprecated)</a>
     </dt>
     <dt>
       escape sequences,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_direct_string">Strings</a>
     </dt>
     <dt>
-      escaping    </dt>
+      escaping,&nbsp;&nbsp;<a href="dgui_misc_autoescaping.html">Auto-escaping and output formats</a>,
+<a href="ref_directive_autoesc.html">autoesc</a>,
+<a href="ref_directive_noautoesc.html">noautoesc</a>,
+<a href="ref_directive_outputformat.html">outputformat</a>
+    </dt>
       <dd><dl>
-        <dt>output, <a href="ref_builtins_string.html#ref_builtin_html">html</a>, <a href="ref_builtins_string.html#ref_builtin_rtf">rtf</a>, <a href="ref_builtins_string.html#ref_builtin_xhtml">xhtml</a>, <a href="ref_builtins_string.html#ref_builtin_xml">xml</a></dt>
+        <dt>output, <a href="ref_builtins_string.html#ref_builtin_html">html (deprecated)</a>, <a href="ref_builtins_string.html#ref_builtin_rtf">rtf (deprecated)</a>, <a href="ref_builtins_string.html#ref_builtin_xhtml">xhtml (deprecated)</a>, <a href="ref_builtins_string.html#ref_builtin_xml">xml (deprecated)</a></dt>
         <dt>URL, <a href="ref_builtins_string.html#ref_builtin_url">url</a></dt>
         <dt>URL path, <a href="ref_builtins_string.html#ref_builtin_url_path">url_path</a></dt>
       </dl></dd>
     <dt>
+      esc built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_esc">esc</a>
+    </dt>
+    <dt>
       eval,&nbsp;&nbsp;<a href="ref_builtins_expert.html#ref_builtin_eval">eval</a>
     </dt>
     <dt>
@@ -492,6 +512,9 @@ ga('send', 'pageview');
     <dt>
       expression,&nbsp;&nbsp;<a href="dgui_template_exp.html">Expressions</a>
     </dt>
+    <dt>
+      extended Java decimal format,&nbsp;&nbsp;<a href="ref_builtins_number.html#topic.extendedJavaDecimalFormat">Extended Java decimal format</a>
+    </dt>
 </dl></div>
 <div class="indexdiv">
 <a name="idx_F"></a>
@@ -518,7 +541,7 @@ ga('send', 'pageview');
     <dt>
       format    </dt>
       <dd><dl>
-        <dt>boolean, <a href="ref_builtins_boolean.html#ref_builtin_c_boolean">c (when used with boolean)</a>, <a href="ref_builtins_boolean.html#ref_builtin_string_for_boolean">string (when used with a boolean value)</a>, <a href="ref_directive_setting.html#autoid_112">setting</a></dt>
+        <dt>boolean, <a href="ref_builtins_boolean.html#ref_builtin_c_boolean">c (when used with boolean)</a>, <a href="ref_builtins_boolean.html#ref_builtin_string_for_boolean">string (when used with a boolean value)</a>, <a href="ref_directive_setting.html#autoid_125">setting</a></dt>
         <dt>date, <a href="ref_builtins_date.html#ref_builtin_string_for_date">string (when used with a date/time/date-time value)</a>, <a href="ref_directive_setting.html#topic_date_format_settings">setting</a></dt>
         <dt>date-time, <a href="ref_builtins_date.html#ref_builtin_string_for_date">string (when used with a date/time/date-time value)</a></dt>
         <dt>number, <a href="ref_builtins_number.html#ref_builtin_c">c (when used with numerical value)</a>, <a href="ref_builtins_number.html#ref_builtin_string_for_number">string (when used with a numerical value)</a>, <a href="ref_directive_setting.html#ref.setting.number_format">setting</a></dt>
@@ -578,7 +601,7 @@ ga('send', 'pageview');
         <dt>accessing subvariable, <a href="dgui_template_exp.html#dgui_template_exp_var_hash">Retrieving data from a hash</a></dt>
         <dt>built-ins, <a href="ref_builtins_hash.html">Built-ins for hashes</a></dt>
         <dt>concatenate, <a href="dgui_template_exp.html#dgui_template_exp_hashop_cat">Concatenation</a></dt>
-        <dt>Java side, <a href="pgui_datamodel_parent.html#autoid_30">Containers</a></dt>
+        <dt>Java side, <a href="pgui_datamodel_parent.html#autoid_32">Containers</a></dt>
         <dt>key type, <a href="app_faq.html#faq_nonstring_keys">FAQ</a></dt>
         <dt>literal, <a href="dgui_template_exp.html#dgui_template_exp_direct_hash">Hashes</a></dt>
         <dt>modify, <a href="app_faq.html#faq_modify_seq_and_map">FAQ</a></dt>
@@ -589,7 +612,13 @@ ga('send', 'pageview');
       header,&nbsp;&nbsp;<a href="ref_directive_ftl.html">ftl</a>
     </dt>
     <dt>
-      html built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_html">html</a>
+      html built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_html">html (deprecated)</a>
+    </dt>
+    <dt>
+      HTML encoding,&nbsp;&nbsp;<a href="dgui_misc_autoescaping.html">Auto-escaping and output formats</a>
+    </dt>
+    <dt>
+      HTML escaping,&nbsp;&nbsp;<a href="dgui_misc_autoescaping.html">Auto-escaping and output formats</a>
     </dt>
     <dt>
       HTTP,&nbsp;&nbsp;<a href="pgui_misc_servlet.html">Using FreeMarker with servlets</a>
@@ -629,6 +658,9 @@ ga('send', 'pageview');
       incompatible improvements,&nbsp;&nbsp;<a href="pgui_config_incompatible_improvements.html">The &quot;incompatible improvements&quot; setting</a>
     </dt>
     <dt>
+      incomplatible_improvements,&nbsp;&nbsp;<a href="ref_specvar.html">Special Variable Reference</a>
+    </dt>
+    <dt>
       index_of built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_index_of">index_of</a>
     </dt>
     <dt>
@@ -654,7 +686,7 @@ ga('send', 'pageview');
     </dt>
     <dt>
       interpolation,&nbsp;&nbsp;<a href="dgui_template_overallstructure.html">Overall structure</a>,
-<a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation (or concatenation)</a>,
+<a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation and concatenation</a>,
 <a href="dgui_template_valueinsertion.html">Interpolations</a>
     </dt>
     <dt>
@@ -706,10 +738,10 @@ ga('send', 'pageview');
       item_parity built-in,&nbsp;&nbsp;<a href="ref_builtins_loop_var.html#ref_builtin_item_parity">item_parity</a>
     </dt>
     <dt>
-      items directive,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_95">list, else, items, sep, break</a>
+      items directive,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_104">list, else, items, sep, break</a>
     </dt>
     <dt>
-      iteration state,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_98">list, else, items, sep, break</a>
+      iteration state,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_107">list, else, items, sep, break</a>
     </dt>
 </dl></div>
 <div class="indexdiv">
@@ -720,7 +752,7 @@ ga('send', 'pageview');
       j_string built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_j_string">j_string</a>
     </dt>
     <dt>
-      JDBC time zone,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_112">setting</a>
+      JDBC time zone,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_125">setting</a>
     </dt>
     <dt>
       join built-in,&nbsp;&nbsp;<a href="ref_builtins_sequence.html#ref_builtin_join">join</a>
@@ -732,7 +764,7 @@ ga('send', 'pageview');
       joining sequences,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_sequenceop_cat">Concatenation</a>
     </dt>
     <dt>
-      joining strings,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation (or concatenation)</a>
+      joining strings,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation and concatenation</a>
     </dt>
     <dt>
       js_string built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_js_string">js_string</a>
@@ -747,7 +779,7 @@ ga('send', 'pageview');
       <dd><dl>
         <dt>include, <a href="pgui_misc_servlet.html#pgui_misc_servlet_include">Including content from other web application
           resources</a></dt>
-        <dt>taglib, <a href="pgui_misc_servlet.html#autoid_56">Using FreeMarker with servlets</a>, <a href="pgui_misc_servlet.html#autoid_57">Using FreeMarker with servlets</a></dt>
+        <dt>taglib, <a href="pgui_misc_servlet.html#autoid_63">Using FreeMarker with servlets</a>, <a href="pgui_misc_servlet.html#autoid_64">Using FreeMarker with servlets</a></dt>
       </dl></dd>
     <dt>
       jython    </dt>
@@ -810,7 +842,7 @@ ga('send', 'pageview');
       list directive,&nbsp;&nbsp;<a href="ref_directive_list.html">list, else, items, sep, break</a>
     </dt>
     <dt>
-      listing state,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_98">list, else, items, sep, break</a>
+      listing state,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_107">list, else, items, sep, break</a>
     </dt>
     <dt>
       literal,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_direct">Specify values directly</a>
@@ -826,7 +858,7 @@ ga('send', 'pageview');
       local directive,&nbsp;&nbsp;<a href="ref_directive_local.html">local</a>
     </dt>
     <dt>
-      locale,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_112">setting</a>,
+      locale,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_125">setting</a>,
 <a href="ref_specvar.html">Special Variable Reference</a>
     </dt>
     <dt>
@@ -884,6 +916,14 @@ ga('send', 'pageview');
       main_template_name,&nbsp;&nbsp;<a href="ref_specvar.html">Special Variable Reference</a>
     </dt>
     <dt>
+      markup_string built-in,&nbsp;&nbsp;<a href="ref_builtins_expert.html#ref_builtin_markup_string">markup_string</a>
+    </dt>
+    <dt>
+      markup output    </dt>
+      <dd><dl>
+        <dt>the FTL value type, <a href="dgui_datamodel_types.html#dgui_datamodel_markupoutput">Markup output</a></dt>
+      </dl></dd>
+    <dt>
       matches built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_matches">matches</a>
     </dt>
     <dt>
@@ -901,6 +941,9 @@ ga('send', 'pageview');
         <dt>the FTL value type, <a href="dgui_datamodel_types.html#dgui_datamodel_method">Methods and functions</a></dt>
       </dl></dd>
     <dt>
+      MIME type,&nbsp;&nbsp;<a href="dgui_misc_autoescaping.html">Auto-escaping and output formats</a>
+    </dt>
+    <dt>
       missing value test operator,&nbsp;&nbsp;<a href="dgui_template_exp.html#dgui_template_exp_missing_test">Missing value test operator</a>
     </dt>
     <dt>
@@ -948,6 +991,12 @@ ga('send', 'pageview');
       new FTL syntax,&nbsp;&nbsp;<a href="ref_depr_oldsyntax.html">Old FTL syntax</a>
     </dt>
     <dt>
+      no_esc built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_no_esc">no_esc</a>
+    </dt>
+    <dt>
+      noautoesc directive,&nbsp;&nbsp;<a href="ref_directive_noautoesc.html">noautoesc</a>
+    </dt>
+    <dt>
       node    </dt>
       <dd><dl>
         <dt>built-ins, <a href="ref_builtins_node.html">Built-ins for nodes (for XML)</a></dt>
@@ -964,7 +1013,7 @@ ga('send', 'pageview');
       node_type built-in,&nbsp;&nbsp;<a href="ref_builtins_node.html#ref_builtin_node_type">node_type</a>
     </dt>
     <dt>
-      noescape directive,&nbsp;&nbsp;<a href="ref_directive_escape.html">escape, noescape</a>
+      noescape directive,&nbsp;&nbsp;<a href="ref_directive_escape.html">escape, noescape (deprecated)</a>
     </dt>
     <dt>
       noparse directive,&nbsp;&nbsp;<a href="ref_directive_noparse.html">noparse</a>
@@ -1039,18 +1088,29 @@ ga('send', 'pageview');
         <dt>generate with Java, <a href="pgui_quickstart_merge.html">Merging the template with the data-model</a></dt>
       </dl></dd>
     <dt>
-      output_encoding,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_112">setting</a>
+      output_encoding,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_125">setting</a>
     </dt>
     <dt>
-      output charset,&nbsp;&nbsp;<a href="pgui_misc_charset.html#autoid_46">Charset issues</a>,
+      output_format,&nbsp;&nbsp;<a href="ref_specvar.html">Special Variable Reference</a>
+    </dt>
+    <dt>
+      output charset,&nbsp;&nbsp;<a href="pgui_misc_charset.html#autoid_53">Charset issues</a>,
 <a href="ref_builtins_string.html#ref_builtin_url">url</a>,
 <a href="ref_specvar.html">Special Variable Reference</a>
     </dt>
     <dt>
-      output encoding,&nbsp;&nbsp;<a href="pgui_misc_charset.html#autoid_46">Charset issues</a>,
+      output encoding,&nbsp;&nbsp;<a href="pgui_misc_charset.html#autoid_53">Charset issues</a>,
 <a href="ref_builtins_string.html#ref_builtin_url">url</a>,
 <a href="ref_specvar.html">Special Variable Reference</a>
     </dt>
+    <dt>
+      output format,&nbsp;&nbsp;<a href="dgui_misc_autoescaping.html#dgui_misc_autoescaping_outputformat">Output formats</a>,
+<a href="pgui_config_outputformatsautoesc.html">Associating output formats with templates</a>,
+<a href="ref_specvar.html">Special Variable Reference</a>
+    </dt>
+    <dt>
+      outputformat directive,&nbsp;&nbsp;<a href="ref_directive_outputformat.html">outputformat</a>
+    </dt>
 </dl></div>
 <div class="indexdiv">
 <a name="idx_P"></a>
@@ -1079,7 +1139,7 @@ ga('send', 'pageview');
       parsing string as time,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_string_date">date, time, datetime</a>
     </dt>
     <dt>
-      path,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#autoid_40">Template loading</a>
+      path,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#autoid_42">Template loading</a>
     </dt>
     <dt>
       positional parameter passing,&nbsp;&nbsp;<a href="ref_directive_userDefined.html#ref_directive_userDefined_positionalParam">Positional parameter passing</a>
@@ -1149,7 +1209,7 @@ ga('send', 'pageview');
       rt directive,&nbsp;&nbsp;<a href="ref_directive_t.html">t, lt, rt</a>
     </dt>
     <dt>
-      rtf built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_rtf">rtf</a>
+      rtf built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_rtf">rtf (deprecated)</a>
     </dt>
 </dl></div>
 <div class="indexdiv">
@@ -1171,7 +1231,7 @@ ga('send', 'pageview');
         <dt>user-provided templates, <a href="app_faq.html#faq_template_uploading_security">FAQ</a></dt>
       </dl></dd>
     <dt>
-      sep directive,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_96">list, else, items, sep, break</a>
+      sep directive,&nbsp;&nbsp;<a href="ref_directive_list.html#autoid_105">list, else, items, sep, break</a>
     </dt>
     <dt>
       seq_contains built-in,&nbsp;&nbsp;<a href="ref_builtins_sequence.html#ref_builtin_seq_contains">seq_contains</a>
@@ -1189,7 +1249,7 @@ ga('send', 'pageview');
         <dt>built-ins, <a href="ref_builtins_sequence.html">Built-ins for sequences</a></dt>
         <dt>concatenate, <a href="dgui_template_exp.html#dgui_template_exp_sequenceop_cat">Concatenation</a></dt>
         <dt>iterate, <a href="ref_directive_list.html">list, else, items, sep, break</a></dt>
-        <dt>Java side, <a href="pgui_datamodel_parent.html#autoid_31">Containers</a></dt>
+        <dt>Java side, <a href="pgui_datamodel_parent.html#autoid_33">Containers</a></dt>
         <dt>literal, <a href="dgui_template_exp.html#dgui_template_exp_direct_seuqence">Sequences</a></dt>
         <dt>modify, <a href="app_faq.html#faq_modify_seq_and_map">FAQ</a></dt>
         <dt>operations, <a href="dgui_template_exp.html#dgui_template_exp_sequenceop">Sequence operations</a></dt>
@@ -1251,7 +1311,7 @@ ga('send', 'pageview');
     <dt>
       static method    </dt>
       <dd><dl>
-        <dt>accessing from templates, <a href="pgui_misc_beanwrapper.html#autoid_53">Bean wrapper</a></dt>
+        <dt>accessing from templates, <a href="pgui_misc_beanwrapper.html#autoid_60">Bean wrapper</a></dt>
       </dl></dd>
     <dt>
       stop directive,&nbsp;&nbsp;<a href="ref_directive_stop.html">stop</a>
@@ -1266,8 +1326,8 @@ ga('send', 'pageview');
       string    </dt>
       <dd><dl>
         <dt>built-ins, <a href="ref_builtins_string.html">Built-ins for strings</a></dt>
-        <dt>concatenate, <a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation (or concatenation)</a></dt>
-        <dt>interpolation, <a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation (or concatenation)</a></dt>
+        <dt>concatenate, <a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation and concatenation</a></dt>
+        <dt>interpolation, <a href="dgui_template_exp.html#dgui_template_exp_stringop_interpolation">Interpolation and concatenation</a></dt>
         <dt>Java side, <a href="pgui_datamodel_scalar.html">Scalars</a></dt>
         <dt>literal, <a href="dgui_template_exp.html#dgui_template_exp_direct_string">Strings</a></dt>
         <dt>operations, <a href="dgui_template_exp.html#dgui_template_exp_stringop">String operations</a></dt>
@@ -1339,7 +1399,7 @@ ga('send', 'pageview');
         <dt>user-defined, <a href="dgui_misc_userdefdir.html">Defining your own directives</a></dt>
       </dl></dd>
     <dt>
-      taglib,&nbsp;&nbsp;<a href="pgui_misc_servlet.html#autoid_56">Using FreeMarker with servlets</a>
+      taglib,&nbsp;&nbsp;<a href="pgui_misc_servlet.html#autoid_63">Using FreeMarker with servlets</a>
     </dt>
     <dt>
       t directive,&nbsp;&nbsp;<a href="ref_directive_t.html">t, lt, rt</a>
@@ -1357,16 +1417,16 @@ ga('send', 'pageview');
       template caching,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#pgui_config_templateloading_caching">Template caching</a>
     </dt>
     <dt>
-      template loaders,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#autoid_36">Template loading</a>
+      template loaders,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#autoid_38">Template loading</a>
     </dt>
     <dt>
       template loading,&nbsp;&nbsp;<a href="pgui_config_templateloading.html">Template loading</a>
     </dt>
     <dt>
-      template name,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#autoid_40">Template loading</a>
+      template name,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#autoid_42">Template loading</a>
     </dt>
     <dt>
-      template path,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#autoid_40">Template loading</a>
+      template path,&nbsp;&nbsp;<a href="pgui_config_templateloading.html#autoid_42">Template loading</a>
     </dt>
     <dt>
       temporary variable,&nbsp;&nbsp;<a href="dgui_misc_var.html">Defining variables in the template</a>
@@ -1396,7 +1456,7 @@ ga('send', 'pageview');
       time    </dt>
       <dd><dl>
         <dt>built-ins, <a href="ref_builtins_date.html">Built-ins for date/time/date-time values</a></dt>
-        <dt>Java API related difficulties, <a href="pgui_datamodel_scalar.html#autoid_29">Scalars</a></dt>
+        <dt>Java API related difficulties, <a href="pgui_datamodel_scalar.html#autoid_31">Scalars</a></dt>
         <dt>Java side, <a href="pgui_datamodel_scalar.html">Scalars</a></dt>
         <dt>the FTL value type, <a href="dgui_datamodel_types.html#dgui_datamodel_scalar">Scalars</a></dt>
       </dl></dd>
@@ -1404,8 +1464,8 @@ ga('send', 'pageview');
       time_format,&nbsp;&nbsp;<a href="ref_directive_setting.html#topic_date_format_settings">setting</a>
     </dt>
     <dt>
-      time_zone,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_112">setting</a>,
-<a href="ref_directive_setting.html#autoid_112">setting</a>
+      time_zone,&nbsp;&nbsp;<a href="ref_directive_setting.html#autoid_125">setting</a>,
+<a href="ref_directive_setting.html#autoid_125">setting</a>
     </dt>
     <dt>
       time built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_string_date">date, time, datetime</a>,
@@ -1475,7 +1535,7 @@ ga('send', 'pageview');
     </dt>
     <dt>
       url_escaping_charset,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_url">url</a>,
-<a href="ref_directive_setting.html#autoid_112">setting</a>
+<a href="ref_directive_setting.html#autoid_125">setting</a>
     </dt>
     <dt>
       url_path built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_url_path">url_path</a>
@@ -1517,7 +1577,7 @@ ga('send', 'pageview');
       variable,&nbsp;&nbsp;<a href="dgui_misc_var.html">Defining variables in the template</a>
     </dt>
     <dt>
-      variable number of parameters,&nbsp;&nbsp;<a href="ref_directive_macro.html#autoid_103">macro, nested, return</a>
+      variable number of parameters,&nbsp;&nbsp;<a href="ref_directive_macro.html#autoid_112">macro, nested, return</a>
     </dt>
     <dt>
       variables,&nbsp;&nbsp;<a href="pgui_misc_var.html">Variables, scopes</a>
@@ -1549,7 +1609,7 @@ ga('send', 'pageview');
       white-space removal,&nbsp;&nbsp;<a href="dgui_misc_whitespace.html">White-space handling</a>
     </dt>
       <dd><dl>
-        <dt>compress, <a href="dgui_misc_whitespace.html#autoid_28">White-space handling</a>, <a href="ref_directive_compress.html">compress</a></dt>
+        <dt>compress, <a href="dgui_misc_whitespace.html#autoid_30">White-space handling</a>, <a href="ref_directive_compress.html">compress</a></dt>
         <dt>stripping, <a href="dgui_misc_whitespace.html#dgui_misc_whitespace_stripping">White-space stripping</a>, <a href="ref_directive_ftl.html">ftl</a>, <a href="ref_directive_nt.html">nt</a></dt>
         <dt>trimming, <a href="ref_directive_nt.html">nt</a>, <a href="ref_directive_t.html">t, lt, rt</a></dt>
       </dl></dd>
@@ -1573,7 +1633,7 @@ ga('send', 'pageview');
 <h2 class="indexLabel">X</h2>
 <dl>
     <dt>
-      xhtml built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_xhtml">xhtml</a>
+      xhtml built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_xhtml">xhtml (deprecated)</a>
     </dt>
     <dt>
       XML    </dt>
@@ -1583,17 +1643,23 @@ ga('send', 'pageview');
         <dt>imperative processing, <a href="xgui_imperative.html">Imperative XML processing</a></dt>
       </dl></dd>
     <dt>
-      xml built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_xml">xml</a>
+      xml built-in,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_xml">xml (deprecated)</a>
+    </dt>
+    <dt>
+      XML encoding,&nbsp;&nbsp;<a href="dgui_misc_autoescaping.html">Auto-escaping and output formats</a>
+    </dt>
+    <dt>
+      XML escaping,&nbsp;&nbsp;<a href="dgui_misc_autoescaping.html">Auto-escaping and output formats</a>
     </dt>
     <dt>
       XML namespace    </dt>
       <dd><dl>
-        <dt>in imperative processing, <a href="xgui_imperative_learn.html#autoid_136">Basics</a></dt>
+        <dt>in imperative processing, <a href="xgui_imperative_learn.html#autoid_149">Basics</a></dt>
       </dl></dd>
     <dt>
       XML namespaces    </dt>
       <dd><dl>
-        <dt>in declarative processing, <a href="xgui_declarative_details.html#autoid_141">Details</a></dt>
+        <dt>in declarative processing, <a href="xgui_declarative_details.html#autoid_154">Details</a></dt>
       </dl></dd>
     <dt>
       XML Schema date parsing,&nbsp;&nbsp;<a href="ref_builtins_string.html#ref_builtin_string_date">date, time, datetime</a>
@@ -1616,12 +1682,9 @@ ga('send', 'pageview');
 </dl></div>
 <div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="gloss.html"><span>Previous</span></a><span class="paging-arrow disabled next"><span>Next</span></span></div></div></div></div>      </div>
     </div>
-<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/index.html">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><
 li><a href="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generat
 ed for: Freemarker 2.3.23</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2015-07-21T19:53:44Z" title="Tuesday, July 21, 2015 7:53:44 PM GMT">2015-07-21 19:53:44 GMT</time></span></p> <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2015
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The FreeMarker Project</a>. All rights reserved. </p>
+<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href
 ="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generated for: Fr
 eemarker 2.3.24</span><span class="last-updated"> Last generated:
+<time itemprop="dateModified" datetime="2016-03-28T15:17:13Z" title="Monday, March 28, 2016 3:17:13 PM GMT">2016-03-28 15:17:13 GMT</time></span></p> <p class="copyright">
+© <span itemprop="copyrightYear">1999</span>–2016
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>
 </html>
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/allclasses-frame.html b/docs/api/allclasses-frame.html
index 3d6800b..8b4cea0 100644
--- a/docs/api/allclasses-frame.html
+++ b/docs/api/allclasses-frame.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>All Classes (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>All Classes (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>
@@ -14,7 +14,10 @@
 <div class="indexContainer">
 <ul>
 <li><a href="freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">AdapterTemplateModel</span></a></li>
+<li><a href="freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core" target="classFrame">AliasTemplateDateFormatFactory</a></li>
+<li><a href="freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core" target="classFrame">AliasTemplateNumberFormatFactory</a></li>
 <li><a href="freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet" target="classFrame">AllHttpScopesHashModel</a></li>
+<li><a href="freemarker/cache/AndMatcher.html" title="class in freemarker.cache" target="classFrame">AndMatcher</a></li>
 <li><a href="freemarker/core/ArithmeticEngine.html" title="class in freemarker.core" target="classFrame">ArithmeticEngine</a></li>
 <li><a href="freemarker/core/ArithmeticEngine.BigDecimalEngine.html" title="class in freemarker.core" target="classFrame">ArithmeticEngine.BigDecimalEngine</a></li>
 <li><a href="freemarker/core/ArithmeticEngine.ConservativeEngine.html" title="class in freemarker.core" target="classFrame">ArithmeticEngine.ConservativeEngine</a></li>
@@ -29,6 +32,7 @@
 <li><a href="freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans" target="classFrame">BooleanModel</a></li>
 <li><a href="freemarker/debug/Breakpoint.html" title="class in freemarker.debug" target="classFrame">Breakpoint</a></li>
 <li><a href="freemarker/core/BugException.html" title="class in freemarker.core" target="classFrame">BugException</a></li>
+<li><a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache" target="classFrame">ByteArrayTemplateLoader</a></li>
 <li><a href="freemarker/cache/CacheStorage.html" title="interface in freemarker.cache" target="classFrame"><span class="interfaceName">CacheStorage</span></a></li>
 <li><a href="freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache" target="classFrame"><span class="interfaceName">CacheStorageWithGetSize</span></a></li>
 <li><a href="freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core" target="classFrame">CallPlaceCustomDataInitializationException</a></li>
@@ -38,13 +42,18 @@
 <li><a href="freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans" target="classFrame">CollectionModel</a></li>
 <li><a href="freemarker/template/utility/Collections12.html" title="class in freemarker.template.utility" target="classFrame">Collections12</a></li>
 <li><a href="freemarker/template/utility/CollectionUtils.html" title="class in freemarker.template.utility" target="classFrame">CollectionUtils</a></li>
+<li><a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core" target="classFrame">CombinedMarkupOutputFormat</a></li>
 <li><a href="freemarker/core/CommandLine.html" title="class in freemarker.core" target="classFrame">CommandLine</a></li>
+<li><a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core" target="classFrame">CommonMarkupOutputFormat</a></li>
+<li><a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core" target="classFrame">CommonTemplateMarkupOutputModel</a></li>
 <li><a href="freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache" target="classFrame"><span class="interfaceName">ConcurrentCacheStorage</span></a></li>
+<li><a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache" target="classFrame">ConditionalTemplateConfigurationFactory</a></li>
 <li><a href="freemarker/core/Configurable.html" title="class in freemarker.core" target="classFrame">Configurable</a></li>
 <li><a href="freemarker/core/Configurable.SettingValueAssignmentException.html" title="class in freemarker.core" target="classFrame">Configurable.SettingValueAssignmentException</a></li>
 <li><a href="freemarker/core/Configurable.UnknownSettingException.html" title="class in freemarker.core" target="classFrame">Configurable.UnknownSettingException</a></li>
 <li><a href="freemarker/template/Configuration.html" title="class in freemarker.template" target="classFrame">Configuration</a></li>
 <li><a href="freemarker/template/utility/Constants.html" title="class in freemarker.template.utility" target="classFrame">Constants</a></li>
+<li><a href="freemarker/core/CSSOutputFormat.html" title="class in freemarker.core" target="classFrame">CSSOutputFormat</a></li>
 <li><a href="freemarker/core/CustomAttribute.html" title="class in freemarker.core" target="classFrame">CustomAttribute</a></li>
 <li><a href="freemarker/ext/beans/DateModel.html" title="class in freemarker.ext.beans" target="classFrame">DateModel</a></li>
 <li><a href="freemarker/template/utility/DateUtil.html" title="class in freemarker.template.utility" target="classFrame">DateUtil</a></li>
@@ -74,21 +83,29 @@
 <li><a href="freemarker/debug/EnvironmentSuspendedEvent.html" title="class in freemarker.debug" target="classFrame">EnvironmentSuspendedEvent</a></li>
 <li><a href="freemarker/ext/jsp/EventForwarding.html" title="class in freemarker.ext.jsp" target="classFrame">EventForwarding</a></li>
 <li><a href="freemarker/template/utility/Execute.html" title="class in freemarker.template.utility" target="classFrame">Execute</a></li>
+<li><a href="freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache" target="classFrame">FileExtensionMatcher</a></li>
+<li><a href="freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache" target="classFrame">FileNameGlobMatcher</a></li>
 <li><a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache" target="classFrame">FileTemplateLoader</a></li>
+<li><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache" target="classFrame">FirstMatchTemplateConfigurationFactory</a></li>
 <li><a href="freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet" target="classFrame">FreemarkerServlet</a></li>
 <li><a href="freemarker/ext/jsp/FreemarkerTag.html" title="class in freemarker.ext.jsp" target="classFrame">FreemarkerTag</a></li>
 <li><a href="freemarker/core/FreeMarkerTree.html" title="class in freemarker.core" target="classFrame">FreeMarkerTree</a></li>
 <li><a href="freemarker/ext/ant/FreemarkerXmlTask.html" title="class in freemarker.ext.ant" target="classFrame">FreemarkerXmlTask</a></li>
 <li><a href="freemarker/ext/beans/HashAdapter.html" title="class in freemarker.ext.beans" target="classFrame">HashAdapter</a></li>
 <li><a href="freemarker/template/utility/HtmlEscape.html" title="class in freemarker.template.utility" target="classFrame">HtmlEscape</a></li>
+<li><a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core" target="classFrame">HTMLOutputFormat</a></li>
 <li><a href="freemarker/ext/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.servlet" target="classFrame">HttpRequestHashModel</a></li>
 <li><a href="freemarker/ext/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.servlet" target="classFrame">HttpRequestParametersHashModel</a></li>
 <li><a href="freemarker/ext/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.servlet" target="classFrame">HttpSessionHashModel</a></li>
 <li><a href="freemarker/ext/util/IdentityHashMap.html" title="class in freemarker.ext.util" target="classFrame">IdentityHashMap</a></li>
 <li><a href="freemarker/ext/servlet/IncludePage.html" title="class in freemarker.ext.servlet" target="classFrame">IncludePage</a></li>
+<li><a href="freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core" target="classFrame">InvalidFormatParametersException</a></li>
+<li><a href="freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core" target="classFrame">InvalidFormatStringException</a></li>
 <li><a href="freemarker/ext/beans/InvalidPropertyException.html" title="class in freemarker.ext.beans" target="classFrame">InvalidPropertyException</a></li>
 <li><a href="freemarker/core/InvalidReferenceException.html" title="class in freemarker.core" target="classFrame">InvalidReferenceException</a></li>
 <li><a href="freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans" target="classFrame">IteratorModel</a></li>
+<li><a href="freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core" target="classFrame">JavaScriptOutputFormat</a></li>
+<li><a href="freemarker/core/JSONOutputFormat.html" title="class in freemarker.core" target="classFrame">JSONOutputFormat</a></li>
 <li><a href="freemarker/ext/ant/JythonAntTask.html" title="class in freemarker.ext.ant" target="classFrame">JythonAntTask</a></li>
 <li><a href="freemarker/ext/jython/JythonHashModel.html" title="class in freemarker.ext.jython" target="classFrame">JythonHashModel</a></li>
 <li><a href="freemarker/ext/jython/JythonModel.html" title="class in freemarker.ext.jython" target="classFrame">JythonModel</a></li>
@@ -101,6 +118,8 @@
 <li><a href="freemarker/log/Logger.html" title="class in freemarker.log" target="classFrame">Logger</a></li>
 <li><a href="freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template" target="classFrame">MalformedTemplateNameException</a></li>
 <li><a href="freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans" target="classFrame">MapModel</a></li>
+<li><a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core" target="classFrame">MarkupOutputFormat</a></li>
+<li><a href="freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache" target="classFrame">MergingTemplateConfigurationFactory</a></li>
 <li><a href="freemarker/ext/beans/MethodAppearanceFineTuner.html" title="interface in freemarker.ext.beans" target="classFrame"><span class="interfaceName">MethodAppearanceFineTuner</span></a></li>
 <li><a href="freemarker/ext/util/ModelCache.html" title="class in freemarker.ext.util" target="classFrame">ModelCache</a></li>
 <li><a href="freemarker/ext/util/ModelFactory.html" title="interface in freemarker.ext.util" target="classFrame"><span class="interfaceName">ModelFactory</span></a></li>
@@ -113,13 +132,16 @@
 <li><a href="freemarker/core/NonDateException.html" title="class in freemarker.core" target="classFrame">NonDateException</a></li>
 <li><a href="freemarker/core/NonExtendedHashException.html" title="class in freemarker.core" target="classFrame">NonExtendedHashException</a></li>
 <li><a href="freemarker/core/NonHashException.html" title="class in freemarker.core" target="classFrame">NonHashException</a></li>
+<li><a href="freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core" target="classFrame">NonMarkupOutputException</a></li>
 <li><a href="freemarker/core/NonMethodException.html" title="class in freemarker.core" target="classFrame">NonMethodException</a></li>
 <li><a href="freemarker/core/NonNodeException.html" title="class in freemarker.core" target="classFrame">NonNodeException</a></li>
 <li><a href="freemarker/core/NonNumericalException.html" title="class in freemarker.core" target="classFrame">NonNumericalException</a></li>
 <li><a href="freemarker/core/NonSequenceException.html" title="class in freemarker.core" target="classFrame">NonSequenceException</a></li>
 <li><a href="freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core" target="classFrame">NonSequenceOrCollectionException</a></li>
 <li><a href="freemarker/core/NonStringException.html" title="class in freemarker.core" target="classFrame">NonStringException</a></li>
+<li><a href="freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core" target="classFrame">NonStringOrTemplateOutputException</a></li>
 <li><a href="freemarker/template/utility/NormalizeNewlines.html" title="class in freemarker.template.utility" target="classFrame">NormalizeNewlines</a></li>
+<li><a href="freemarker/cache/NotMatcher.html" title="class in freemarker.cache" target="classFrame">NotMatcher</a></li>
 <li><a href="freemarker/template/utility/NullArgumentException.html" title="class in freemarker.template.utility" target="classFrame">NullArgumentException</a></li>
 <li><a href="freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache" target="classFrame">NullCacheStorage</a></li>
 <li><a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility" target="classFrame">NullWriter</a></li>
@@ -132,14 +154,22 @@
 <li><a href="freemarker/template/utility/ObjectWrapperWithAPISupport.html" title="interface in freemarker.template.utility" target="classFrame"><span class="interfaceName">ObjectWrapperWithAPISupport</span></a></li>
 <li><a href="freemarker/template/utility/OptimizerUtil.html" title="class in freemarker.template.utility" target="classFrame">OptimizerUtil</a></li>
 <li><a href="freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core" target="classFrame">OptInTemplateClassResolver</a></li>
+<li><a href="freemarker/cache/OrMatcher.html" title="class in freemarker.cache" target="classFrame">OrMatcher</a></li>
+<li><a href="freemarker/core/OutputFormat.html" title="class in freemarker.core" target="classFrame">OutputFormat</a></li>
 <li><a href="freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans" target="classFrame">OverloadedMethodsModel</a></li>
 <li><a href="freemarker/core/ParseException.html" title="class in freemarker.core" target="classFrame">ParseException</a></li>
+<li><a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core" target="classFrame"><span class="interfaceName">ParserConfiguration</span></a></li>
+<li><a href="freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core" target="classFrame">ParsingNotSupportedException</a></li>
+<li><a href="freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache" target="classFrame">PathGlobMatcher</a></li>
+<li><a href="freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache" target="classFrame">PathRegexMatcher</a></li>
+<li><a href="freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core" target="classFrame">PlainTextOutputFormat</a></li>
 <li><a href="freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template" target="classFrame">ResourceBundleLocalizedString</a></li>
 <li><a href="freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans" target="classFrame">ResourceBundleModel</a></li>
 <li><a href="freemarker/ext/rhino/RhinoFunctionModel.html" title="class in freemarker.ext.rhino" target="classFrame">RhinoFunctionModel</a></li>
 <li><a href="freemarker/ext/rhino/RhinoScriptableModel.html" title="class in freemarker.ext.rhino" target="classFrame">RhinoScriptableModel</a></li>
 <li><a href="freemarker/ext/rhino/RhinoWrapper.html" title="class in freemarker.ext.rhino" target="classFrame">RhinoWrapper</a></li>
 <li><a href="freemarker/template/utility/RichObjectWrapper.html" title="interface in freemarker.template.utility" target="classFrame"><span class="interfaceName">RichObjectWrapper</span></a></li>
+<li><a href="freemarker/core/RTFOutputFormat.html" title="class in freemarker.core" target="classFrame">RTFOutputFormat</a></li>
 <li><a href="freemarker/template/utility/SecurityUtilities.html" title="class in freemarker.template.utility" target="classFrame">SecurityUtilities</a></li>
 <li><a href="freemarker/ext/servlet/ServletContextHashModel.html" title="class in freemarker.ext.servlet" target="classFrame">ServletContextHashModel</a></li>
 <li><a href="freemarker/template/SimpleCollection.html" title="class in freemarker.template" target="classFrame">SimpleCollection</a></li>
@@ -174,17 +204,26 @@
 <li><a href="freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core" target="classFrame"><span class="interfaceName">TemplateClassResolver</span></a></li>
 <li><a href="freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateCollectionModel</span></a></li>
 <li><a href="freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateCollectionModelEx</span></a></li>
+<li><a href="freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateCombinedMarkupOutputModel</a></li>
+<li><a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core" target="classFrame">TemplateConfiguration</a></li>
+<li><a href="freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache" target="classFrame">TemplateConfigurationFactory</a></li>
+<li><a href="freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache" target="classFrame">TemplateConfigurationFactoryException</a></li>
+<li><a href="freemarker/core/TemplateDateFormat.html" title="class in freemarker.core" target="classFrame">TemplateDateFormat</a></li>
+<li><a href="freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core" target="classFrame">TemplateDateFormatFactory</a></li>
 <li><a href="freemarker/template/TemplateDateModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateDateModel</span></a></li>
 <li><a href="freemarker/template/TemplateDirectiveBody.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateDirectiveBody</span></a></li>
 <li><a href="freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateDirectiveModel</span></a></li>
 <li><a href="freemarker/template/TemplateException.html" title="class in freemarker.template" target="classFrame">TemplateException</a></li>
 <li><a href="freemarker/template/TemplateExceptionHandler.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateExceptionHandler</span></a></li>
+<li><a href="freemarker/core/TemplateFormatUtil.html" title="class in freemarker.core" target="classFrame">TemplateFormatUtil</a></li>
 <li><a href="freemarker/template/TemplateHashModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateHashModel</span></a></li>
 <li><a href="freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateHashModelEx</span></a></li>
+<li><a href="freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateHTMLOutputModel</a></li>
 <li><a href="freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache" target="classFrame"><span class="interfaceName">TemplateLoader</span></a></li>
 <li><a href="freemarker/cache/TemplateLookupContext.html" title="class in freemarker.cache" target="classFrame">TemplateLookupContext</a></li>
 <li><a href="freemarker/cache/TemplateLookupResult.html" title="class in freemarker.cache" target="classFrame">TemplateLookupResult</a></li>
 <li><a href="freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache" target="classFrame">TemplateLookupStrategy</a></li>
+<li><a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core" target="classFrame"><span class="interfaceName">TemplateMarkupOutputModel</span></a></li>
 <li><a href="freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateMethodModel</span></a></li>
 <li><a href="freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateMethodModelEx</span></a></li>
 <li><a href="freemarker/template/TemplateModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateModel</span></a></li>
@@ -196,17 +235,33 @@
 <li><a href="freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache" target="classFrame">TemplateNameFormat</a></li>
 <li><a href="freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateNodeModel</span></a></li>
 <li><a href="freemarker/template/TemplateNotFoundException.html" title="class in freemarker.template" target="classFrame">TemplateNotFoundException</a></li>
+<li><a href="freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core" target="classFrame">TemplateNumberFormat</a></li>
+<li><a href="freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core" target="classFrame">TemplateNumberFormatFactory</a></li>
 <li><a href="freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateNumberModel</span></a></li>
+<li><a href="freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateRTFOutputModel</a></li>
 <li><a href="freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateScalarModel</span></a></li>
 <li><a href="freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateSequenceModel</span></a></li>
+<li><a href="freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache" target="classFrame">TemplateSourceMatcher</a></li>
 <li><a href="freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TemplateTransformModel</span></a></li>
+<li><a href="freemarker/core/TemplateValueFormat.html" title="class in freemarker.core" target="classFrame">TemplateValueFormat</a></li>
+<li><a href="freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core" target="classFrame">TemplateValueFormatException</a></li>
+<li><a href="freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core" target="classFrame">TemplateValueFormatFactory</a></li>
+<li><a href="freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateXHTMLOutputModel</a></li>
+<li><a href="freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core" target="classFrame">TemplateXMLOutputModel</a></li>
 <li><a href="freemarker/template/utility/ToCanonical.html" title="class in freemarker.template.utility" target="classFrame">ToCanonical</a></li>
 <li><a href="freemarker/ext/dom/Transform.html" title="class in freemarker.ext.dom" target="classFrame">Transform</a></li>
 <li><a href="freemarker/template/TransformControl.html" title="interface in freemarker.template" target="classFrame"><span class="interfaceName">TransformControl</span></a></li>
 <li><a href="freemarker/template/utility/UndeclaredThrowableException.html" title="class in freemarker.template.utility" target="classFrame">UndeclaredThrowableException</a></li>
+<li><a href="freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core" target="classFrame">UndefinedCustomFormatException</a></li>
+<li><a href="freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core" target="classFrame">UndefinedOutputFormat</a></li>
 <li><a href="freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core" target="classFrame">UnexpectedTypeException</a></li>
+<li><a href="freemarker/core/UnformattableValueException.html" title="class in freemarker.core" target="classFrame">UnformattableValueException</a></li>
+<li><a href="freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core" target="classFrame">UnknownDateTypeFormattingUnsupportedException</a></li>
+<li><a href="freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core" target="classFrame">UnknownDateTypeParsingUnsupportedException</a></li>
 <li><a href="freemarker/ext/ant/UnlinkedJythonOperationsImpl.html" title="class in freemarker.ext.ant" target="classFrame">UnlinkedJythonOperationsImpl</a></li>
+<li><a href="freemarker/core/UnparsableValueException.html" title="class in freemarker.core" target="classFrame">UnparsableValueException</a></li>
 <li><a href="freemarker/template/utility/UnrecognizedTimeZoneException.html" title="class in freemarker.template.utility" target="classFrame">UnrecognizedTimeZoneException</a></li>
+<li><a href="freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core" target="classFrame">UnregisteredOutputFormatException</a></li>
 <li><a href="freemarker/template/utility/UnsupportedNumberClassException.html" title="class in freemarker.template.utility" target="classFrame">UnsupportedNumberClassException</a></li>
 <li><a href="freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache" target="classFrame">URLTemplateLoader</a></li>
 <li><a href="freemarker/template/Version.html" title="class in freemarker.template" target="classFrame">Version</a></li>
@@ -214,7 +269,9 @@
 <li><a href="freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util" target="classFrame"><span class="interfaceName">WrapperTemplateModel</span></a></li>
 <li><a href="freemarker/template/WrappingTemplateModel.html" title="class in freemarker.template" target="classFrame">WrappingTemplateModel</a></li>
 <li><a href="freemarker/template/utility/WriteProtectable.html" title="interface in freemarker.template.utility" target="classFrame"><span class="interfaceName">WriteProtectable</span></a></li>
+<li><a href="freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core" target="classFrame">XHTMLOutputFormat</a></li>
 <li><a href="freemarker/template/utility/XmlEscape.html" title="class in freemarker.template.utility" target="classFrame">XmlEscape</a></li>
+<li><a href="freemarker/core/XMLOutputFormat.html" title="class in freemarker.core" target="classFrame">XMLOutputFormat</a></li>
 <li><a href="freemarker/ext/dom/XPathSupport.html" title="interface in freemarker.ext.dom" target="classFrame"><span class="interfaceName">XPathSupport</span></a></li>
 </ul>
 </div>


[05/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/index-all.html
----------------------------------------------------------------------
diff --git a/docs/api/index-all.html b/docs/api/index-all.html
index 0ca8d58..4c8aab0 100644
--- a/docs/api/index-all.html
+++ b/docs/api/index-all.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>Index (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Index (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="Index (FreeMarker 2.3.23 API)";
+            parent.document.title="Index (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -144,12 +144,12 @@
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#addAutoImport-java.lang.String-java.lang.String-">addAutoImport(String, String)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>
 <div class="block">Adds an invisible <code>#import <i>templateName</i> as <i>namespaceVarName</i></code> at the beginning of all
- templates.</div>
+ top-level templates (that is, to all templates that weren't included/imported from another template).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#addAutoInclude-java.lang.String-">addAutoInclude(String)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>
 <div class="block">Adds an invisible <code>#include <i>templateName</i> as <i>namespaceVarName</i></code> at the beginning of all
- templates.</div>
+ top-level templates (that is, to all templates that weren't included/imported from another template).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/Debugger.html#addBreakpoint-freemarker.debug.Breakpoint-">addBreakpoint(Breakpoint)</a></span> - Method in interface freemarker.debug.<a href="freemarker/debug/Debugger.html" title="interface in freemarker.debug">Debugger</a></dt>
 <dd>
@@ -195,6 +195,24 @@
 <dd>
 <div class="block">Called after the body has been evaluated.</div>
 </dd>
+<dt><a href="freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">AliasTemplateDateFormatFactory</span></a> - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
+<dd>
+<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>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/AliasTemplateDateFormatFactory.html#AliasTemplateDateFormatFactory-java.lang.String-">AliasTemplateDateFormatFactory(String)</a></span> - Constructor for class freemarker.core.<a href="freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">AliasTemplateDateFormatFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/AliasTemplateDateFormatFactory.html#AliasTemplateDateFormatFactory-java.lang.String-java.util.Map-">AliasTemplateDateFormatFactory(String, Map&lt;Locale, String&gt;)</a></span> - Constructor for class freemarker.core.<a href="freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">AliasTemplateDateFormatFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">AliasTemplateNumberFormatFactory</span></a> - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
+<dd>
+<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>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/AliasTemplateNumberFormatFactory.html#AliasTemplateNumberFormatFactory-java.lang.String-">AliasTemplateNumberFormatFactory(String)</a></span> - Constructor for class freemarker.core.<a href="freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">AliasTemplateNumberFormatFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/AliasTemplateNumberFormatFactory.html#AliasTemplateNumberFormatFactory-java.lang.String-java.util.Map-">AliasTemplateNumberFormatFactory(String, Map&lt;Locale, String&gt;)</a></span> - Constructor for class freemarker.core.<a href="freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">AliasTemplateNumberFormatFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet"><span class="typeNameLink">AllHttpScopesHashModel</span></a> - Class in <a href="freemarker/ext/servlet/package-summary.html">freemarker.ext.servlet</a></dt>
 <dd>
 <div class="block">An extension of SimpleHash that looks up keys in the hash, then in the
@@ -205,10 +223,20 @@
 <div class="block">Creates a new instance of AllHttpScopesHashModel for handling a single 
  HTTP servlet request.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html#allowNoMatch-boolean-">allowNoMatch(boolean)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></dt>
+<dd>
+<div class="block">Same as <a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-"><code>FirstMatchTemplateConfigurationFactory.setAllowNoMatch(boolean)</code></a>, but return this object to support "fluent API" style.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/TemplateClassResolver.html#ALLOWS_NOTHING_RESOLVER">ALLOWS_NOTHING_RESOLVER</a></span> - Static variable in interface freemarker.core.<a href="freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core">TemplateClassResolver</a></dt>
 <dd>
 <div class="block">Doesn't allow resolving any classes.</div>
 </dd>
+<dt><a href="freemarker/cache/AndMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">AndMatcher</span></a> - Class in <a href="freemarker/cache/package-summary.html">freemarker.cache</a></dt>
+<dd>
+<div class="block">Logical "and" operation among the given matchers.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/AndMatcher.html#AndMatcher-freemarker.cache.TemplateSourceMatcher...-">AndMatcher(TemplateSourceMatcher...)</a></span> - Constructor for class freemarker.cache.<a href="freemarker/cache/AndMatcher.html" title="class in freemarker.cache">AndMatcher</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#ANGLE_BRACKET_TAG_SYNTAX">ANGLE_BRACKET_TAG_SYNTAX</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY">API_BUILTIN_ENABLED_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
@@ -223,6 +251,17 @@
 <dd>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/utility/NullWriter.html#append-java.lang.CharSequence-">append(CharSequence)</a></span> - Method in class freemarker.template.utility.<a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility">NullWriter</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/utility/NullWriter.html#append-java.lang.CharSequence-int-int-">append(CharSequence, int, int)</a></span> - Method in class freemarker.template.utility.<a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility">NullWriter</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/utility/NullWriter.html#append-char-">append(char)</a></span> - Method in class freemarker.template.utility.<a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility">NullWriter</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#apply-freemarker.template.Template-">apply(Template)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
+<dd>
+<div class="block">Sets the settings of the <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> which are not yet set in the <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a> and are set in this
+ <a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, leaves the other settings as is.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#applyEqualsOperator-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyEqualsOperator(TemplateModel, TemplateModel)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
 <div class="block">Compares two <a href="freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s according the rules of the FTL "==" operator.</div>
@@ -230,7 +269,7 @@
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#applyEqualsOperatorLenient-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyEqualsOperatorLenient(TemplateModel, TemplateModel)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
 <div class="block">Compares two <a href="freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s according the rules of the FTL "==" operator, except that if the two types
-     are incompatible, they are treated as non-equal instead of throwing an exception.</div>
+ are incompatible, they are treated as non-equal instead of throwing an exception.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#applyGreaterThanOperator-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyGreaterThanOperator(TemplateModel, TemplateModel)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
@@ -300,6 +339,18 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_DETECT_TAG_SYNTAX">AUTO_DETECT_TAG_SYNTAX</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY">AUTO_ESCAPING_POLICY_KEY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY_CAMEL_CASE">AUTO_ESCAPING_POLICY_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY_SNAKE_CASE">AUTO_ESCAPING_POLICY_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#AUTO_FLUSH_KEY">AUTO_FLUSH_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
@@ -481,6 +532,12 @@
 <dd>
 <div class="block">Returns a <a href="freemarker/template/DefaultObjectWrapper.html" title="class in freemarker.template"><code>DefaultObjectWrapper</code></a> instance that matches the settings of this builder.</div>
 </dd>
+<dt><a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">ByteArrayTemplateLoader</span></a> - Class in <a href="freemarker/cache/package-summary.html">freemarker.cache</a></dt>
+<dd>
+<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>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/ByteArrayTemplateLoader.html#ByteArrayTemplateLoader--">ByteArrayTemplateLoader()</a></span> - Constructor for class freemarker.cache.<a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:C">
 <!--   -->
@@ -543,12 +600,26 @@
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/FileExtensionMatcher.html#caseInsensitive-boolean-">caseInsensitive(boolean)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></dt>
+<dd>
+<div class="block">Fluid API variation of <a href="freemarker/cache/FileExtensionMatcher.html#setCaseInsensitive-boolean-"><code>FileExtensionMatcher.setCaseInsensitive(boolean)</code></a></div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/FileNameGlobMatcher.html#caseInsensitive-boolean-">caseInsensitive(boolean)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></dt>
+<dd>
+<div class="block">Fluid API variation of <a href="freemarker/cache/FileNameGlobMatcher.html#setCaseInsensitive-boolean-"><code>FileNameGlobMatcher.setCaseInsensitive(boolean)</code></a></div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/PathGlobMatcher.html#caseInsensitive-boolean-">caseInsensitive(boolean)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a></dt>
+<dd>
+<div class="block">Fluid API variation of <a href="freemarker/cache/PathGlobMatcher.html#setCaseInsensitive-boolean-"><code>PathGlobMatcher.setCaseInsensitive(boolean)</code></a></div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/NullArgumentException.html#check-java.lang.String-java.lang.Object-">check(String, Object)</a></span> - Static method in exception freemarker.template.utility.<a href="freemarker/template/utility/NullArgumentException.html" title="class in freemarker.template.utility">NullArgumentException</a></dt>
 <dd>
 <div class="block">Convenience method to protect against a <code>null</code> argument.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/NullArgumentException.html#check-java.lang.Object-">check(Object)</a></span> - Static method in exception freemarker.template.utility.<a href="freemarker/template/utility/NullArgumentException.html" title="class in freemarker.template.utility">NullArgumentException</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateFormatUtil.html#checkHasNoParameters-java.lang.String-">checkHasNoParameters(String)</a></span> - Static method in class freemarker.core.<a href="freemarker/core/TemplateFormatUtil.html" title="class in freemarker.core">TemplateFormatUtil</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/BeansWrapper.html#checkModifiable--">checkModifiable()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans">BeansWrapper</a></dt>
 <dd>
 <div class="block">If this object is already read-only according to <a href="freemarker/template/utility/WriteProtectable.html" title="interface in freemarker.template.utility"><code>WriteProtectable</code></a>, throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalStateException.html?is-external=true" title="class or interface in java.lang"><code>IllegalStateException</code></a>,
@@ -556,7 +627,7 @@
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/StringUtil.html#chomp-java.lang.String-">chomp(String)</a></span> - Static method in class freemarker.template.utility.<a href="freemarker/template/utility/StringUtil.html" title="class in freemarker.template.utility">StringUtil</a></dt>
 <dd>
-<div class="block">Removes the line-break from the end of the string.</div>
+<div class="block">Removes a line-break from the end of the string (if there's any).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY">CLASSIC_COMPATIBLE_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
@@ -656,6 +727,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/NullWriter.html#close--">close()</a></span> - Method in class freemarker.template.utility.<a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility">NullWriter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/ByteArrayTemplateLoader.html#closeTemplateSource-java.lang.Object-">closeTemplateSource(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/FileTemplateLoader.html#closeTemplateSource-java.lang.Object-">closeTemplateSource(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/MultiTemplateLoader.html#closeTemplateSource-java.lang.Object-">closeTemplateSource(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a></dt>
@@ -703,6 +776,17 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ParseException.html#columnNumber">columnNumber</a></span> - Variable in exception freemarker.core.<a href="freemarker/core/ParseException.html" title="class in freemarker.core">ParseException</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CombinedMarkupOutputFormat</span></a> - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
+<dd>
+<div class="block">Represents two markup formats nested into each other.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat(MarkupOutputFormat, MarkupOutputFormat)</a></span> - Constructor for class freemarker.core.<a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></dt>
+<dd>
+<div class="block">Same as <a href="freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-"><code>CombinedMarkupOutputFormat.CombinedMarkupOutputFormat(String, MarkupOutputFormat, MarkupOutputFormat)</code></a> with <code>null</code> as
+ the <code>name</code> parameter.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat(String, MarkupOutputFormat, MarkupOutputFormat)</a></span> - Constructor for class freemarker.core.<a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="freemarker/core/CommandLine.html" title="class in freemarker.core"><span class="typeNameLink">CommandLine</span></a> - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
@@ -713,6 +797,22 @@
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
+<dt><a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CommonMarkupOutputFormat</span></a>&lt;<a href="freemarker/core/CommonMarkupOutputFormat.html" title="type parameter in CommonMarkupOutputFormat">MO</a> extends <a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt; - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
+<dd>
+<div class="block">Common superclass for implementing <a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
+ subclass.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CommonMarkupOutputFormat.html#CommonMarkupOutputFormat--">CommonMarkupOutputFormat()</a></span> - Constructor for class freemarker.core.<a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">CommonTemplateMarkupOutputModel</span></a>&lt;<a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="type parameter in CommonTemplateMarkupOutputModel">MO</a> extends <a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="type parameter in CommonTemplateMarkupOutputModel">MO</a>&gt;&gt; - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
+<dd>
+<div class="block">Common superclass for implementing <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
+ <a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CommonTemplateMarkupOutputModel.html#CommonTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonTemplateMarkupOutputModel(String, String)</a></span> - Constructor for class freemarker.core.<a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a></dt>
+<dd>
+<div class="block">A least one of the parameters must be non-<code>null</code>!</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ArithmeticEngine.BigDecimalEngine.html#compareNumbers-java.lang.Number-java.lang.Number-">compareNumbers(Number, Number)</a></span> - Method in class freemarker.core.<a href="freemarker/core/ArithmeticEngine.BigDecimalEngine.html" title="class in freemarker.core">ArithmeticEngine.BigDecimalEngine</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ArithmeticEngine.html#compareNumbers-java.lang.Number-java.lang.Number-">compareNumbers(Number, Number)</a></span> - Method in class freemarker.core.<a href="freemarker/core/ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></dt>
@@ -721,11 +821,27 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/Breakpoint.html#compareTo-java.lang.Object-">compareTo(Object)</a></span> - Method in class freemarker.debug.<a href="freemarker/debug/Breakpoint.html" title="class in freemarker.debug">Breakpoint</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat(MO, MO)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/MarkupOutputFormat.html#concat-MO-MO-">concat(MO, MO)</a></span> - Method in class freemarker.core.<a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></dt>
+<dd>
+<div class="block">Returns a <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> that contains the content of both <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>
+ objects concatenated.</div>
+</dd>
 <dt><a href="freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache"><span class="typeNameLink">ConcurrentCacheStorage</span></a> - Interface in <a href="freemarker/cache/package-summary.html">freemarker.cache</a></dt>
 <dd>
 <div class="block">An optional interface for cache storage that knows whether it can be 
  concurrently accessible without synchronization.</div>
 </dd>
+<dt><a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">ConditionalTemplateConfigurationFactory</span></a> - Class in <a href="freemarker/cache/package-summary.html">freemarker.cache</a></dt>
+<dd>
+<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>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html#ConditionalTemplateConfigurationFactory-freemarker.cache.TemplateSourceMatcher-freemarker.cache.TemplateConfigurationFactory-">ConditionalTemplateConfigurationFactory(TemplateSourceMatcher, TemplateConfigurationFactory)</a></span> - Constructor for class freemarker.cache.<a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache">ConditionalTemplateConfigurationFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html#ConditionalTemplateConfigurationFactory-freemarker.cache.TemplateSourceMatcher-freemarker.core.TemplateConfiguration-">ConditionalTemplateConfigurationFactory(TemplateSourceMatcher, TemplateConfiguration)</a></span> - Constructor for class freemarker.cache.<a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache">ConditionalTemplateConfigurationFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="freemarker/core/Configurable.html" title="class in freemarker.core"><span class="typeNameLink">Configurable</span></a> - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
 <dd>
 <div class="block">This is a common superclass of <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>,
@@ -900,10 +1016,38 @@
 <dd>
 <div class="block">Create the template loader.</div>
 </dd>
+<dt><a href="freemarker/core/CSSOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CSSOutputFormat</span></a> - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
+<dd>
+<div class="block">Represents the CSS output format (MIME type "text/css", name "CSS").</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ParseException.html#currentToken">currentToken</a></span> - Variable in exception freemarker.core.<a href="freemarker/core/ParseException.html" title="class in freemarker.core">ParseException</a></dt>
 <dd>
 <div class="block">This is the last token that has been consumed successfully.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY">CUSTOM_DATE_FORMATS_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY">CUSTOM_NUMBER_FORMATS_KEY</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</a></span> - Static variable in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</dd>
 <dt><a href="freemarker/core/CustomAttribute.html" title="class in freemarker.core"><span class="typeNameLink">CustomAttribute</span></a> - Class in <a href="freemarker/core/package-summary.html">freemarker.core</a></dt>
 <dd>
 <div class="block">A class that allows one to associate custom data with a <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>, a <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>, or
@@ -1038,7 +1182,8 @@
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/servlet/FreemarkerServlet.html#deduceLocale-java.lang.String-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">deduceLocale(String, HttpServletRequest, HttpServletResponse)</a></span> - Method in class freemarker.ext.servlet.<a href="freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet">FreemarkerServlet</a></dt>
 <dd>
-<div class="block">Returns the locale used for the <a href="freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-"><code>Configuration.getTemplate(String, Locale)</code></a> call.</div>
+<div class="block">Returns the locale used for the <a href="freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-"><code>Configuration.getTemplate(String, Locale)</code></a> call (as far as the
+ <a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_LOCALE">"OverrideResponseLocale"</a> Servlet init-param allows that).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/StringUtil.html#deduceLocale-java.lang.String-">deduceLocale(String)</a></span> - Static method in class freemarker.template.utility.<a href="freemarker/template/utility/StringUtil.html" title="class in freemarker.template.utility">StringUtil</a></dt>
 <dd>&nbsp;</dd>
@@ -1181,6 +1326,10 @@
 <div class="block">Gives information about the place where a directive is called from, also lets you attach a custom data object to that
  place.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#DISABLE_AUTO_ESCAPING_POLICY">DISABLE_AUTO_ESCAPING_POLICY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Don't enable auto-escaping, regardless of what the <a href="freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> is.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ArithmeticEngine.BigDecimalEngine.html#divide-java.lang.Number-java.lang.Number-">divide(Number, Number)</a></span> - Method in class freemarker.core.<a href="freemarker/core/ArithmeticEngine.BigDecimalEngine.html" title="class in freemarker.core">ArithmeticEngine.BigDecimalEngine</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ArithmeticEngine.ConservativeEngine.html#divide-java.lang.Number-java.lang.Number-">divide(Number, Number)</a></span> - Method in class freemarker.core.<a href="freemarker/core/ArithmeticEngine.ConservativeEngine.html" title="class in freemarker.core">ArithmeticEngine.ConservativeEngine</a></dt>
@@ -1251,6 +1400,15 @@
 <dd>
 <div class="block">Converts a 0-length string to null, leaves the string as is otherwise.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY">ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Enable auto-escaping if the output format supports it and <a href="freemarker/core/MarkupOutputFormat.html#isAutoEscapedByDefault--"><code>MarkupOutputFormat.isAutoEscapedByDefault()</code></a> is
+ <code>true</code>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#ENABLE_IF_SUPPORTED_AUTO_ESCAPING_POLICY">ENABLE_IF_SUPPORTED_AUTO_ESCAPING_POLICY</a></span> - Static variable in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Enable auto-escaping if the <a href="freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> supports it.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/TransformControl.html#END_EVALUATION">END_EVALUATION</a></span> - Static variable in interface freemarker.template.<a href="freemarker/template/TransformControl.html" title="interface in freemarker.template">TransformControl</a></dt>
 <dd>
 <div class="block">Constant returned from <a href="freemarker/template/TransformControl.html#afterBody--"><code>TransformControl.afterBody()</code></a> that tells the
@@ -1319,6 +1477,21 @@
 <dd>
 <div class="block">Logs an error message with accompanying throwable.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CombinedMarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/HTMLOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></dt>
+<dd>
+<div class="block">Should give the same result as <a href="freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/RTFOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/XHTMLOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/XMLOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/TransformControl.html#EVALUATE_BODY">EVALUATE_BODY</a></span> - Static variable in interface freemarker.template.<a href="freemarker/template/TransformControl.html" title="interface in freemarker.template">TransformControl</a></dt>
 <dd>
 <div class="block">Constant returned from <a href="freemarker/template/TransformControl.html#onStart--"><code>TransformControl.onStart()</code></a> that tells the
@@ -1449,6 +1622,19 @@
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/Constants.html#FALSE">FALSE</a></span> - Static variable in class freemarker.template.utility.<a href="freemarker/template/utility/Constants.html" title="class in freemarker.template.utility">Constants</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">FileExtensionMatcher</span></a> - Class in <a href="freemarker/cache/package-summary.html">freemarker.cache</a></dt>
+<dd>
+<div class="block">Matches the file extension; unlike other matchers, by default case <em>insensitive</em>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/FileExtensionMatcher.html#FileExtensionMatcher-java.lang.String-">FileExtensionMatcher(String)</a></span> - Constructor for class freemarker.cache.<a href="freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">FileNameGlobMatcher</span></a> - Class in <a href="freemarker/cache/package-summary.html">freemarker.cache</a></dt>
+<dd>
+<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>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/FileNameGlobMatcher.html#FileNameGlobMatcher-java.lang.String-">FileNameGlobMatcher(String)</a></span> - Constructor for class freemarker.cache.<a href="freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">FileTemplateLoader</span></a> - Class in <a href="freemarker/cache/package-summary.html">freemarker.cache</a></dt>
 <dd>
 <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>
@@ -1476,6 +1662,8 @@
  its last argument was <code>false</code>; makes the instance read-only if necessary, then registers the model
  factories in the class introspector.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/ByteArrayTemplateLoader.html#findTemplateSource-java.lang.String-">findTemplateSource(String)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/FileTemplateLoader.html#findTemplateSource-java.lang.String-">findTemplateSource(String)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/MultiTemplateLoader.html#findTemplateSource-java.lang.String-">findTemplateSource(String)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a></dt>
@@ -1501,12 +1689,32 @@
      called anymore.</span></div>
 </div>
 </dd>
+<dt><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">FirstMatchTemplateConfigurationFactory</span></a> - Class in <a href="freemarker/cache/package-summary.html">freemarker.cache</a></dt>
+<dd>
+<div class="block">Returns the first non-<code>null</code> result of the child factories, ignoring all further child factories.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html#FirstMatchTemplateConfigurationFactory-freemarker.cache.TemplateConfigurationFactory...-">FirstMatchTemplateConfigurationFactory(TemplateConfigurationFactory...)</a></span> - Constructor for class freemarker.cache.<a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/NullWriter.html#flush--">flush()</a></span> - Method in class freemarker.template.utility.<a href="freemarker/template/utility/NullWriter.html" title="class in freemarker.template.utility">NullWriter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateDateFormat.html#format-freemarker.template.TemplateDateModel-">format(TemplateDateModel)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></dt>
+<dd>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateNumberFormat.html#format-freemarker.template.TemplateNumberModel-">format(TemplateNumberModel)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></dt>
+<dd>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/ResourceBundleModel.html#format-java.lang.String-java.lang.Object:A-">format(String, Object[])</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a></dt>
 <dd>
 <div class="block">Provides direct access to caching format engine from code (instead of from script).</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-">formatToPlainText(TemplateDateModel)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-">formatToPlainText(TemplateNumberModel)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/ClassUtil.html#forName-java.lang.String-">forName(String)</a></span> - Static method in class freemarker.template.utility.<a href="freemarker/template/utility/ClassUtil.html" title="class in freemarker.template.utility">ClassUtil</a></dt>
 <dd>
 <div class="block">Similar to <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true#forName-java.lang.String-" title="class or interface in java.lang"><code>Class.forName(java.lang.String)</code></a>, but attempts to load
@@ -1624,6 +1832,20 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Constructor creates the SAXBuilder.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></dt>
+<dd>
+<div class="block">Wraps 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"><code>String</code></a> that's already markup to <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> interface, to indicate its
+ format.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></dt>
+<dd>
+<div class="block">Converts 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"><code>String</code></a> that's assumed to be plain text to <a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
+ special characters in the plain text.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/utility/StringUtil.html#ftlQuote-java.lang.String-">ftlQuote(String)</a></span> - Static method in class freemarker.template.utility.<a href="freemarker/template/utility/StringUtil.html" title="class in freemarker.template.utility">StringUtil</a></dt>
 <dd>
 <div class="block">Creates a <em>quoted</em> FTL string literal from a string, using escaping where necessary.</div>
@@ -1649,6 +1871,12 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dl>
 <dt><span class="memberNameLink"><a href="freemarker/cache/CacheStorage.html#get-java.lang.Object-">get(Object)</a></span> - Method in interface freemarker.cache.<a href="freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">get(String, Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache">ConditionalTemplateConfigurationFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">get(String, Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/MergingTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">get(String, Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache">MergingTemplateConfigurationFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/MruCacheStorage.html#get-java.lang.Object-">get(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/MruCacheStorage.html" title="class in freemarker.cache">MruCacheStorage</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/NullCacheStorage.html#get-java.lang.Object-">get(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache">NullCacheStorage</a></dt>
@@ -1657,6 +1885,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/StrongCacheStorage.html#get-java.lang.Object-">get(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/StrongCacheStorage.html" title="class in freemarker.cache">StrongCacheStorage</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">get(String, Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></dt>
+<dd>
+<div class="block">Returns (maybe creates) the <a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+</dd>
+<dt><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(String, int, Locale, TimeZone, boolean, Environment)</a></span> - Method in class freemarker.core.<a href="freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">AliasTemplateDateFormatFactory</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/AliasTemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-freemarker.core.Environment-">get(String, Locale, Environment)</a></span> - Method in class freemarker.core.<a href="freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">AliasTemplateNumberFormatFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/CustomAttribute.html#get-freemarker.core.Environment-">get(Environment)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CustomAttribute.html" title="class in freemarker.core">CustomAttribute</a></dt>
 <dd>
 <div class="block">Gets the attribute from the appropriate scope that's accessible through the specified <a href="freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>.</div>
@@ -1669,10 +1905,22 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Gets the value of a <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-scope attribute from the given <a href="freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CustomAttribute.html#get-freemarker.core.TemplateConfiguration-">get(TemplateConfiguration)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CustomAttribute.html" title="class in freemarker.core">CustomAttribute</a></dt>
+<dd>
+<div class="block">Same as <a href="freemarker/core/CustomAttribute.html#get-freemarker.template.Template-"><code>CustomAttribute.get(Template)</code></a>, but applies to a <a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/CustomAttribute.html#get-freemarker.template.Configuration-">get(Configuration)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CustomAttribute.html" title="class in freemarker.core">CustomAttribute</a></dt>
 <dd>
 <div class="block">Gets the value of a <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>-scope attribute from the given <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateDateFormatFactory.html#get-java.lang.String-int-java.util.Locale-java.util.TimeZone-boolean-freemarker.core.Environment-">get(String, int, Locale, TimeZone, boolean, Environment)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></dt>
+<dd>
+<div class="block">Returns a formatter for the given parameters.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-freemarker.core.Environment-">get(String, Locale, Environment)</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></dt>
+<dd>
+<div class="block">Returns a formatter for the given parameters.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/DebugModel.html#get-int-">get(int)</a></span> - Method in interface freemarker.debug.<a href="freemarker/debug/DebugModel.html" title="interface in freemarker.debug">DebugModel</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/DebugModel.html#get-int-int-">get(int, int)</a></span> - Method in interface freemarker.debug.<a href="freemarker/debug/DebugModel.html" title="interface in freemarker.debug">DebugModel</a></dt>
@@ -1822,6 +2070,10 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/DefaultNonListCollectionAdapter.html#getAdaptedObject-java.lang.Class-">getAdaptedObject(Class)</a></span> - Method in class freemarker.template.<a href="freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html#getAllowNoMatch--">getAllowNoMatch()</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a></dt>
+<dd>
+<div class="block">Getter pair of <a href="freemarker/cache/FirstMatchTemplateConfigurationFactory.html#setAllowNoMatch-boolean-"><code>FirstMatchTemplateConfigurationFactory.setAllowNoMatch(boolean)</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/BeanModel.html#getAPI--">getAPI()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans">BeanModel</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/SimpleMapModel.html#getAPI--">getAPI()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a></dt>
@@ -1840,6 +2092,10 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">The getter pair of <a href="freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-"><code>Configurable.setArithmeticEngine(ArithmeticEngine)</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/ParserConfiguration.html#getArithmeticEngine--">getArithmeticEngine()</a></span> - Method in interface freemarker.core.<a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></dt>
+<dd>
+<div class="block">Overlaps with <a href="freemarker/core/Configurable.html#getArithmeticEngine--"><code>Configurable.getArithmeticEngine()</code></a>; the parser needs this for creating numerical literals.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/DebugModel.html#getAsBoolean--">getAsBoolean()</a></span> - Method in interface freemarker.debug.<a href="freemarker/debug/DebugModel.html" title="interface in freemarker.debug">DebugModel</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/BooleanModel.html#getAsBoolean--">getAsBoolean()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans">BooleanModel</a></dt>
@@ -1923,6 +2179,22 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Getter pair of <a href="freemarker/cache/WebappTemplateLoader.html#setAttemptFileAccess-boolean-"><code>WebappTemplateLoader.setAttemptFileAccess(boolean)</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Template.html#getAutoEscaping--">getAutoEscaping()</a></span> - Method in class freemarker.template.<a href="freemarker/template/Template.html" title="class in freemarker.template">Template</a></dt>
+<dd>
+<div class="block">Returns if the template actually uses auto-escaping (see <a href="freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a>).</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/ParserConfiguration.html#getAutoEscapingPolicy--">getAutoEscapingPolicy()</a></span> - Method in interface freemarker.core.<a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></dt>
+<dd>
+<div class="block">See <a href="freemarker/template/Configuration.html#getAutoEscapingPolicy--"><code>Configuration.getAutoEscapingPolicy()</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#getAutoEscapingPolicy--">getAutoEscapingPolicy()</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
+<dd>
+<div class="block">The getter pair of <a href="freemarker/core/TemplateConfiguration.html#setAutoEscapingPolicy-int-"><code>TemplateConfiguration.setAutoEscapingPolicy(int)</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#getAutoEscapingPolicy--">getAutoEscapingPolicy()</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
+<dd>
+<div class="block">Getter pair of <a href="freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a></div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getAutoFlush--">getAutoFlush()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
 <dd>
 <div class="block">See <a href="freemarker/core/Configurable.html#setAutoFlush-boolean-"><code>Configurable.setAutoFlush(boolean)</code></a></div>
@@ -2016,6 +2288,11 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">1-based column number of the failing section, or <code>null</code> if the information is not available.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/TemplateConfigurationFactory.html#getConfiguration--">getConfiguration()</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></dt>
+<dd>
+<div class="block">Returns the configuration this object belongs to, or <code>null</code> if it isn't yet bound to a
+ <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getConfiguration--">getConfiguration()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/servlet/FreemarkerServlet.html#getConfiguration--">getConfiguration()</a></span> - Method in class freemarker.ext.servlet.<a href="freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet">FreemarkerServlet</a></dt>
@@ -2063,6 +2340,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <div class="block">Returns an array with names of all custom attributes defined directly 
  on this configurable.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getCustomDateFormat-java.lang.String-">getCustomDateFormat(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Gets the custom name format registered for the name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getCustomDateFormats--">getCustomDateFormats()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Getter pair of <a href="freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-"><code>Configurable.setCustomDateFormats(Map)</code></a>; do not modify the returned <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>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/TemplateLookupContext.html#getCustomLookupCondition--">getCustomLookupCondition()</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/TemplateLookupContext.html" title="class in freemarker.cache">TemplateLookupContext</a></dt>
 <dd>
 <div class="block">Returns the value of the <code>customLookupCondition</code> parameter of
@@ -2077,6 +2362,19 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">The custom lookup condition with which the template was requested, or <code>null</code> if there's no such condition.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getCustomNumberFormat-java.lang.String-">getCustomNumberFormat(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Gets the custom name format registered for the name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Configurable.html#getCustomNumberFormats--">getCustomNumberFormats()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></dt>
+<dd>
+<div class="block">Getter pair of <a href="freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>Configurable.setCustomNumberFormats(Map)</code></a>;  do not modify the returned <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>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getCustomState-java.lang.Object-">getCustomState(Object)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
+<dd>
+<div class="block">Returns the value of a custom state variable, or <code>null</code> if it's missing; see
+ <a href="freemarker/core/Environment.html#setCustomState-java.lang.Object-java.lang.Object-"><code>Environment.setCustomState(Object, Object)</code></a> for more.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getDataModel--">getDataModel()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
 <div class="block">Returns the data-model (also known as the template context in some other template engines).</div>
@@ -2150,11 +2448,19 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <div class="block"><span class="deprecationComment">Don't depend on this object, as it can be replace by anybody in the same JVM.</span></div>
 </div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/ext/servlet/FreemarkerServlet.html#getDefaultOverrideResponseContentType--">getDefaultOverrideResponseContentType()</a></span> - Method in class freemarker.ext.servlet.<a href="freemarker/ext/servlet/FreemarkerServlet.html" title="class in freemarker.ext.servlet">FreemarkerServlet</a></dt>
+<dd>
+<div class="block">Returns the default value of the <a href="freemarker/ext/servlet/FreemarkerServlet.html#INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE">"OverrideResponseContentType"</a> Servlet init-param.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/TemplateCache.html#getDelay--">getDelay()</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/TemplateCache.html" title="class in freemarker.cache">TemplateCache</a></dt>
 <dd>
 <div class="block">Gets the delay in milliseconds between checking for newer versions of a
  template source.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateValueFormat.html#getDescription--">getDescription()</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></dt>
+<dd>
+<div class="block">Meant to be used in error messages to tell what format the parsed string didn't fit.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/dom/NodeModel.html#getDocumentBuilderFactory--">getDocumentBuilderFactory()</a></span> - Static method in class freemarker.ext.dom.<a href="freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ParseException.html#getEditorMessage--">getEditorMessage()</a></span> - Method in exception freemarker.core.<a href="freemarker/core/ParseException.html" title="class in freemarker.core">ParseException</a></dt>
@@ -2170,6 +2476,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Returns the default of <a href="freemarker/cache/FileTemplateLoader.html#getEmulateCaseSensitiveFileSystem--"><code>FileTemplateLoader.getEmulateCaseSensitiveFileSystem()</code></a>.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#getEncoding--">getEncoding()</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#getEncoding-java.util.Locale-">getEncoding(Locale)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>
 <div class="block">Gets the preferred character encoding for the given locale, or the 
@@ -2263,8 +2571,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getGlobalNamespace--">getGlobalNamespace()</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
-<div class="block">Returns the name-space that contains the globally visible non-data-model variables
- (usually created with <code>&amp;lt;#global ...&amp;gt;</code>).</div>
+<div class="block">Returns the name-space that contains the globally visible non-data-model variables (usually created with
+ <code>&amp;lt;#global ...&amp;gt;</code>).</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getGlobalVariable-java.lang.String-">getGlobalVariable(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
@@ -2290,6 +2598,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <div class="block"><span class="deprecationComment">Use <a href="freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a> instead.</span></div>
 </div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/ParserConfiguration.html#getIncompatibleImprovements--">getIncompatibleImprovements()</a></span> - Method in interface freemarker.core.<a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></dt>
+<dd>
+<div class="block">See <a href="freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/TemplateConfiguration.html#getIncompatibleImprovements--">getIncompatibleImprovements()</a></span> - Method in class freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dt>
+<dd>
+<div class="block">Returns <a href="freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a> from the parent <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/BeansWrapper.html#getIncompatibleImprovements--">getIncompatibleImprovements()</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans">BeansWrapper</a></dt>
 <dd>
 <div class="block">Returns the version given with <a href="freemarker/ext/beans/BeansWrapper.html#BeansWrapper-freemarker.template.Version-"><code>BeansWrapper.BeansWrapper(Version)</code></a>, normalized to the lowest version where a change
@@ -2299,6 +2615,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Configuration.html#getIncompatibleImprovements--">getIncompatibleImprovements()</a></span> - Method in class freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CombinedMarkupOutputFormat.html#getInnerOutputFormat--">getInnerOutputFormat()</a></span> - Method in class freemarker.core.<a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/ext/beans/BeansWrapper.html#getInstance-java.lang.Object-freemarker.ext.util.ModelFactory-">getInstance(Object, ModelFactory)</a></span> - Method in class freemarker.ext.beans.<a href="freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans">BeansWrapper</a></dt>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>
@@ -2313,6 +2631,8 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">Returns a set of variable names that are known at the time of call.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/cache/ByteArrayTemplateLoader.html#getLastModified-java.lang.Object-">getLastModified(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/FileTemplateLoader.html#getLastModified-java.lang.Object-">getLastModified(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/cache/MultiTemplateLoader.html#getLastModified-java.lang.Object-">getLastModified(Object)</a></span> - Method in class freemarker.cache.<a href="freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a></dt>
@@ -2363,8 +2683,7 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/Environment.html#getLocalVariable-java.lang.String-">getLocalVariable(String)</a></span> - Method in class freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></dt>
 <dd>
-<div class="block">Returns the loop or macro local variable corresponding to this
- variable name.</div>
+<div class="block">Returns the loop or macro local variable corresponding to this variable name.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/Breakpoint.html#getLocationString--">getLocationString()</a></span> - Method in class freemarker.debug.<a href="freemarker/debug/Breakpoint.html" title="class in freemarker.debug">Breakpoint</a></dt>
 <dd>
@@ -2398,6 +2717,12 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 </dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/MalformedTemplateNameException.html#getMalformednessDescription--">getMalformednessDescription()</a></span> - Method in exception freemarker.template.<a href="freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template">MalformedTemplateNameException</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString(MO)</a></span> - Method in class freemarker.core.<a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-">getMarkupString(MO)</a></span> - Method in class freemarker.core.<a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></dt>
+<dd>
+<div class="block">Returns the content as markup text; never <code>null</code>.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="freemarker/core/ParseException.html#getMessage--">getMessage()</a></span> - Method in exception freemarker.core.<a href="freemarker/core/ParseException.html" title="class in freemarker.core">ParseException</a></dt>
 <dd>
 <div class="block">Returns the error location plus the error description.</div>
@@ -2427,6 +2752,30 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>
 <div class="block">The 3rd version number, like 3 in "1.2.3".</div>
 </dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CombinedMarkupOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CSSOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/HTMLOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/JavaScriptOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/JSONOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/OutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></dt>
+<dd>
+<div class="block">Returns the MIME type of the output format.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/PlainTextOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/RTFOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/UndefinedOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/XHTMLOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/XMLOutputFormat.html#getMimeType--">getMimeType()</a></span> - Method in class freemarker.core.<a href="freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Version.html#getMinor--">getMinor()</a></span> - Method in class freemarker.template.<a href="freemarker/template/Version.html" title="class in freemarker.template">Version</a></dt>
 <dd>
 <div class="block">The 2nd version number, like 2 in "1.2.3".</div>
@@ -2445,6 +2794,30 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/DebugModel.html#getModelTypes--">getModelTypes()</a></span> - Method in interface freemarker.debug.<a href="freemarker/debug/DebugModel.html" title="interface in freemarker.debug">DebugModel</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CombinedMarkupOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/CSSOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/HTMLOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/JavaScriptOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/JSONOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/OutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></dt>
+<dd>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/PlainTextOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/RTFOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/UndefinedOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/XHTMLOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="freemarker/core/XMLOutputFormat.html#getName--">getName()</a></span> - Method in class freemarker.core.<a href="freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/debug/EnvironmentSuspendedEvent.html#getName--">getName()</a></span> - Method in class freemarker.debug.<a href="freemarker/debug/EnvironmentSuspendedEvent.html" title="class in freemarker.debug">EnvironmentSuspendedEvent</a></dt>
 <dd>
 <div class="block">The name of the template where the execution of the environment
@@ -2463,6 +2836,14 @@ start with <a href="freemarker/template/Configuration.html" title="class in free
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="freemarker/template/Template.html#getNamespaceForPrefix-java.lang.String-">getNamespaceForPrefix(String)</a></span> - Method in class freemarker.template.<a href="freemarker/template/Template.html" title="class in freemarker.template">T

<TRUNCATED>


[14/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/Configuration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/Configuration.html b/docs/api/freemarker/template/Configuration.html
index f0cb6a5..d440972 100644
--- a/docs/api/freemarker/template/Configuration.html
+++ b/docs/api/freemarker/template/Configuration.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>Configuration (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Configuration (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Configuration (FreeMarker 2.3.23 API)";
+            parent.document.title="Configuration (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":41,"i10":10,"i11":9,"i12":10,"i13":42,"i14":10,"i15":10,"i16":10,"i17":42,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":9,"i36":41,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":41,"i60":10,"i61":10,"i62":10,"i63":42,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":42,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":42,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":41,"i11":10,"i12":9,"i13":10,"i14":42,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":42,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":9,"i45":41,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":41,"i72":10,"i73":10,"i74":10,"i75":42,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":42,"i90":10,"i91":10,"i92":10,"i93":10,"i94":10,"i95":10,"i96":42,"i97":10,"i98":10,"i99":10,"i100":10,"i101":10,"i102":10,"i103":10,"i104":10,"i105":10,"i106":10,"i107":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -115,13 +115,13 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a></dd>
+<dd><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">Configuration</span>
 extends <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a>
-implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a></pre>
+implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, <a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></pre>
 <div class="block"><b>The main entry point into the FreeMarker API</b>; encapsulates the configuration settings of FreeMarker,
  also serves as a central template-loading and caching service.
 
@@ -214,81 +214,99 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#AUTO_IMPORT_KEY">AUTO_IMPORT_KEY</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY">AUTO_ESCAPING_POLICY_KEY</a></span></code>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#AUTO_IMPORT_KEY_CAMEL_CASE">AUTO_IMPORT_KEY_CAMEL_CASE</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY_CAMEL_CASE">AUTO_ESCAPING_POLICY_KEY_CAMEL_CASE</a></span></code>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#AUTO_IMPORT_KEY_SNAKE_CASE">AUTO_IMPORT_KEY_SNAKE_CASE</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_ESCAPING_POLICY_KEY_SNAKE_CASE">AUTO_ESCAPING_POLICY_KEY_SNAKE_CASE</a></span></code>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#AUTO_INCLUDE_KEY">AUTO_INCLUDE_KEY</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_IMPORT_KEY">AUTO_IMPORT_KEY</a></span></code>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#AUTO_INCLUDE_KEY_CAMEL_CASE">AUTO_INCLUDE_KEY_CAMEL_CASE</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_IMPORT_KEY_CAMEL_CASE">AUTO_IMPORT_KEY_CAMEL_CASE</a></span></code>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#AUTO_INCLUDE_KEY_SNAKE_CASE">AUTO_INCLUDE_KEY_SNAKE_CASE</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_IMPORT_KEY_SNAKE_CASE">AUTO_IMPORT_KEY_SNAKE_CASE</a></span></code>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#CACHE_STORAGE_KEY">CACHE_STORAGE_KEY</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_INCLUDE_KEY">AUTO_INCLUDE_KEY</a></span></code>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#CACHE_STORAGE_KEY_CAMEL_CASE">CACHE_STORAGE_KEY_CAMEL_CASE</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_INCLUDE_KEY_CAMEL_CASE">AUTO_INCLUDE_KEY_CAMEL_CASE</a></span></code>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#CACHE_STORAGE_KEY_SNAKE_CASE">CACHE_STORAGE_KEY_SNAKE_CASE</a></span></code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#AUTO_INCLUDE_KEY_SNAKE_CASE">AUTO_INCLUDE_KEY_SNAKE_CASE</a></span></code>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#CACHE_STORAGE_KEY">CACHE_STORAGE_KEY</a></span></code>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#CACHE_STORAGE_KEY_CAMEL_CASE">CACHE_STORAGE_KEY_CAMEL_CASE</a></span></code>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#CACHE_STORAGE_KEY_SNAKE_CASE">CACHE_STORAGE_KEY_SNAKE_CASE</a></span></code>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#CAMEL_CASE_NAMING_CONVENTION">CAMEL_CASE_NAMING_CONVENTION</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#DEFAULT_ENCODING_KEY">DEFAULT_ENCODING_KEY</a></span></code>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#DEFAULT_ENCODING_KEY_CAMEL_CASE">DEFAULT_ENCODING_KEY_CAMEL_CASE</a></span></code>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#DEFAULT_ENCODING_KEY_SNAKE_CASE">DEFAULT_ENCODING_KEY_SNAKE_CASE</a></span></code>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#DEFAULT_INCOMPATIBLE_ENHANCEMENTS">DEFAULT_INCOMPATIBLE_ENHANCEMENTS</a></span></code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -296,12 +314,31 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#DEFAULT_INCOMPATIBLE_IMPROVEMENTS">DEFAULT_INCOMPATIBLE_IMPROVEMENTS</a></span></code>
 <div class="block">The default of <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>getIncompatibleImprovements()</code></a>, currently <a href="../../freemarker/template/Configuration.html#VERSION_2_3_0"><code>VERSION_2_3_0</code></a>.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#DISABLE_AUTO_ESCAPING_POLICY">DISABLE_AUTO_ESCAPING_POLICY</a></span></code>
+<div class="block">Don't enable auto-escaping, regardless of what the <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> is.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY">ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY</a></span></code>
+<div class="block">Enable auto-escaping if the output format supports it and <a href="../../freemarker/core/MarkupOutputFormat.html#isAutoEscapedByDefault--"><code>MarkupOutputFormat.isAutoEscapedByDefault()</code></a> is
+ <code>true</code>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#ENABLE_IF_SUPPORTED_AUTO_ESCAPING_POLICY">ENABLE_IF_SUPPORTED_AUTO_ESCAPING_POLICY</a></span></code>
+<div class="block">Enable auto-escaping if the <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> supports it.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#INCOMPATIBLE_ENHANCEMENTS">INCOMPATIBLE_ENHANCEMENTS</a></span></code>
@@ -377,6 +414,24 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#OUTPUT_FORMAT_KEY">OUTPUT_FORMAT_KEY</a></span></code>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#OUTPUT_FORMAT_KEY_CAMEL_CASE">OUTPUT_FORMAT_KEY_CAMEL_CASE</a></span></code>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#OUTPUT_FORMAT_KEY_SNAKE_CASE">OUTPUT_FORMAT_KEY_SNAKE_CASE</a></span></code>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#PARSED_DEFAULT_INCOMPATIBLE_ENHANCEMENTS">PARSED_DEFAULT_INCOMPATIBLE_ENHANCEMENTS</a></span></code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -384,46 +439,100 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY">RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY</a></span></code>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_CAMEL_CASE">RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_CAMEL_CASE</a></span></code>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_SNAKE_CASE">RECOGNIZE_STANDARD_FILE_EXTENSIONS_KEY_SNAKE_CASE</a></span></code>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY">REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY</a></span></code>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_CAMEL_CASE">REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_CAMEL_CASE</a></span></code>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</td>
+</tr>
 <tr class="rowColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_SNAKE_CASE">REGISTERED_CUSTOM_OUTPUT_FORMATS_KEY_SNAKE_CASE</a></span></code>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#SQUARE_BRACKET_TAG_SYNTAX">SQUARE_BRACKET_TAG_SYNTAX</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#STRICT_SYNTAX_KEY">STRICT_SYNTAX_KEY</a></span></code>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#STRICT_SYNTAX_KEY_CAMEL_CASE">STRICT_SYNTAX_KEY_CAMEL_CASE</a></span></code>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#STRICT_SYNTAX_KEY_SNAKE_CASE">STRICT_SYNTAX_KEY_SNAKE_CASE</a></span></code>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#TAG_SYNTAX_KEY">TAG_SYNTAX_KEY</a></span></code>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#TAG_SYNTAX_KEY_CAMEL_CASE">TAG_SYNTAX_KEY_CAMEL_CASE</a></span></code>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#TAG_SYNTAX_KEY_SNAKE_CASE">TAG_SYNTAX_KEY_SNAKE_CASE</a></span></code>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#TEMPLATE_CONFIGURATIONS_KEY">TEMPLATE_CONFIGURATIONS_KEY</a></span></code>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#TEMPLATE_CONFIGURATIONS_KEY_CAMEL_CASE">TEMPLATE_CONFIGURATIONS_KEY_CAMEL_CASE</a></span></code>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/template/Configuration.html#TEMPLATE_CONFIGURATIONS_KEY_SNAKE_CASE">TEMPLATE_CONFIGURATIONS_KEY_SNAKE_CASE</a></span></code>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#TEMPLATE_LOADER_KEY">TEMPLATE_LOADER_KEY</a></span></code>
@@ -533,18 +642,24 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#VERSION_2_3_24">VERSION_2_3_24</a></span></code>
+<div class="block">FreeMarker version 2.3.24 (an <a href="../../freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>incompatible improvements break-point</code></a>)</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#WHITESPACE_STRIPPING_KEY">WHITESPACE_STRIPPING_KEY</a></span></code>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#WHITESPACE_STRIPPING_KEY_CAMEL_CASE">WHITESPACE_STRIPPING_KEY_CAMEL_CASE</a></span></code>
 <div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#WHITESPACE_STRIPPING_KEY_SNAKE_CASE">WHITESPACE_STRIPPING_KEY_SNAKE_CASE</a></span></code>
 <div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
@@ -556,7 +671,7 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></h3>
-<code><a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY">API_BUILTIN_ENABLED_KEY</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_CAMEL_CASE">API_BUILTIN_ENABLED_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_SNAKE_CASE">API_BUILTIN_ENABLED_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY">ARITHMETIC_ENGINE_KEY</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_CAMEL_CASE">ARITHMETIC_ENGINE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_SNAKE_CASE">ARITHMETIC_ENGINE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY">AUTO_FLUSH_KEY</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_CAMEL_CASE">AUTO_FLUSH_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_SNAKE_CASE">AUTO_FLUSH_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY">BOOLEAN_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_CAMEL_CASE">BOOLEAN_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_SNAKE_CASE">BOOLEAN_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY">CLASSIC_COMPATIBLE_KEY</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_CAMEL_CASE">CLASSIC_COMPATIBLE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_SNAKE_CASE">CLASSIC_COMPATIBLE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY">DATE_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_CAMEL_CASE">DATE_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_SNAKE_CASE">DATE_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freem
 arker/core/Configurable.html#DATETIME_FORMAT_KEY">DATETIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_CAMEL_CASE">DATETIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_SNAKE_CASE">DATETIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY">LOCALE_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_CAMEL_CASE">LOCALE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_SNAKE_CASE">LOCALE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY">LOG_TEMPLATE_EXCEPTIONS_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Confi
 gurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY">NEW_BUILTIN_CLASS_RESOLVER_KEY</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY">NUMBER_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_CAMEL_CASE">NUMBER_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_SNAKE_CASE">NUMBER_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY">OBJECT_WRAPPER_KEY</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_CAMEL_CASE">OBJECT_WRAPPER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_SNAKE_CASE">OBJECT_WRAPPER_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY">OUTPUT_ENCODING_KEY</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_CAMEL_CASE">OUTPUT_ENCODING_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_SNAKE_CASE">OUTPUT_ENCODING_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY">SHOW_ERROR_TIPS_KEY</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_CAMEL_CASE">SHOW_ERROR_TIPS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_SNAKE_CASE">SHOW_ERROR_TIPS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY">SQL_DATE_AND_TIME_TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_
 KEY_SNAKE_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS">STRICT_BEAN_MODELS</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY">STRICT_BEAN_MODELS_KEY</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_CAMEL_CASE">STRICT_BEAN_MODELS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_SNAKE_CASE">STRICT_BEAN_MODELS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY">TEMPLATE_EXCEPTION_HANDLER_KEY</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY">TIME_FORMAT_KEY</a>, <a href="..
 /../freemarker/core/Configurable.html#TIME_FORMAT_KEY_CAMEL_CASE">TIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_SNAKE_CASE">TIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY">TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_CAMEL_CASE">TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_SNAKE_CASE">TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY">URL_ESCAPING_CHARSET_KEY</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_CAMEL_CASE">URL_ESCAPING_CHARSET_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_SNAKE_CASE">URL_ESCAPING_CHARSET_KEY_SNAKE_CASE</a></code></li>
+<code><a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY">API_BUILTIN_ENABLED_KEY</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_CAMEL_CASE">API_BUILTIN_ENABLED_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_SNAKE_CASE">API_BUILTIN_ENABLED_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY">ARITHMETIC_ENGINE_KEY</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_CAMEL_CASE">ARITHMETIC_ENGINE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_SNAKE_CASE">ARITHMETIC_ENGINE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY">AUTO_FLUSH_KEY</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_CAMEL_CASE">AUTO_FLUSH_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_SNAKE_CASE">AUTO_FLUSH_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY">BOOLEAN_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_CAMEL_CASE">BOOLEAN_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_SNAKE_CASE">BOOLEAN_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY">CLASSIC_COMPATIBLE_KEY</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_CAMEL_CASE">CLASSIC_COMPATIBLE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_SNAKE_CASE">CLASSIC_COMPATIBLE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY">CUSTOM_DATE_FORMATS_KEY</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">CUSTOM_DATE_
 FORMATS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY">CUSTOM_NUMBER_FORMATS_KEY</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY">DATE_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_CAMEL_CASE">DATE_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_SNAKE_CASE">DATE_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY">DATETIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_CAMEL_CASE">DATETIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_SNAKE_CASE">DATETI
 ME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY">LOCALE_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_CAMEL_CASE">LOCALE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_SNAKE_CASE">LOCALE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY">LOG_TEMPLATE_EXCEPTIONS_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY">NEW_BUILTIN_CLASS_RESOLVER_KEY</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTI
 N_CLASS_RESOLVER_KEY_SNAKE_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY">NUMBER_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_CAMEL_CASE">NUMBER_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_SNAKE_CASE">NUMBER_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY">OBJECT_WRAPPER_KEY</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_CAMEL_CASE">OBJECT_WRAPPER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_SNAKE_CASE">OBJECT_WRAPPER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY">OUTPUT_ENCODING_KEY</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_CAMEL_CASE">OUTPUT_ENCODING_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_
 KEY_SNAKE_CASE">OUTPUT_ENCODING_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY">SHOW_ERROR_TIPS_KEY</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_CAMEL_CASE">SHOW_ERROR_TIPS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_SNAKE_CASE">SHOW_ERROR_TIPS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY">SQL_DATE_AND_TIME_TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS">STRICT_BEAN_MODELS</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY">STRICT_BEAN_MODELS_KEY</a>, <a href="../../freema
 rker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_CAMEL_CASE">STRICT_BEAN_MODELS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_SNAKE_CASE">STRICT_BEAN_MODELS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY">TEMPLATE_EXCEPTION_HANDLER_KEY</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY">TIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_CAMEL_CASE">TIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_SNAKE_CASE">TIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY">TIME_ZON
 E_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_CAMEL_CASE">TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_SNAKE_CASE">TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY">URL_ESCAPING_CHARSET_KEY</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_CAMEL_CASE">URL_ESCAPING_CHARSET_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_SNAKE_CASE">URL_ESCAPING_CHARSET_KEY_SNAKE_CASE</a></code></li>
 </ul>
 </li>
 </ul>
@@ -605,14 +720,14 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#addAutoImport-java.lang.String-java.lang.String-">addAutoImport</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;namespaceVarName,
              <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;templateName)</code>
 <div class="block">Adds an invisible <code>#import <i>templateName</i> as <i>namespaceVarName</i></code> at the beginning of all
- templates.</div>
+ top-level templates (that is, to all templates that weren't included/imported from another template).</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#addAutoInclude-java.lang.String-">addAutoInclude</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;templateName)</code>
 <div class="block">Adds an invisible <code>#include <i>templateName</i> as <i>namespaceVarName</i></code> at the beginning of all
- templates.</div>
+ top-level templates (that is, to all templates that weren't included/imported from another template).</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
@@ -643,16 +758,22 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes</a></span>(<a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getAutoEscapingPolicy--">getAutoEscapingPolicy</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>setAutoEscapingPolicy(int)</code></a></div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getCacheStorage--">getCacheStorage</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setCacheStorage-freemarker.cache.CacheStorage-"><code>setCacheStorage(CacheStorage)</code></a>.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getCorrectedNameForUnknownSetting-java.lang.String-">getCorrectedNameForUnknownSetting</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>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>static <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getDefaultConfiguration--">getDefaultConfiguration</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -667,7 +788,7 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" 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/template/Configuration.html#getDefaultEncoding--">getDefaultEncoding</a></span>()</code>
 <div class="block">Gets the default encoding for converting bytes to characters when
@@ -675,13 +796,13 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
  was specified.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>static <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getDefaultObjectWrapper-freemarker.template.Version-">getDefaultObjectWrapper</a></span>(<a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a>&nbsp;incompatibleImprovements)</code>
 <div class="block">Returns the default object wrapper for a given "incompatible_improvements" version.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" 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/template/Configuration.html#getEncoding-java.util.Locale-">getEncoding</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
 <div class="block">Gets the preferred character encoding for the given locale, or the 
@@ -689,7 +810,7 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
  locale.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
 <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/template/Configuration.html#getIncompatibleEnhancements--">getIncompatibleEnhancements</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -697,23 +818,37 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--">getIncompatibleImprovements</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--">getIncompatibleImprovements</a></span>()</code>
+<div class="block">See <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>getIncompatibleImprovements()</code></a>.</div>
+</td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getLocalizedLookup--">getLocalizedLookup</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setLocalizedLookup-boolean-"><code>setLocalizedLookup(boolean)</code></a>.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getNamingConvention--">getNamingConvention</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setNamingConvention-int-"><code>setNamingConvention(int)</code></a>.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>setOutputFormat(OutputFormat)</code></a></div>
+</td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getOutputFormat-java.lang.String-">getOutputFormat</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">Returns the output format for a name.</div>
+</td>
+</tr>
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getParsedIncompatibleEnhancements--">getParsedIncompatibleEnhancements</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -721,57 +856,87 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getRecognizeStandardFileExtensions--">getRecognizeStandardFileExtensions</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/template/Configuration.html#setRecognizeStandardFileExtensions-boolean-"><code>setRecognizeStandardFileExtensions(boolean)</code></a>.</div>
+</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getRegisteredCustomOutputFormats--">getRegisteredCustomOutputFormats</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/template/Configuration.html#setRegisteredCustomOutputFormats-java.util.Collection-"><code>setRegisteredCustomOutputFormats(Collection)</code></a>.</div>
+</td>
+</tr>
+<tr id="i23" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getSettingNames-boolean-">getSettingNames</a></span>(boolean&nbsp;camelCase)</code>
+<div class="block">Returns the valid <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> setting names.</div>
+</td>
+</tr>
+<tr id="i24" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getSharedVariable-java.lang.String-">getSharedVariable</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Gets a shared variable.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getSharedVariableNames--">getSharedVariableNames</a></span>()</code>
 <div class="block">Returns the set containing the names of all defined shared sharedVariables.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getStrictSyntaxMode--">getStrictSyntaxMode</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setStrictSyntaxMode-boolean-"><code>setStrictSyntaxMode(boolean)</code></a>.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getSupportedBuiltInDirectiveNames--">getSupportedBuiltInDirectiveNames</a></span>()</code>
+<div class="block">Same as <a href="../../freemarker/template/Configuration.html#getSupportedBuiltInDirectiveNames-int-"><code>getSupportedBuiltInDirectiveNames(int)</code></a> with argument <a href="../../freemarker/template/Configuration.html#getNamingConvention--"><code>getNamingConvention()</code></a>.</div>
+</td>
+</tr>
+<tr id="i28" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getSupportedBuiltInDirectiveNames-int-">getSupportedBuiltInDirectiveNames</a></span>(int&nbsp;namingConvention)</code>
 <div class="block">Returns the names of the directives that are predefined by FreeMarker.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getSupportedBuiltInNames--">getSupportedBuiltInNames</a></span>()</code>
+<div class="block">Same as <a href="../../freemarker/template/Configuration.html#getSupportedBuiltInNames-int-"><code>getSupportedBuiltInNames(int)</code></a> with argument <a href="../../freemarker/template/Configuration.html#getNamingConvention--"><code>getNamingConvention()</code></a>.</div>
+</td>
+</tr>
+<tr id="i30" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getSupportedBuiltInNames-int-">getSupportedBuiltInNames</a></span>(int&nbsp;namingConvention)</code>
 <div class="block">Returns the names of the supported "built-ins".</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTagSyntax--">getTagSyntax</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setTagSyntax-int-"><code>setTagSyntax(int)</code></a>.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-">getTemplate</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">Retrieves the template with the given name from the template cache, loading it into the cache first if it's
  missing/staled.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-">getTemplate</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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
 <div class="block">Shorthand for <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-boolean-"><code>getTemplate(name, locale, null, null, true, false)</code></a>.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-boolean-">getTemplate</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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale,
@@ -783,7 +948,7 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
  cache, loading it into the cache first if it's missing/staled.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.String-">getTemplate</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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale,
@@ -791,7 +956,7 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 <div class="block">Shorthand for <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-boolean-"><code>getTemplate(name, locale, null, encoding, true, false)</code></a>.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.String-boolean-">getTemplate</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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale,
@@ -800,7 +965,7 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 <div class="block">Shorthand for <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-boolean-"><code>getTemplate(name, locale, null, encoding, parseAsFTL, false)</code></a>.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.String-boolean-boolean-">getTemplate</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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale,
@@ -810,44 +975,50 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 <div class="block">Shorthand for <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-boolean-"><code>getTemplate(name, locale, null, encoding, parseAsFTL, ignoreMissing)</code></a>.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.lang.String-">getTemplate</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
            <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Shorthand for <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-boolean-"><code>getTemplate(name, null, null, encoding, true, false)</code></a>.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i39" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplateConfigurations--">getTemplateConfigurations</a></span>()</code>
+<div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setTemplateConfigurations-freemarker.cache.TemplateConfigurationFactory-"><code>setTemplateConfigurations(TemplateConfigurationFactory)</code></a>.</div>
+</td>
+</tr>
+<tr id="i40" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplateLoader--">getTemplateLoader</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setTemplateLoader-freemarker.cache.TemplateLoader-"><code>setTemplateLoader(TemplateLoader)</code></a>.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplateLookupStrategy--">getTemplateLookupStrategy</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setTemplateLookupStrategy-freemarker.cache.TemplateLookupStrategy-"><code>setTemplateLookupStrategy(TemplateLookupStrategy)</code></a>.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i42" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplateNameFormat--">getTemplateNameFormat</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setTemplateNameFormat-freemarker.cache.TemplateNameFormat-"><code>setTemplateNameFormat(TemplateNameFormat)</code></a>.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i43" class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getTemplateUpdateDelayMilliseconds--">getTemplateUpdateDelayMilliseconds</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/template/Configuration.html#setTemplateUpdateDelayMilliseconds-long-"><code>setTemplateUpdateDelayMilliseconds(long)</code></a>.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i44" class="altColor">
 <td class="colFirst"><code>static <a href="../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getVersion--">getVersion</a></span>()</code>
 <div class="block">Returns the FreeMarker version information, most importantly the major.minor.micro version numbers.</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i45" class="rowColor">
 <td class="colFirst"><code>static <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/template/Configuration.html#getVersionNumber--">getVersionNumber</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -855,90 +1026,103 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 </div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i46" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#getWhitespaceStripping--">getWhitespaceStripping</a></span>()</code>
 <div class="block">Gets whether the FTL parser will try to remove
  superfluous white-space around certain FTL tags.</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
+<tr id="i47" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isCacheStorageExplicitlySet--">isCacheStorageExplicitlySet</a></span>()</code>
 <div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setCacheStorage-freemarker.cache.CacheStorage-"><code>setCacheStorage(CacheStorage)</code></a> (or equivalent) was already called on this instance.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<tr id="i48" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isLogTemplateExceptionsExplicitlySet--">isLogTemplateExceptionsExplicitlySet</a></span>()</code>
 <div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setLogTemplateExceptions-boolean-"><code>setLogTemplateExceptions(boolean)</code></a> (or equivalent) was already called on this instance.</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
+<tr id="i49" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isObjectWrapperExplicitlySet--">isObjectWrapperExplicitlySet</a></span>()</code>
 <div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setObjectWrapper-freemarker.template.ObjectWrapper-"><code>setObjectWrapper(ObjectWrapper)</code></a> (or equivalent) was already called on this instance.</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i50" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isOutputFormatExplicitlySet--">isOutputFormatExplicitlySet</a></span>()</code>
+<div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>setOutputFormat(OutputFormat)</code></a> (or equivalent) was already called on this instance.</div>
+</td>
+</tr>
+<tr id="i51" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isRecognizeStandardFileExtensionsExplicitlySet--">isRecognizeStandardFileExtensionsExplicitlySet</a></span>()</code>
+<div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setRecognizeStandardFileExtensions-boolean-"><code>setRecognizeStandardFileExtensions(boolean)</code></a> (or equivalent) was already called on this
+ instance.</div>
+</td>
+</tr>
+<tr id="i52" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isTemplateExceptionHandlerExplicitlySet--">isTemplateExceptionHandlerExplicitlySet</a></span>()</code>
 <div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-"><code>setTemplateExceptionHandler(TemplateExceptionHandler)</code></a> (or equivalent) was already called on
  this instance.</div>
 </td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i53" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isTemplateLoaderExplicitlySet--">isTemplateLoaderExplicitlySet</a></span>()</code>
 <div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setTemplateLoader-freemarker.cache.TemplateLoader-"><code>setTemplateLoader(TemplateLoader)</code></a> (or equivalent) was already called on this instance.</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i54" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isTemplateLookupStrategyExplicitlySet--">isTemplateLookupStrategyExplicitlySet</a></span>()</code>
 <div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setTemplateLookupStrategy-freemarker.cache.TemplateLookupStrategy-"><code>setTemplateLookupStrategy(TemplateLookupStrategy)</code></a> (or equivalent) was already called on this
  instance.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i55" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#isTemplateNameFormatExplicitlySet--">isTemplateNameFormatExplicitlySet</a></span>()</code>
 <div class="block">Tells if <a href="../../freemarker/template/Configuration.html#setTemplateNameFormat-freemarker.cache.TemplateNameFormat-"><code>setTemplateNameFormat(TemplateNameFormat)</code></a> (or equivalent) was already called on this instance.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i56" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#loadBuiltInEncodingMap--">loadBuiltInEncodingMap</a></span>()</code>
 <div class="block">Loads a preset language-to-encoding map, similarly as if you have called
  <a href="../../freemarker/template/Configuration.html#clearEncodingMap--"><code>clearEncodingMap()</code></a> and then did multiple <a href="../../freemarker/template/Configuration.html#setEncoding-java.util.Locale-java.lang.String-"><code>setEncoding(Locale, String)</code></a> calls.</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr id="i57" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#removeAutoImport-java.lang.String-">removeAutoImport</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;namespaceVarName)</code>
 <div class="block">Removes an auto-import; see <a href="../../freemarker/template/Configuration.html#addAutoImport-java.lang.String-java.lang.String-"><code>addAutoImport(String, String)</code></a>.</div>
 </td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr id="i58" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#removeAutoInclude-java.lang.String-">removeAutoInclude</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;templateName)</code>
 <div class="block">Removes a template from the auto-include list; see <a href="../../freemarker/template/Configuration.html#addAutoInclude-java.lang.String-"><code>addAutoInclude(String)</code></a>.</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i59" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#removeTemplateFromCache-java.lang.String-">removeTemplateFromCache</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">Equivalent to <tt>removeTemplateFromCache(name, thisCfg.getLocale(), thisCfg.getEncoding(thisCfg.getLocale()), true)</tt>.</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i60" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#removeTemplateFromCache-java.lang.String-java.util.Locale-">removeTemplateFromCache</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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
 <div class="block">Equivalent to <tt>removeTemplateFromCache(name, locale, thisCfg.getEncoding(locale), true)</tt>.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i61" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#removeTemplateFromCache-java.lang.String-java.util.Locale-java.lang.String-">removeTemplateFromCache</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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale,
@@ -946,7 +1130,7 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
 <div class="block">Equivalent to <tt>removeTemplateFromCache(name, locale, encoding, true)</tt>.</div>
 </td>
 </tr>
-<tr id="i51" class="rowColor">
+<tr id="i62" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#removeTemplateFromCache-java.lang.String-java.util.Locale-java.lang.String-boolean-">removeTemplateFromCache</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/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale,
@@ -956,41 +1140,48 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable
  of it when it's next time requested.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr id="i63" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#removeTemplateFromCache-java.lang.String-java.lang.String-">removeTemplateFromCache</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
 <div class="block">Equivalent to <tt>removeTemplateFromCache(name, thisCfg.getLocale(), encoding, true)</tt>.</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr id="i64" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#setAllSharedVariables-freemarker.template.TemplateHashModelEx-">setAllSharedVariables</a></span>(<a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a>&nbsp;hash)</code>
+<div class="block">Adds all object in the hash as shared variable to the configuration; it's like doing several
+ <a href="../../freemarker/template/Configuration.html#setSharedVariable-java.lang.String-java.lang.Object-"><code>setSharedVariable(String, Object)</code></a> calls, one for each hash entry.</div>
+</td>
+</tr>
+<tr id="i65" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#setAllSharedVariables-freemarker.template.TemplateHashModelEx-">setAllSharedVariables</a></span>(<a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template">TemplateHashModelEx</a>&nbsp;hash)</code>
-<div class="block">Adds all object in the hash as shared variable to the configuration; it's like doing several
- <a href="../../freemarker/template/Configuration.html#setSharedVariable-java.lang.String-java.lang.Object-"><code>setSharedVariable(String, Object)</code></a> calls, one for each hash entry.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-">setAutoEscapingPolicy</a></span>(int&nbsp;autoEscapingPolicy)</code>
+<div class="block">Sets when auto-escaping should be enabled depending on the current <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">output format</a>;
+ default is <a href="../../freemarker/template/Configuration.html#ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY"><code>ENABLE_IF_DEFAULT_AUTO_ESCAPING_POLICY</code></a>.</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr id="i66" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#setAutoImports-java.util.Map-">setAutoImports</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;map)</code>
 <div class="block">Removes all auto-imports, then calls <a href="../../freemarker/template/Configuration.html#addAutoImport-java.lang.String-java.lang.String-"><code>addAutoImport(String, String)</code></a> for each <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util"><code>Map</code></a>-entry (the entry
  key is the <code>namespaceVarName</code>).</div>
 </td>
 </tr>
-<tr id="i55" class="rowColor">
+<tr id="i67" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Configuration.html#setAutoIncludes-java.util.List-">setAutoIncludes</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;templateNames)</code>
 <div class="block">Removes all auto-includes, then calls <a href="../../freemarker/template/Configuration.html#addAutoInclude-java.lang.String-"><code>addAutoInclude(String)</code></a> for each <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util"><code>List</code></a> items.</div>
 </td>
 </tr>
-<tr id="i56" class="altColor">
+<tr id="i68" class="altColor">
 <td clas

<TRUNCATED>


[25/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/ArithmeticEngine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/ArithmeticEngine.html b/docs/api/freemarker/core/class-use/ArithmeticEngine.html
index 927e4e0..89a4dd3 100644
--- a/docs/api/freemarker/core/class-use/ArithmeticEngine.html
+++ b/docs/api/freemarker/core/class-use/ArithmeticEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.ArithmeticEngine (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.ArithmeticEngine (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.core.ArithmeticEngine (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.ArithmeticEngine (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -129,6 +129,12 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code><a href="../../../freemarker/core/ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ParserConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ParserConfiguration.html#getArithmeticEngine--">getArithmeticEngine</a></span>()</code>
+<div class="block">Overlaps with <a href="../../../freemarker/core/Configurable.html#getArithmeticEngine--"><code>Configurable.getArithmeticEngine()</code></a>; the parser needs this for creating numerical literals.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#getArithmeticEngine--">getArithmeticEngine</a></span>()</code>
 <div class="block">The getter pair of <a href="../../../freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-"><code>Configurable.setArithmeticEngine(ArithmeticEngine)</code></a>.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/BugException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/BugException.html b/docs/api/freemarker/core/class-use/BugException.html
index 13566b6..34950a8 100644
--- a/docs/api/freemarker/core/class-use/BugException.html
+++ b/docs/api/freemarker/core/class-use/BugException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.BugException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.BugException (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.core.BugException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.BugException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/CSSOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/CSSOutputFormat.html b/docs/api/freemarker/core/class-use/CSSOutputFormat.html
new file mode 100644
index 0000000..bd68cf1
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/CSSOutputFormat.html
@@ -0,0 +1,169 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.CSSOutputFormat (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.core.CSSOutputFormat (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/core/CSSOutputFormat.html" title="class in freemarker.core">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/core/class-use/CSSOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CSSOutputFormat.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.core.CSSOutputFormat" class="title">Uses of Class<br>freemarker.core.CSSOutputFormat</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/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CSSOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CSSOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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/core/CSSOutputFormat.html" title="class in freemarker.core">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/core/class-use/CSSOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CSSOutputFormat.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/core/class-use/CallPlaceCustomDataInitializationException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/CallPlaceCustomDataInitializationException.html b/docs/api/freemarker/core/class-use/CallPlaceCustomDataInitializationException.html
index 26d80d3..910c583 100644
--- a/docs/api/freemarker/core/class-use/CallPlaceCustomDataInitializationException.html
+++ b/docs/api/freemarker/core/class-use/CallPlaceCustomDataInitializationException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.CallPlaceCustomDataInitializationException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.CallPlaceCustomDataInitializationException (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.core.CallPlaceCustomDataInitializationException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.CallPlaceCustomDataInitializationException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/CombinedMarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/CombinedMarkupOutputFormat.html b/docs/api/freemarker/core/class-use/CombinedMarkupOutputFormat.html
new file mode 100644
index 0000000..a5ff11a
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/CombinedMarkupOutputFormat.html
@@ -0,0 +1,167 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.CombinedMarkupOutputFormat (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.core.CombinedMarkupOutputFormat (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/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">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/core/class-use/CombinedMarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CombinedMarkupOutputFormat.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.core.CombinedMarkupOutputFormat" class="title">Uses of Class<br>freemarker.core.CombinedMarkupOutputFormat</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/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateCombinedMarkupOutputModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateCombinedMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</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/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">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/core/class-use/CombinedMarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CombinedMarkupOutputFormat.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/core/class-use/CommandLine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/CommandLine.html b/docs/api/freemarker/core/class-use/CommandLine.html
index bbc23b1..e30fe00 100644
--- a/docs/api/freemarker/core/class-use/CommandLine.html
+++ b/docs/api/freemarker/core/class-use/CommandLine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.CommandLine (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.CommandLine (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.core.CommandLine (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.CommandLine (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/CommonMarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/CommonMarkupOutputFormat.html b/docs/api/freemarker/core/class-use/CommonMarkupOutputFormat.html
new file mode 100644
index 0000000..534f637
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/CommonMarkupOutputFormat.html
@@ -0,0 +1,206 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.CommonMarkupOutputFormat (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.core.CommonMarkupOutputFormat (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/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">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/core/class-use/CommonMarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CommonMarkupOutputFormat.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.core.CommonMarkupOutputFormat" class="title">Uses of Class<br>freemarker.core.CommonMarkupOutputFormat</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/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></span></code>
+<div class="block">Represents two markup formats nested into each other.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></span></code>
+<div class="block">Represents the HTML output format (MIME type "text/html", name "HTML").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></span></code>
+<div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></span></code>
+<div class="block">Represents the XML output format (MIME type "application/xhtml+xml", name "XHTML").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></span></code>
+<div class="block">Represents the XML output format (MIME type "application/xml", name "XML").</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="type parameter in CommonTemplateMarkupOutputModel">MO</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">CommonTemplateMarkupOutputModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</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/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">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/core/class-use/CommonMarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CommonMarkupOutputFormat.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/core/class-use/CommonTemplateMarkupOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/CommonTemplateMarkupOutputModel.html b/docs/api/freemarker/core/class-use/CommonTemplateMarkupOutputModel.html
new file mode 100644
index 0000000..f5955ad
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/CommonTemplateMarkupOutputModel.html
@@ -0,0 +1,216 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.CommonTemplateMarkupOutputModel (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.core.CommonTemplateMarkupOutputModel (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/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">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/core/class-use/CommonTemplateMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="CommonTemplateMarkupOutputModel.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.core.CommonTemplateMarkupOutputModel" class="title">Uses of Class<br>freemarker.core.CommonTemplateMarkupOutputModel</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/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with type parameters of type <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</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/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;MO extends <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</span></code>
+<div class="block">Common superclass for implementing <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
+ subclass.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO extends <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</span></code>
+<div class="block">Common superclass for implementing <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
+ <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></span></code>
+<div class="block">Stores combined markup to be printed; used with <a href="../../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></span></code>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></span></code>
+<div class="block">Stores RTF markup to be printed; used with <a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><code>RTFOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></span></code>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></span></code>
+<div class="block">Stores XML markup to be printed; used with <a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</div>
+</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/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">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/core/class-use/CommonTemplateMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="CommonTemplateMarkupOutputModel.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/core/class-use/Configurable.SettingValueAssignmentException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/Configurable.SettingValueAssignmentException.html b/docs/api/freemarker/core/class-use/Configurable.SettingValueAssignmentException.html
index 4b9b80b..6efa264 100644
--- a/docs/api/freemarker/core/class-use/Configurable.SettingValueAssignmentException.html
+++ b/docs/api/freemarker/core/class-use/Configurable.SettingValueAssignmentException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.Configurable.SettingValueAssignmentException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.Configurable.SettingValueAssignmentException (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.core.Configurable.SettingValueAssignmentException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.Configurable.SettingValueAssignmentException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/Configurable.UnknownSettingException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/Configurable.UnknownSettingException.html b/docs/api/freemarker/core/class-use/Configurable.UnknownSettingException.html
index 8826178..2ab8462 100644
--- a/docs/api/freemarker/core/class-use/Configurable.UnknownSettingException.html
+++ b/docs/api/freemarker/core/class-use/Configurable.UnknownSettingException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.Configurable.UnknownSettingException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.Configurable.UnknownSettingException (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.core.Configurable.UnknownSettingException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.Configurable.UnknownSettingException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/Configurable.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/Configurable.html b/docs/api/freemarker/core/class-use/Configurable.html
index 43e4f0d..4765ec6 100644
--- a/docs/api/freemarker/core/class-use/Configurable.html
+++ b/docs/api/freemarker/core/class-use/Configurable.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.Configurable (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.Configurable (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.core.Configurable (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.Configurable (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -119,6 +119,13 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">Object that represents the runtime environment during template processing.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></span></code>
+<div class="block">Used for customizing the configuration settings for individual <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s (or rather groups of templates),
+ relatively to the common setting values coming from the <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
@@ -171,8 +178,9 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></span></code>
-<div class="block">Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from
- multiple threads.</div>
+<div class="block">
+ Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from multiple
+ threads.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/CustomAttribute.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/CustomAttribute.html b/docs/api/freemarker/core/class-use/CustomAttribute.html
index 12ec206..931322e 100644
--- a/docs/api/freemarker/core/class-use/CustomAttribute.html
+++ b/docs/api/freemarker/core/class-use/CustomAttribute.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.CustomAttribute (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.CustomAttribute (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.core.CustomAttribute (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.CustomAttribute (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/Environment.Namespace.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/Environment.Namespace.html b/docs/api/freemarker/core/class-use/Environment.Namespace.html
index 2c9447f..bf48141 100644
--- a/docs/api/freemarker/core/class-use/Environment.Namespace.html
+++ b/docs/api/freemarker/core/class-use/Environment.Namespace.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.Environment.Namespace (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.Environment.Namespace (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.core.Environment.Namespace (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.Environment.Namespace (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -114,8 +114,8 @@
 <tr class="rowColor">
 <td class="colFirst"><code><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getGlobalNamespace--">getGlobalNamespace</a></span>()</code>
-<div class="block">Returns the name-space that contains the globally visible non-data-model variables
- (usually created with <code>&amp;lt;#global ...&amp;gt;</code>).</div>
+<div class="block">Returns the name-space that contains the globally visible non-data-model variables (usually created with
+ <code>&amp;lt;#global ...&amp;gt;</code>).</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -134,8 +134,7 @@
 <td class="colFirst"><code><a href="../../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-">importLib</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;namespace)</code>
-<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate
- root relative.</div>
+<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate root relative.</div>
 </td>
 </tr>
 <tr class="rowColor">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/Environment.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/Environment.html b/docs/api/freemarker/core/class-use/Environment.html
index 3311f0b..efefffc 100644
--- a/docs/api/freemarker/core/class-use/Environment.html
+++ b/docs/api/freemarker/core/class-use/Environment.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.Environment (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.Environment (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.core.Environment (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.Environment (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -189,6 +189,40 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormatFactory.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>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AliasTemplateDateFormatFactory.</span><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>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-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,
+   <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="../../../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>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AliasTemplateNumberFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/AliasTemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-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,
+   <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="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TemplateClassResolver.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateClassResolver.html#resolve-java.lang.String-freemarker.core.Environment-freemarker.template.Template-">resolve</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;className,
        <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
@@ -258,6 +292,13 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                 <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMarkupOutputException.html#NonMarkupOutputException-freemarker.core.Environment-">NonMarkupOutputException</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMarkupOutputException.html#NonMarkupOutputException-java.lang.String-freemarker.core.Environment-">NonMarkupOutputException</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;description,
+                        <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMethodException.html#NonMethodException-freemarker.core.Environment-">NonMethodException</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
@@ -300,6 +341,13 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
                   <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonStringOrTemplateOutputException.html#NonStringOrTemplateOutputException-freemarker.core.Environment-">NonStringOrTemplateOutputException</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonStringOrTemplateOutputException.html#NonStringOrTemplateOutputException-java.lang.String-freemarker.core.Environment-">NonStringOrTemplateOutputException</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;description,
+                                  <a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UnexpectedTypeException.html#UnexpectedTypeException-freemarker.core.Environment-java.lang.String-">UnexpectedTypeException</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
                        <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;description)</code>&nbsp;</td>
 </tr>
@@ -324,6 +372,14 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
        <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>[]&nbsp;loopVars,
        <a href="../../../freemarker/template/TemplateDirectiveBody.html" title="interface in freemarker.template">TemplateDirectiveBody</a>&nbsp;body)</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><span class="typeNameLabel">FreemarkerServlet.</span><code><span class="memberNameLink"><a href="../../../freemarker/ext/servlet/FreemarkerServlet.html#processEnvironment-freemarker.core.Environment-javax.servlet.http.HttpServletRequest-javax.servlet.http.HttpServletResponse-">processEnvironment</a></span>(<a href="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
+                  javax.servlet.http.HttpServletRequest&nbsp;request,
+                  javax.servlet.http.HttpServletResponse&nbsp;response)</code>
+<div class="block">This is the method that actually executes the template.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/FreeMarkerTree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/FreeMarkerTree.html b/docs/api/freemarker/core/class-use/FreeMarkerTree.html
index 3c96e82..d60ca3c 100644
--- a/docs/api/freemarker/core/class-use/FreeMarkerTree.html
+++ b/docs/api/freemarker/core/class-use/FreeMarkerTree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.core.FreeMarkerTree (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.FreeMarkerTree (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.core.FreeMarkerTree (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.FreeMarkerTree (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/HTMLOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/HTMLOutputFormat.html b/docs/api/freemarker/core/class-use/HTMLOutputFormat.html
new file mode 100644
index 0000000..300e393
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/HTMLOutputFormat.html
@@ -0,0 +1,182 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.HTMLOutputFormat (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.core.HTMLOutputFormat (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/core/HTMLOutputFormat.html" title="class in freemarker.core">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/core/class-use/HTMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="HTMLOutputFormat.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.core.HTMLOutputFormat" class="title">Uses of Class<br>freemarker.core.HTMLOutputFormat</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/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HTMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/HTMLOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateHTMLOutputModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateHTMLOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</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/core/HTMLOutputFormat.html" title="class in freemarker.core">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/core/class-use/HTMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="HTMLOutputFormat.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/core/class-use/InvalidFormatParametersException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/InvalidFormatParametersException.html b/docs/api/freemarker/core/class-use/InvalidFormatParametersException.html
new file mode 100644
index 0000000..49930ac
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/InvalidFormatParametersException.html
@@ -0,0 +1,167 @@
+<!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:06 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class freemarker.core.InvalidFormatParametersException (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.core.InvalidFormatParametersException (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/core/InvalidFormatParametersException.html" title="class in freemarker.core">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/core/class-use/InvalidFormatParametersException.html" target="_top">Frames</a></li>
+<li><a href="InvalidFormatParametersException.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.core.InvalidFormatParametersException" class="title">Uses of Class<br>freemarker.core.InvalidFormatParametersException</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/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that throw <a href="../../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateFormatUtil.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateFormatUtil.html#checkHasNoParameters-java.lang.String-">checkHasNoParameters</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)</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/core/InvalidFormatParametersException.html" title="class in freemarker.core">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/core/class-use/InvalidFormatParametersException.html" target="_top">Frames</a></li>
+<li><a href="InvalidFormatParametersException.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>


[11/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateBooleanModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateBooleanModel.html b/docs/api/freemarker/template/TemplateBooleanModel.html
index 69f9b52..2282a49 100644
--- a/docs/api/freemarker/template/TemplateBooleanModel.html
+++ b/docs/api/freemarker/template/TemplateBooleanModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateBooleanModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateBooleanModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateBooleanModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateBooleanModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -112,7 +112,11 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public interface <span class="typeNameLabel">TemplateBooleanModel</span>
 extends <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></pre>
-<div class="block">"boolean" template language data type; same as in Java; either <code>true</code> or <code>false</code>.</div>
+<div class="block">"boolean" template language data type; same as in Java; either <code>true</code> or <code>false</code>.
+ 
+ <p>
+ Objects of this type should be immutable, that is, calling <a href="../../freemarker/template/TemplateBooleanModel.html#getAsBoolean--"><code>getAsBoolean()</code></a> should always return the same
+ value as for the first time.</div>
 </li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateCollectionModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateCollectionModel.html b/docs/api/freemarker/template/TemplateCollectionModel.html
index a204f0d..a50a7cd 100644
--- a/docs/api/freemarker/template/TemplateCollectionModel.html
+++ b/docs/api/freemarker/template/TemplateCollectionModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateCollectionModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateCollectionModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateCollectionModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateCollectionModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateCollectionModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateCollectionModelEx.html b/docs/api/freemarker/template/TemplateCollectionModelEx.html
index ebde184..194f250 100644
--- a/docs/api/freemarker/template/TemplateCollectionModelEx.html
+++ b/docs/api/freemarker/template/TemplateCollectionModelEx.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateCollectionModelEx (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateCollectionModelEx (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateCollectionModelEx (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateCollectionModelEx (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateDateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateDateModel.html b/docs/api/freemarker/template/TemplateDateModel.html
index b52ee29..b94dd06 100644
--- a/docs/api/freemarker/template/TemplateDateModel.html
+++ b/docs/api/freemarker/template/TemplateDateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateDateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateDateModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateDateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateDateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -113,7 +113,11 @@ var activeTableTab = "activeTableTab";
 <pre>public interface <span class="typeNameLabel">TemplateDateModel</span>
 extends <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></pre>
 <div class="block">"date", "time" and "date-time" template language data types: corresponds to <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>. Contrary to Java,
- FreeMarker distinguishes date (no time part), time and date-time values.</div>
+ FreeMarker distinguishes date (no time part), time and date-time values.
+ 
+ <p>
+ Objects of this type should be immutable, that is, calling <a href="../../freemarker/template/TemplateDateModel.html#getAsDate--"><code>getAsDate()</code></a> and <a href="../../freemarker/template/TemplateDateModel.html#getDateType--"><code>getDateType()</code></a> should
+ always return the same value as for the first time.</div>
 </li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateDirectiveBody.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateDirectiveBody.html b/docs/api/freemarker/template/TemplateDirectiveBody.html
index d23ae0a..a95c41e 100644
--- a/docs/api/freemarker/template/TemplateDirectiveBody.html
+++ b/docs/api/freemarker/template/TemplateDirectiveBody.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateDirectiveBody (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateDirectiveBody (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateDirectiveBody (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateDirectiveBody (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateDirectiveModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateDirectiveModel.html b/docs/api/freemarker/template/TemplateDirectiveModel.html
index 9cd0270..be2e38e 100644
--- a/docs/api/freemarker/template/TemplateDirectiveModel.html
+++ b/docs/api/freemarker/template/TemplateDirectiveModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateDirectiveModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateDirectiveModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateDirectiveModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateDirectiveModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateException.html b/docs/api/freemarker/template/TemplateException.html
index 7656d55..9447904 100644
--- a/docs/api/freemarker/template/TemplateException.html
+++ b/docs/api/freemarker/template/TemplateException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateException (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="TemplateException (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -499,7 +499,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCauseException</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;getCauseException()</pre>
+<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;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a>&nbsp;getCauseException()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Java 1.4 has introduced <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang"><code>Throwable.getCause()</code></a> - use that instead, especially as this can't return
  runtime exceptions and errors as is.</span></div>
 </li>
@@ -669,7 +670,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getTemplateName</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getTemplateName()</pre>
+<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;<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;getTemplateName()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/TemplateException.html#getTemplateSourceName--"><code>getTemplateSourceName()</code></a> instead, unless you are really sure that this is what you want.
              This method isn't really deprecated, it's just marked so to warn users about this.</span></div>
 <div class="block">Returns the name (<a href="../../freemarker/template/Template.html#getName--"><code>Template.getName()</code></a>) of the template where the error has occurred, or <code>null</code> if

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateExceptionHandler.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateExceptionHandler.html b/docs/api/freemarker/template/TemplateExceptionHandler.html
index ad83fbd..b0575c7 100644
--- a/docs/api/freemarker/template/TemplateExceptionHandler.html
+++ b/docs/api/freemarker/template/TemplateExceptionHandler.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateExceptionHandler (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateExceptionHandler (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="TemplateExceptionHandler (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateExceptionHandler (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -251,14 +251,17 @@ var activeTableTab = "activeTableTab";
                              <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
                              <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
                       throws <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></pre>
-<div class="block">Method called after a <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template"><code>TemplateException</code></a> was raised inside a template. The error is logged before this is
- called, so there's no need to log it here. The exception should be re-thrown unless you want to
- suppress the exception.
+<div class="block">Method called after a <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template"><code>TemplateException</code></a> was raised inside a template. The exception should be re-thrown
+ unless you want to suppress the exception.
  
  <p>Note that you can check with <a href="../../freemarker/core/Environment.html#isInAttemptBlock--"><code>Environment.isInAttemptBlock()</code></a> if you are inside a <code>#attempt</code>
  block, which then will handle handle this exception and roll back the output generated inside it.
  
- <p>Note that <a href="../../freemarker/core/StopException.html" title="class in freemarker.core"><code>StopException</code></a>-s (raised by <code>#stop</code>) won't be captured.</div>
+ <p>Note that <a href="../../freemarker/core/StopException.html" title="class in freemarker.core"><code>StopException</code></a>-s (raised by <code>#stop</code>) won't be captured.
+ 
+ <p>Note that you shouldn't log the exception in this method unless you suppress it. If there's a concern that the
+ exception might won't be logged after it bubbles up from <a href="../../freemarker/template/Template.html#process-java.lang.Object-java.io.Writer-"><code>Template.process(Object, Writer)</code></a>, simply
+ ensure that <a href="../../freemarker/core/Configurable.html#getLogTemplateExceptions--"><code>Configurable.getLogTemplateExceptions()</code></a> is <code>true</code>.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>te</code> - The exception that occurred; don't forget to re-throw it unless you want to suppress it</dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModel.html b/docs/api/freemarker/template/TemplateHashModel.html
index 6a206c7..140f915 100644
--- a/docs/api/freemarker/template/TemplateHashModel.html
+++ b/docs/api/freemarker/template/TemplateHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateHashModel (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="TemplateHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateHashModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateHashModelEx.html b/docs/api/freemarker/template/TemplateHashModelEx.html
index 86285d6..6301fb7 100644
--- a/docs/api/freemarker/template/TemplateHashModelEx.html
+++ b/docs/api/freemarker/template/TemplateHashModelEx.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateHashModelEx (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateHashModelEx (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="TemplateHashModelEx (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateHashModelEx (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateMethodModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateMethodModel.html b/docs/api/freemarker/template/TemplateMethodModel.html
index 7a3c16e..7f96059 100644
--- a/docs/api/freemarker/template/TemplateMethodModel.html
+++ b/docs/api/freemarker/template/TemplateMethodModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateMethodModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateMethodModel (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="TemplateMethodModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateMethodModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -118,7 +118,8 @@ var activeTableTab = "activeTableTab";
     value you could pass in was string.</span></div>
 </div>
 <br>
-<pre>public interface <span class="typeNameLabel">TemplateMethodModel</span>
+<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 interface <span class="typeNameLabel">TemplateMethodModel</span>
 extends <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></pre>
 <div class="block">"method" template language data type: Objects that act like functions. The name comes from that their original
  application was calling Java methods via <a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in freemarker.ext.beans"><code>BeansWrapper</code></a>. 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateMethodModelEx.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateMethodModelEx.html b/docs/api/freemarker/template/TemplateMethodModelEx.html
index 343f940..8f93f78 100644
--- a/docs/api/freemarker/template/TemplateMethodModelEx.html
+++ b/docs/api/freemarker/template/TemplateMethodModelEx.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>TemplateMethodModelEx (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateMethodModelEx (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="TemplateMethodModelEx (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateMethodModelEx (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModel.html b/docs/api/freemarker/template/TemplateModel.html
index 46785f3..9760d18 100644
--- a/docs/api/freemarker/template/TemplateModel.html
+++ b/docs/api/freemarker/template/TemplateModel.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>TemplateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateModel (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="TemplateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -96,11 +96,11 @@
 <li class="blockList">
 <dl>
 <dt>All Known Subinterfaces:</dt>
-<dd><a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/template/TemplateBooleanModel.html" title="interface in freemarker.template">TemplateBooleanModel</a>, <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, <a href="../../freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template">TemplateCollectionModelEx</a>, <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>, <a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>, <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in f
 reemarker.template">TemplateHashModelEx</a>, <a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template">TemplateMethodModel</a>, <a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template">TemplateMethodModelEx</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <a href="../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a>, <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>, <a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a>, <a href="../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, <a href="../../freemarker/template/Template
 TransformModel.html" title="interface in freemarker.template">TemplateTransformModel</a>, <a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a></dd>
+<dd><a href="../../freemarker/template/AdapterTemplateModel.html" title="interface in freemarker.template">AdapterTemplateModel</a>, <a href="../../freemarker/template/TemplateBooleanModel.html" title="interface in freemarker.template">TemplateBooleanModel</a>, <a href="../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, <a href="../../freemarker/template/TemplateCollectionModelEx.html" title="interface in freemarker.template">TemplateCollectionModelEx</a>, <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>, <a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>, <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../freemarker/template/TemplateHashModelEx.html" title="interface in f
 reemarker.template">TemplateHashModelEx</a>, <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;, <a href="../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template">TemplateMethodModel</a>, <a href="../../freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template">TemplateMethodModelEx</a>, <a href="../../freemarker/template/TemplateModelWithAPISupport.html" title="interface in freemarker.template">TemplateModelWithAPISupport</a>, <a href="../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a>, <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>, <a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a>, <a href="../../freemarker/templat
 e/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, <a href="../../freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template">TemplateTransformModel</a>, <a href="../../freemarker/ext/util/WrapperTemplateModel.html" title="interface in freemarker.ext.util">WrapperTemplateModel</a></dd>
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet">AllHttpScopesHashModel</a>, <a href="../../freemarker/ext/beans/ArrayModel.html" title="class in freemarker.ext.beans">ArrayModel</a>, <a href="../../freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans">BeanModel</a>, <a href="../../freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans">BooleanModel</a>, <a href="../../freemarker/template/utility/CaptureOutput.html" title="class in freemarker.template.utility">CaptureOutput</a>, <a href="../../freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a>, <a href="../../freemarker/ext/beans/DateModel.html" title="class in freemarker.ext.beans">DateModel</a>, <a href="../../freemarker/template/DefaultArrayAdapter.html" title="class in freemarker.template">DefaultArrayAdapter</a>, <a href="../../freemarker/template/DefaultIteratorAdapter.html"
  title="class in freemarker.template">DefaultIteratorAdapter</a>, <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/template/utility/DOMNodeModel.html" title="class in freemarker.template.utility">DOMNodeModel</a>, <a href="../../freemarker/ext/beans/EnumerationModel.html" title="class in freemarker.ext.beans">EnumerationModel</a>, <a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a>, <a href="../../freemarker/template/utility/Execute.html" title="class in freemarker.template.utility">Execute</a>, <a href="../../freemarker/template/utility/HtmlEscape.html" title=
 "class in freemarker.template.utility">HtmlEscape</a>, <a href="../../freemarker/ext/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.servlet">HttpRequestHashModel</a>, <a href="../../freemarker/ext/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.servlet">HttpRequestParametersHashModel</a>, <a href="../../freemarker/ext/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.servlet">HttpSessionHashModel</a>, <a href="../../freemarker/ext/servlet/IncludePage.html" title="class in freemarker.ext.servlet">IncludePage</a>, <a href="../../freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a>, <a href="../../freemarker/ext/jython/JythonHashModel.html" title="class in freemarker.ext.jython">JythonHashModel</a>, <a href="../../freemarker/ext/jython/JythonModel.html" title="class in freemarker.ext.jython">JythonModel</a>, <a href="../../freemarker/ext/jython/JythonNumberModel.html" title="class
  in freemarker.ext.jython">JythonNumberModel</a>, <a href="../../freemarker/template/utility/JythonRuntime.html" title="class in freemarker.template.utility">JythonRuntime</a>, <a href="../../freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a>, <a href="../../freemarker/template/LocalizedString.html" title="class in freemarker.template">LocalizedString</a>, <a href="../../freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a>, <a href="../../freemarker/ext/jdom/NodeListModel.html" title="class in freemarker.ext.jdom">NodeListModel</a>, <a href="../../freemarker/ext/xml/NodeListModel.html" title="class in freemarker.ext.xml">NodeListModel</a>, <a href="../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a>, <a href="../../freemarker/template/utility/NormalizeNewlines.html" title="class in freemarker.template.utility">NormalizeNewlines</a>, <a href="../../free
 marker/ext/beans/NumberModel.html" title="class in freemarker.ext.beans">NumberModel</a>, <a href="../../freemarker/template/utility/ObjectConstructor.html" title="class in freemarker.template.utility">ObjectConstructor</a>, <a href="../../freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans">OverloadedMethodsModel</a>, <a href="../../freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a>, <a href="../../freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a>, <a href="../../freemarker/ext/rhino/RhinoFunctionModel.html" title="class in freemarker.ext.rhino">RhinoFunctionModel</a>, <a href="../../freemarker/ext/rhino/RhinoScriptableModel.html" title="class in freemarker.ext.rhino">RhinoScriptableModel</a>, <a href="../../freemarker/ext/servlet/ServletContextHashModel.html" title="class in freemarker.ext.servlet">ServletContextH
 ashModel</a>, <a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a>, <a href="../../freemarker/template/SimpleDate.html" title="class in freemarker.template">SimpleDate</a>, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a>, <a href="../../freemarker/template/SimpleList.html" title="class in freemarker.template">SimpleList</a>, <a href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a>, <a href="../../freemarker/ext/beans/SimpleMethodModel.html" title="class in freemarker.ext.beans">SimpleMethodModel</a>, <a href="../../freemarker/template/SimpleNumber.html" title="class in freemarker.template">SimpleNumber</a>, <a href="../../freemarker/template/SimpleScalar.html" title="class in freemarker.template">SimpleScalar</a>, <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template">Simp
 leSequence</a>, <a href="../../freemarker/template/utility/StandardCompress.html" title="class in freemarker.template.utility">StandardCompress</a>, <a href="../../freemarker/ext/beans/StringModel.html" title="class in freemarker.ext.beans">StringModel</a>, <a href="../../freemarker/ext/jsp/TaglibFactory.html" title="class in freemarker.ext.jsp">TaglibFactory</a>, <a href="../../freemarker/template/TemplateModelListSequence.html" title="class in freemarker.template">TemplateModelListSequence</a>, <a href="../../freemarker/template/utility/XmlEscape.html" title="class in freemarker.template.utility">XmlEscape</a></dd>
+<dd><a href="../../freemarker/ext/servlet/AllHttpScopesHashModel.html" title="class in freemarker.ext.servlet">AllHttpScopesHashModel</a>, <a href="../../freemarker/ext/beans/ArrayModel.html" title="class in freemarker.ext.beans">ArrayModel</a>, <a href="../../freemarker/ext/beans/BeanModel.html" title="class in freemarker.ext.beans">BeanModel</a>, <a href="../../freemarker/ext/beans/BooleanModel.html" title="class in freemarker.ext.beans">BooleanModel</a>, <a href="../../freemarker/template/utility/CaptureOutput.html" title="class in freemarker.template.utility">CaptureOutput</a>, <a href="../../freemarker/ext/beans/CollectionModel.html" title="class in freemarker.ext.beans">CollectionModel</a>, <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>, <a href="../../freemarker/ext/beans/DateModel.html" title="class in freemarker.ext.beans">DateModel</a>, <a href="../../freemarker/template/DefaultArray
 Adapter.html" title="class in freemarker.template">DefaultArrayAdapter</a>, <a href="../../freemarker/template/DefaultIteratorAdapter.html" title="class in freemarker.template">DefaultIteratorAdapter</a>, <a href="../../freemarker/template/DefaultListAdapter.html" title="class in freemarker.template">DefaultListAdapter</a>, <a href="../../freemarker/template/DefaultMapAdapter.html" title="class in freemarker.template">DefaultMapAdapter</a>, <a href="../../freemarker/template/DefaultNonListCollectionAdapter.html" title="class in freemarker.template">DefaultNonListCollectionAdapter</a>, <a href="../../freemarker/template/utility/DOMNodeModel.html" title="class in freemarker.template.utility">DOMNodeModel</a>, <a href="../../freemarker/ext/beans/EnumerationModel.html" title="class in freemarker.ext.beans">EnumerationModel</a>, <a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a>, <a href="../../freemarker/template/utility
 /Execute.html" title="class in freemarker.template.utility">Execute</a>, <a href="../../freemarker/template/utility/HtmlEscape.html" title="class in freemarker.template.utility">HtmlEscape</a>, <a href="../../freemarker/ext/servlet/HttpRequestHashModel.html" title="class in freemarker.ext.servlet">HttpRequestHashModel</a>, <a href="../../freemarker/ext/servlet/HttpRequestParametersHashModel.html" title="class in freemarker.ext.servlet">HttpRequestParametersHashModel</a>, <a href="../../freemarker/ext/servlet/HttpSessionHashModel.html" title="class in freemarker.ext.servlet">HttpSessionHashModel</a>, <a href="../../freemarker/ext/servlet/IncludePage.html" title="class in freemarker.ext.servlet">IncludePage</a>, <a href="../../freemarker/ext/beans/IteratorModel.html" title="class in freemarker.ext.beans">IteratorModel</a>, <a href="../../freemarker/ext/jython/JythonHashModel.html" title="class in freemarker.ext.jython">JythonHashModel</a>, <a href="../../freemarker/ext/jython/JythonMo
 del.html" title="class in freemarker.ext.jython">JythonModel</a>, <a href="../../freemarker/ext/jython/JythonNumberModel.html" title="class in freemarker.ext.jython">JythonNumberModel</a>, <a href="../../freemarker/template/utility/JythonRuntime.html" title="class in freemarker.template.utility">JythonRuntime</a>, <a href="../../freemarker/ext/jython/JythonSequenceModel.html" title="class in freemarker.ext.jython">JythonSequenceModel</a>, <a href="../../freemarker/template/LocalizedString.html" title="class in freemarker.template">LocalizedString</a>, <a href="../../freemarker/ext/beans/MapModel.html" title="class in freemarker.ext.beans">MapModel</a>, <a href="../../freemarker/ext/jdom/NodeListModel.html" title="class in freemarker.ext.jdom">NodeListModel</a>, <a href="../../freemarker/ext/xml/NodeListModel.html" title="class in freemarker.ext.xml">NodeListModel</a>, <a href="../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a>, <a href="../../
 freemarker/template/utility/NormalizeNewlines.html" title="class in freemarker.template.utility">NormalizeNewlines</a>, <a href="../../freemarker/ext/beans/NumberModel.html" title="class in freemarker.ext.beans">NumberModel</a>, <a href="../../freemarker/template/utility/ObjectConstructor.html" title="class in freemarker.template.utility">ObjectConstructor</a>, <a href="../../freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans">OverloadedMethodsModel</a>, <a href="../../freemarker/template/ResourceBundleLocalizedString.html" title="class in freemarker.template">ResourceBundleLocalizedString</a>, <a href="../../freemarker/ext/beans/ResourceBundleModel.html" title="class in freemarker.ext.beans">ResourceBundleModel</a>, <a href="../../freemarker/ext/rhino/RhinoFunctionModel.html" title="class in freemarker.ext.rhino">RhinoFunctionModel</a>, <a href="../../freemarker/ext/rhino/RhinoScriptableModel.html" title="class in freemarker.ext.rhino">RhinoScrip
 tableModel</a>, <a href="../../freemarker/ext/servlet/ServletContextHashModel.html" title="class in freemarker.ext.servlet">ServletContextHashModel</a>, <a href="../../freemarker/template/SimpleCollection.html" title="class in freemarker.template">SimpleCollection</a>, <a href="../../freemarker/template/SimpleDate.html" title="class in freemarker.template">SimpleDate</a>, <a href="../../freemarker/template/SimpleHash.html" title="class in freemarker.template">SimpleHash</a>, <a href="../../freemarker/template/SimpleList.html" title="class in freemarker.template">SimpleList</a>, <a href="../../freemarker/ext/beans/SimpleMapModel.html" title="class in freemarker.ext.beans">SimpleMapModel</a>, <a href="../../freemarker/ext/beans/SimpleMethodModel.html" title="class in freemarker.ext.beans">SimpleMethodModel</a>, <a href="../../freemarker/template/SimpleNumber.html" title="class in freemarker.template">SimpleNumber</a>, <a href="../../freemarker/template/SimpleScalar.html" title="class 
 in freemarker.template">SimpleScalar</a>, <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template">SimpleSequence</a>, <a href="../../freemarker/template/utility/StandardCompress.html" title="class in freemarker.template.utility">StandardCompress</a>, <a href="../../freemarker/ext/beans/StringModel.html" title="class in freemarker.ext.beans">StringModel</a>, <a href="../../freemarker/ext/jsp/TaglibFactory.html" title="class in freemarker.ext.jsp">TaglibFactory</a>, <a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>, <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>, <a href="../../freemarker/template/TemplateModelListSequence.html" title="class in freemarker.template">TemplateModelListSequence</a>, <a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.cor
 e">TemplateRTFOutputModel</a>, <a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a>, <a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a>, <a href="../../freemarker/template/utility/XmlEscape.html" title="class in freemarker.template.utility">XmlEscape</a></dd>
 </dl>
 <hr>
 <br>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateModelAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelAdapter.html b/docs/api/freemarker/template/TemplateModelAdapter.html
index 76f1970..082bfbd 100644
--- a/docs/api/freemarker/template/TemplateModelAdapter.html
+++ b/docs/api/freemarker/template/TemplateModelAdapter.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>TemplateModelAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateModelAdapter (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="TemplateModelAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateModelAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateModelException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelException.html b/docs/api/freemarker/template/TemplateModelException.html
index 7fb8aac..2c947c0 100644
--- a/docs/api/freemarker/template/TemplateModelException.html
+++ b/docs/api/freemarker/template/TemplateModelException.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>TemplateModelException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateModelException (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="TemplateModelException (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateModelException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateModelIterator.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelIterator.html b/docs/api/freemarker/template/TemplateModelIterator.html
index 4865c76..bd13f12 100644
--- a/docs/api/freemarker/template/TemplateModelIterator.html
+++ b/docs/api/freemarker/template/TemplateModelIterator.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>TemplateModelIterator (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateModelIterator (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="TemplateModelIterator (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateModelIterator (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateModelListSequence.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelListSequence.html b/docs/api/freemarker/template/TemplateModelListSequence.html
index 0d9b4ab..000dffe 100644
--- a/docs/api/freemarker/template/TemplateModelListSequence.html
+++ b/docs/api/freemarker/template/TemplateModelListSequence.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>TemplateModelListSequence (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateModelListSequence (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="TemplateModelListSequence (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateModelListSequence (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateModelWithAPISupport.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateModelWithAPISupport.html b/docs/api/freemarker/template/TemplateModelWithAPISupport.html
index dfcf575..e070857 100644
--- a/docs/api/freemarker/template/TemplateModelWithAPISupport.html
+++ b/docs/api/freemarker/template/TemplateModelWithAPISupport.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>TemplateModelWithAPISupport (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateModelWithAPISupport (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="TemplateModelWithAPISupport (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateModelWithAPISupport (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateNodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateNodeModel.html b/docs/api/freemarker/template/TemplateNodeModel.html
index 82bc819..ff57721 100644
--- a/docs/api/freemarker/template/TemplateNodeModel.html
+++ b/docs/api/freemarker/template/TemplateNodeModel.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>TemplateNodeModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateNodeModel (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="TemplateNodeModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateNodeModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateNotFoundException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateNotFoundException.html b/docs/api/freemarker/template/TemplateNotFoundException.html
index 0539ba5..7529224 100644
--- a/docs/api/freemarker/template/TemplateNotFoundException.html
+++ b/docs/api/freemarker/template/TemplateNotFoundException.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>TemplateNotFoundException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateNotFoundException (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="TemplateNotFoundException (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateNotFoundException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateNumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateNumberModel.html b/docs/api/freemarker/template/TemplateNumberModel.html
index 5b3c52f..1d0c663 100644
--- a/docs/api/freemarker/template/TemplateNumberModel.html
+++ b/docs/api/freemarker/template/TemplateNumberModel.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>TemplateNumberModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateNumberModel (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="TemplateNumberModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateNumberModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -112,9 +112,13 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public interface <span class="typeNameLabel">TemplateNumberModel</span>
 extends <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></pre>
-<div class="block">"number" template language data type; an object that stores a number. There's only one numerical
- type as far as the template language is concerned, but it can store its value using whatever Java number type.
- Making operations between numbers (and so the coercion rules) is up to the <a href="../../freemarker/core/ArithmeticEngine.html" title="class in freemarker.core"><code>ArithmeticEngine</code></a>.</div>
+<div class="block">"number" template language data type; an object that stores a number. There's only one numerical type as far as the
+ template language is concerned, but it can store its value using whatever Java number type. Making operations between
+ numbers (and so the coercion rules) is up to the <a href="../../freemarker/core/ArithmeticEngine.html" title="class in freemarker.core"><code>ArithmeticEngine</code></a>.
+ 
+ <p>
+ Objects of this type should be immutable, that is, calling <a href="../../freemarker/template/TemplateNumberModel.html#getAsNumber--"><code>getAsNumber()</code></a> should always return the same value
+ as for the first time.</div>
 </li>
 </ul>
 </div>
@@ -177,7 +181,7 @@ extends <a href="../../freemarker/template/TemplateModel.html" title="interface
 <h4>getAsNumber</h4>
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;getAsNumber()
             throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
-<div class="block">Returns the numeric value. The return value must not be null.</div>
+<div class="block">Returns the numeric value. The return value must not be <code>null</code>.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a> instance associated with this number model.</dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateScalarModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateScalarModel.html b/docs/api/freemarker/template/TemplateScalarModel.html
index 138eacd..8b81f58 100644
--- a/docs/api/freemarker/template/TemplateScalarModel.html
+++ b/docs/api/freemarker/template/TemplateScalarModel.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>TemplateScalarModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateScalarModel (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="TemplateScalarModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateScalarModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -208,8 +208,12 @@ extends <a href="../../freemarker/template/TemplateModel.html" title="interface
 <h4>getAsString</h4>
 <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;getAsString()
             throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
-<div class="block">Returns the string representation of this model. Don't return <code>null</code>, as that will cause exception.
- (In classic-compatible mode the engine will convert <code>null</code> into empty string, though.)</div>
+<div class="block">Returns the string representation of this model. Don't return <code>null</code>, as that will cause exception. (In
+ classic-compatible mode the engine will convert <code>null</code> into empty string, though.)
+ 
+ <p>
+ Objects of this type should be immutable, that is, calling <a href="../../freemarker/template/TemplateScalarModel.html#getAsString--"><code>getAsString()</code></a> should always return the same
+ value as for the first time.</div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateSequenceModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateSequenceModel.html b/docs/api/freemarker/template/TemplateSequenceModel.html
index 3594111..97da196 100644
--- a/docs/api/freemarker/template/TemplateSequenceModel.html
+++ b/docs/api/freemarker/template/TemplateSequenceModel.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>TemplateSequenceModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateSequenceModel (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="TemplateSequenceModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateSequenceModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TemplateTransformModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TemplateTransformModel.html b/docs/api/freemarker/template/TemplateTransformModel.html
index 334c3bc..608af21 100644
--- a/docs/api/freemarker/template/TemplateTransformModel.html
+++ b/docs/api/freemarker/template/TemplateTransformModel.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>TemplateTransformModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateTransformModel (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="TemplateTransformModel (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateTransformModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/TransformControl.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/TransformControl.html b/docs/api/freemarker/template/TransformControl.html
index b956fdc..faaece0 100644
--- a/docs/api/freemarker/template/TransformControl.html
+++ b/docs/api/freemarker/template/TransformControl.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>TransformControl (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TransformControl (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="TransformControl (FreeMarker 2.3.23 API)";
+            parent.document.title="TransformControl (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/Version.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/Version.html b/docs/api/freemarker/template/Version.html
index 1f0eb1f..fe4afe1 100644
--- a/docs/api/freemarker/template/Version.html
+++ b/docs/api/freemarker/template/Version.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>Version (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Version (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="Version (FreeMarker 2.3.23 API)";
+            parent.document.title="Version (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -145,11 +145,16 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializabl
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/template/Version.html#Version-int-">Version</a></span>(int&nbsp;intValue)</code>
+<div class="block">Creates an object based on the <code>int</code> value that uses the same kind of encoding as <a href="../../freemarker/template/Version.html#intValue--"><code>intValue()</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/template/Version.html#Version-int-int-int-">Version</a></span>(int&nbsp;major,
        int&nbsp;minor,
        int&nbsp;micro)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/template/Version.html#Version-int-int-int-java.lang.String-java.lang.Boolean-java.util.Date-">Version</a></span>(int&nbsp;major,
        int&nbsp;minor,
        int&nbsp;micro,
@@ -157,10 +162,10 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializabl
        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>&nbsp;gaeCompatible,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&nbsp;buildDate)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/template/Version.html#Version-java.lang.String-">Version</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;stringValue)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/template/Version.html#Version-java.lang.String-java.lang.Boolean-java.util.Date-">Version</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;stringValue,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Boolean.html?is-external=true" title="class or interface in java.lang">Boolean</a>&nbsp;gaeCompliant,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&nbsp;buildDate)</code>&nbsp;</td>
@@ -298,6 +303,20 @@ implements <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializabl
                int&nbsp;micro)</pre>
 </li>
 </ul>
+<a name="Version-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Version</h4>
+<pre>public&nbsp;Version(int&nbsp;intValue)</pre>
+<div class="block">Creates an object based on the <code>int</code> value that uses the same kind of encoding as <a href="../../freemarker/template/Version.html#intValue--"><code>intValue()</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="Version-int-int-int-java.lang.String-java.lang.Boolean-java.util.Date-">
 <!--   -->
 </a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/WrappingTemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/WrappingTemplateModel.html b/docs/api/freemarker/template/WrappingTemplateModel.html
index ad86300..4d96e45 100644
--- a/docs/api/freemarker/template/WrappingTemplateModel.html
+++ b/docs/api/freemarker/template/WrappingTemplateModel.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>WrappingTemplateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>WrappingTemplateModel (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="WrappingTemplateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="WrappingTemplateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -227,7 +227,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>WrappingTemplateModel</h4>
-<pre>protected&nbsp;WrappingTemplateModel()</pre>
+<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>
+protected&nbsp;WrappingTemplateModel()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/WrappingTemplateModel.html#WrappingTemplateModel-freemarker.template.ObjectWrapper-"><code>WrappingTemplateModel(ObjectWrapper)</code></a> instead; this method uses the deprecated.</span></div>
 <div class="block">Protected constructor that creates a new wrapping template model using
  the default object wrapper.</div>
@@ -263,7 +264,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setDefaultObjectWrapper</h4>
-<pre>public static&nbsp;void&nbsp;setDefaultObjectWrapper(<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a>&nbsp;objectWrapper)</pre>
+<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 static&nbsp;void&nbsp;setDefaultObjectWrapper(<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a>&nbsp;objectWrapper)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This method has VM-wide effect, which makes it unsuitable for application where multiple components
       might use FreeMarker internally.</span></div>
 <div class="block">Sets the default object wrapper that is used when a wrapping template
@@ -281,7 +283,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getDefaultObjectWrapper</h4>
-<pre>public static&nbsp;<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a>&nbsp;getDefaultObjectWrapper()</pre>
+<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 static&nbsp;<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a>&nbsp;getDefaultObjectWrapper()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Don't depend on this object, as it can be replace by anybody in the same JVM.</span></div>
 <div class="block">Returns the default object wrapper that is used when a wrapping template
  model is constructed without being passed an explicit object wrapper.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/AdapterTemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/AdapterTemplateModel.html b/docs/api/freemarker/template/class-use/AdapterTemplateModel.html
index 5a968f9..c1da861 100644
--- a/docs/api/freemarker/template/class-use/AdapterTemplateModel.html
+++ b/docs/api/freemarker/template/class-use/AdapterTemplateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.template.AdapterTemplateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.template.AdapterTemplateModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.template.AdapterTemplateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.template.AdapterTemplateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -237,7 +237,7 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>


[08/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/class-use/Version.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/class-use/Version.html b/docs/api/freemarker/template/class-use/Version.html
index 86b1fa5..cad66e7 100644
--- a/docs/api/freemarker/template/class-use/Version.html
+++ b/docs/api/freemarker/template/class-use/Version.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.template.Version (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.template.Version (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class freemarker.template.Version (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.template.Version (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -114,6 +114,27 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <!--   -->
 </a>
 <h3>Uses of <a href="../../../freemarker/template/Version.html" title="class in freemarker.template">Version</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#getIncompatibleImprovements--">getIncompatibleImprovements</a></span>()</code>
+<div class="block">Returns <a href="../../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a> from the parent <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ParserConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ParserConfiguration.html#getIncompatibleImprovements--">getIncompatibleImprovements</a></span>()</code>
+<div class="block">See <a href="../../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a>.</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/core/package-summary.html">freemarker.core</a> with parameters of type <a href="../../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
@@ -254,6 +275,12 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <div class="block">FreeMarker version 2.3.23 (an <a href="../../../freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>incompatible improvements break-point</code></a>)</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/template/Version.html" title="class in freemarker.template">Version</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#VERSION_2_3_24">VERSION_2_3_24</a></span></code>
+<div class="block">FreeMarker version 2.3.24 (an <a href="../../../freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>incompatible improvements break-point</code></a>)</div>
+</td>
+</tr>
 </tbody>
 </table>
 <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/package-frame.html b/docs/api/freemarker/template/package-frame.html
index 54b8258..be57d40 100644
--- a/docs/api/freemarker/template/package-frame.html
+++ b/docs/api/freemarker/template/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: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>freemarker.template (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.template (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/package-summary.html b/docs/api/freemarker/template/package-summary.html
index cba0136..9ea322d 100644
--- a/docs/api/freemarker/template/package-summary.html
+++ b/docs/api/freemarker/template/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: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>freemarker.template (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.template (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="freemarker.template (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.template (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -389,8 +389,9 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 <tr class="rowColor">
 <td class="colFirst"><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></td>
 <td class="colLast">
-<div class="block">Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from
- multiple threads.</div>
+<div class="block">
+ Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from multiple
+ threads.</div>
 </td>
 </tr>
 <tr class="altColor">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/package-tree.html b/docs/api/freemarker/template/package-tree.html
index bb8cd90..73e9c4e 100644
--- a/docs/api/freemarker/template/package-tree.html
+++ b/docs/api/freemarker/template/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: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>freemarker.template Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.template 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.template Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.template Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -102,7 +102,7 @@
 </li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><span class="typeNameLink">Configurable</span></a>
 <ul>
-<li type="circle">freemarker.template.<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><span class="typeNameLink">Configuration</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>)</li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><span class="typeNameLink">Configuration</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, freemarker.core.<a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>)</li>
 <li type="circle">freemarker.template.<a href="../../freemarker/template/Template.html" title="class in freemarker.template"><span class="typeNameLink">Template</span></a></li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/package-use.html b/docs/api/freemarker/template/package-use.html
index 4d13ce4..4848572 100644
--- a/docs/api/freemarker/template/package-use.html
+++ b/docs/api/freemarker/template/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.template (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.template (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package freemarker.template (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.template (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -198,8 +198,9 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/Template.html#freemarker.cache">Template</a>
-<div class="block">Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from
- multiple threads.</div>
+<div class="block">
+ Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from multiple
+ threads.</div>
 </td>
 </tr>
 </tbody>
@@ -239,54 +240,65 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </tr>
 <tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/Template.html#freemarker.core">Template</a>
-<div class="block">Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from
- multiple threads.</div>
+<div class="block">
+ Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from multiple
+ threads.</div>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateDateModel.html#freemarker.core">TemplateDateModel</a>
+<div class="block">"date", "time" and "date-time" template language data types: corresponds to <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>.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateDirectiveModel.html#freemarker.core">TemplateDirectiveModel</a>
 <div class="block">"directive" template language data type: used as user-defined directives 
  (much like macros) in templates.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateException.html#freemarker.core">TemplateException</a>
 <div class="block">Runtime exception in a template (as opposed to a parsing-time exception: <a href="../../freemarker/core/ParseException.html" title="class in freemarker.core"><code>ParseException</code></a>).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateExceptionHandler.html#freemarker.core">TemplateExceptionHandler</a>
 <div class="block">Used for the <code>template_exception_handler</code> configuration setting;
  see <a href="../../freemarker/core/Configurable.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-"><code>Configurable.setTemplateExceptionHandler(TemplateExceptionHandler)</code></a> for more.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModel.html#freemarker.core">TemplateHashModel</a>
 <div class="block">"hash" template language data type: an object that contains other objects accessible through string keys
  (sub-variable names).</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateHashModelEx.html#freemarker.core">TemplateHashModelEx</a>
 <div class="block">"extended hash" template language data type; extends <a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template"><code>TemplateHashModel</code></a> by allowing
  iterating through its keys and values.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateModel.html#freemarker.core">TemplateModel</a>
 <div class="block">The common super-interface of the interfaces that stand for the FreeMarker Template Language (FTL) data types.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateModelException.html#freemarker.core">TemplateModelException</a>
 <div class="block"><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> methods throw this exception if the requested data can't be retrieved.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/TemplateNodeModel.html#freemarker.core">TemplateNodeModel</a>
 <div class="block">"node" template language data type: an object that is a node in a tree.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/template/class-use/TemplateNumberModel.html#freemarker.core">TemplateNumberModel</a>
+<div class="block">"number" template language data type; an object that stores a number.</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/Version.html#freemarker.core">Version</a>
 <div class="block">Represents a version number plus the further qualifiers and build info.</div>
@@ -795,8 +807,9 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/Template.html#freemarker.ext.servlet">Template</a>
-<div class="block">Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from
- multiple threads.</div>
+<div class="block">
+ Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from multiple
+ threads.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -994,8 +1007,9 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </tr>
 <tr class="altColor">
 <td class="colOne"><a href="../../freemarker/template/class-use/Template.html#freemarker.template">Template</a>
-<div class="block">Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from
- multiple threads.</div>
+<div class="block">
+ Stores an already parsed template, ready to be processed (rendered) for unlimited times, possibly from multiple
+ threads.</div>
 </td>
 </tr>
 <tr class="rowColor">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/CaptureOutput.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/CaptureOutput.html b/docs/api/freemarker/template/utility/CaptureOutput.html
index c225da5..4e47f1a 100644
--- a/docs/api/freemarker/template/utility/CaptureOutput.html
+++ b/docs/api/freemarker/template/utility/CaptureOutput.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>CaptureOutput (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>CaptureOutput (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="CaptureOutput (FreeMarker 2.3.23 API)";
+            parent.document.title="CaptureOutput (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -117,7 +117,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Use block-assignments instead, like <code>&lt;assign x&gt;...&lt;/assign&gt;</code>.</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">CaptureOutput</span>
+<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 class <span class="typeNameLabel">CaptureOutput</span>
 extends <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>
 implements <a href="../../../freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template">TemplateTransformModel</a></pre>
 <div class="block">A transform that captures the output of a block of FTL code and stores that in a variable.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/ClassUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ClassUtil.html b/docs/api/freemarker/template/utility/ClassUtil.html
index 2e79a38..931efc8 100644
--- a/docs/api/freemarker/template/utility/ClassUtil.html
+++ b/docs/api/freemarker/template/utility/ClassUtil.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>ClassUtil (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ClassUtil (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="ClassUtil (FreeMarker 2.3.23 API)";
+            parent.document.title="ClassUtil (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/CollectionUtils.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/CollectionUtils.html b/docs/api/freemarker/template/utility/CollectionUtils.html
index c0595ea..a4425dc 100644
--- a/docs/api/freemarker/template/utility/CollectionUtils.html
+++ b/docs/api/freemarker/template/utility/CollectionUtils.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>CollectionUtils (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>CollectionUtils (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="CollectionUtils (FreeMarker 2.3.23 API)";
+            parent.document.title="CollectionUtils (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/Collections12.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/Collections12.html b/docs/api/freemarker/template/utility/Collections12.html
index a0b1e55..5d43fe4 100644
--- a/docs/api/freemarker/template/utility/Collections12.html
+++ b/docs/api/freemarker/template/utility/Collections12.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>Collections12 (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Collections12 (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="Collections12 (FreeMarker 2.3.23 API)";
+            parent.document.title="Collections12 (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -113,7 +113,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Not needed anymore, as FreeMarker now requires higher than Java 1.3</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">Collections12</span>
+<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 class <span class="typeNameLabel">Collections12</span>
 extends <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></pre>
 <div class="block">Implementation of missing JDK 1.3 collection features for JDK 1.2</div>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/Constants.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/Constants.html b/docs/api/freemarker/template/utility/Constants.html
index 5778161..a26b013 100644
--- a/docs/api/freemarker/template/utility/Constants.html
+++ b/docs/api/freemarker/template/utility/Constants.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>Constants (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Constants (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="Constants (FreeMarker 2.3.23 API)";
+            parent.document.title="Constants (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/DOMNodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DOMNodeModel.html b/docs/api/freemarker/template/utility/DOMNodeModel.html
index 3e62050..7edb45e 100644
--- a/docs/api/freemarker/template/utility/DOMNodeModel.html
+++ b/docs/api/freemarker/template/utility/DOMNodeModel.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>DOMNodeModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DOMNodeModel (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="DOMNodeModel (FreeMarker 2.3.23 API)";
+            parent.document.title="DOMNodeModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html b/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html
index 8621743..3382476 100644
--- a/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html
+++ b/docs/api/freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.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>DateUtil.CalendarFieldsToDateConverter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DateUtil.CalendarFieldsToDateConverter (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="DateUtil.CalendarFieldsToDateConverter (FreeMarker 2.3.23 API)";
+            parent.document.title="DateUtil.CalendarFieldsToDateConverter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/DateUtil.DateParseException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.DateParseException.html b/docs/api/freemarker/template/utility/DateUtil.DateParseException.html
index a51a0c3..6aa4d5b 100644
--- a/docs/api/freemarker/template/utility/DateUtil.DateParseException.html
+++ b/docs/api/freemarker/template/utility/DateUtil.DateParseException.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>DateUtil.DateParseException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DateUtil.DateParseException (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="DateUtil.DateParseException (FreeMarker 2.3.23 API)";
+            parent.document.title="DateUtil.DateParseException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html b/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html
index dfb7449..94f138b 100644
--- a/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html
+++ b/docs/api/freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.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>DateUtil.DateToISO8601CalendarFactory (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DateUtil.DateToISO8601CalendarFactory (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="DateUtil.DateToISO8601CalendarFactory (FreeMarker 2.3.23 API)";
+            parent.document.title="DateUtil.DateToISO8601CalendarFactory (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html b/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html
index 7bd7168..3096b83 100644
--- a/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.html
+++ b/docs/api/freemarker/template/utility/DateUtil.TrivialCalendarFieldsToDateConverter.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>DateUtil.TrivialCalendarFieldsToDateConverter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DateUtil.TrivialCalendarFieldsToDateConverter (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="DateUtil.TrivialCalendarFieldsToDateConverter (FreeMarker 2.3.23 API)";
+            parent.document.title="DateUtil.TrivialCalendarFieldsToDateConverter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html b/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html
index 82eea6b..c4fe2ca 100644
--- a/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.html
+++ b/docs/api/freemarker/template/utility/DateUtil.TrivialDateToISO8601CalendarFactory.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>DateUtil.TrivialDateToISO8601CalendarFactory (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DateUtil.TrivialDateToISO8601CalendarFactory (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="DateUtil.TrivialDateToISO8601CalendarFactory (FreeMarker 2.3.23 API)";
+            parent.document.title="DateUtil.TrivialDateToISO8601CalendarFactory (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/DateUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DateUtil.html b/docs/api/freemarker/template/utility/DateUtil.html
index 31ed07e..402f30f 100644
--- a/docs/api/freemarker/template/utility/DateUtil.html
+++ b/docs/api/freemarker/template/utility/DateUtil.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>DateUtil (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DateUtil (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="DateUtil (FreeMarker 2.3.23 API)";
+            parent.document.title="DateUtil (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/DeepUnwrap.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/DeepUnwrap.html b/docs/api/freemarker/template/utility/DeepUnwrap.html
index c3084e1..7f18fca 100644
--- a/docs/api/freemarker/template/utility/DeepUnwrap.html
+++ b/docs/api/freemarker/template/utility/DeepUnwrap.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>DeepUnwrap (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DeepUnwrap (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="DeepUnwrap (FreeMarker 2.3.23 API)";
+            parent.document.title="DeepUnwrap (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -274,8 +274,9 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>premissiveUnwrap</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;premissiveUnwrap(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)
-                               throws <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<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 static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;premissiveUnwrap(<a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)
+                                            throws <a href="../../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">the name of this method is mistyped. Use 
  <a href="../../../freemarker/template/utility/DeepUnwrap.html#permissiveUnwrap-freemarker.template.TemplateModel-"><code>permissiveUnwrap(TemplateModel)</code></a> instead.</span></div>
 <dl>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/Execute.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/Execute.html b/docs/api/freemarker/template/utility/Execute.html
index fdff678..3904cb1 100644
--- a/docs/api/freemarker/template/utility/Execute.html
+++ b/docs/api/freemarker/template/utility/Execute.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>Execute (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Execute (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="Execute (FreeMarker 2.3.23 API)";
+            parent.document.title="Execute (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/HtmlEscape.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/HtmlEscape.html b/docs/api/freemarker/template/utility/HtmlEscape.html
index 0850d86..893571f 100644
--- a/docs/api/freemarker/template/utility/HtmlEscape.html
+++ b/docs/api/freemarker/template/utility/HtmlEscape.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>HtmlEscape (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>HtmlEscape (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="HtmlEscape (FreeMarker 2.3.23 API)";
+            parent.document.title="HtmlEscape (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/JythonRuntime.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/JythonRuntime.html b/docs/api/freemarker/template/utility/JythonRuntime.html
index 81f44ef..9e9ba3f 100644
--- a/docs/api/freemarker/template/utility/JythonRuntime.html
+++ b/docs/api/freemarker/template/utility/JythonRuntime.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>JythonRuntime (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>JythonRuntime (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="JythonRuntime (FreeMarker 2.3.23 API)";
+            parent.document.title="JythonRuntime (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/NormalizeNewlines.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/NormalizeNewlines.html b/docs/api/freemarker/template/utility/NormalizeNewlines.html
index afe6be0..b951edc 100644
--- a/docs/api/freemarker/template/utility/NormalizeNewlines.html
+++ b/docs/api/freemarker/template/utility/NormalizeNewlines.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>NormalizeNewlines (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NormalizeNewlines (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="NormalizeNewlines (FreeMarker 2.3.23 API)";
+            parent.document.title="NormalizeNewlines (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/NullArgumentException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/NullArgumentException.html b/docs/api/freemarker/template/utility/NullArgumentException.html
index d9faeee..270ae4d 100644
--- a/docs/api/freemarker/template/utility/NullArgumentException.html
+++ b/docs/api/freemarker/template/utility/NullArgumentException.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>NullArgumentException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NullArgumentException (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="NullArgumentException (FreeMarker 2.3.23 API)";
+            parent.document.title="NullArgumentException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -161,8 +161,15 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgum
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullArgumentException.html#NullArgumentException--">NullArgumentException</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullArgumentException.html#NullArgumentException-java.lang.String-">NullArgumentException</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;argumentName)</code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullArgumentException.html#NullArgumentException-java.lang.String-java.lang.String-">NullArgumentException</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;argumentName,
+                     <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;details)</code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -218,15 +225,34 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgum
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
+<a name="NullArgumentException--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NullArgumentException</h4>
+<pre>public&nbsp;NullArgumentException()</pre>
+</li>
+</ul>
 <a name="NullArgumentException-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>NullArgumentException</h4>
 <pre>public&nbsp;NullArgumentException(<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;argumentName)</pre>
 </li>
 </ul>
+<a name="NullArgumentException-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NullArgumentException</h4>
+<pre>public&nbsp;NullArgumentException(<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;argumentName,
+                             <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;details)</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/NullWriter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/NullWriter.html b/docs/api/freemarker/template/utility/NullWriter.html
index 09e2725..87d16e6 100644
--- a/docs/api/freemarker/template/utility/NullWriter.html
+++ b/docs/api/freemarker/template/utility/NullWriter.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>NullWriter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NullWriter (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NullWriter (FreeMarker 2.3.23 API)";
+            parent.document.title="NullWriter (FreeMarker 2.3.24-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,"i8":10,"i9":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -171,32 +171,46 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#append-char-">append</a></span>(char&nbsp;c)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#append-java.lang.CharSequence-">append</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;csq)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#append-java.lang.CharSequence-int-int-">append</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;csq,
+      int&nbsp;start,
+      int&nbsp;end)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#close--">close</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#flush--">flush</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#write-char:A-">write</a></span>(char[]&nbsp;cbuf)</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#write-char:A-int-int-">write</a></span>(char[]&nbsp;cbuf,
      int&nbsp;off,
      int&nbsp;len)</code>&nbsp;</td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#write-int-">write</a></span>(int&nbsp;c)</code>&nbsp;</td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#write-java.lang.String-">write</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;str)</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/NullWriter.html#write-java.lang.String-int-int-">write</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;str,
      int&nbsp;off,
@@ -204,13 +218,6 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.io.Writer">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></h3>
-<code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#append-char-" title="class or interface in java.io">append</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#append-java.lang.CharSequence-" title="class or interface in java.io">append</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#append-java.lang.CharSequence-int-int-" title="class or interface in java.io">append</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -355,7 +362,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is
 <a name="write-java.lang.String-int-int-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>write</h4>
 <pre>public&nbsp;void&nbsp;write(<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;str,
@@ -370,6 +377,62 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is
 </dl>
 </li>
 </ul>
+<a name="append-java.lang.CharSequence-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>append</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;append(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;csq)
+              throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Appendable.html?is-external=true#append-java.lang.CharSequence-" title="class or interface in java.lang">append</a></code>&nbsp;in interface&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#append-java.lang.CharSequence-" title="class or interface in java.io">append</a></code>&nbsp;in class&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="append-java.lang.CharSequence-int-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>append</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;append(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/CharSequence.html?is-external=true" title="class or interface in java.lang">CharSequence</a>&nbsp;csq,
+                     int&nbsp;start,
+                     int&nbsp;end)
+              throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Appendable.html?is-external=true#append-java.lang.CharSequence-int-int-" title="class or interface in java.lang">append</a></code>&nbsp;in interface&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#append-java.lang.CharSequence-int-int-" title="class or interface in java.io">append</a></code>&nbsp;in class&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="append-char-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>append</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;append(char&nbsp;c)
+              throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Appendable.html?is-external=true#append-char-" title="class or interface in java.lang">append</a></code>&nbsp;in interface&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Appendable.html?is-external=true" title="class or interface in java.lang">Appendable</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true#append-char-" title="class or interface in java.io">append</a></code>&nbsp;in class&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/NumberUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/NumberUtil.html b/docs/api/freemarker/template/utility/NumberUtil.html
index bf41376..0c9c050 100644
--- a/docs/api/freemarker/template/utility/NumberUtil.html
+++ b/docs/api/freemarker/template/utility/NumberUtil.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>NumberUtil (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NumberUtil (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="NumberUtil (FreeMarker 2.3.23 API)";
+            parent.document.title="NumberUtil (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/ObjectConstructor.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ObjectConstructor.html b/docs/api/freemarker/template/utility/ObjectConstructor.html
index 22a7f57..8ab53f5 100644
--- a/docs/api/freemarker/template/utility/ObjectConstructor.html
+++ b/docs/api/freemarker/template/utility/ObjectConstructor.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>ObjectConstructor (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ObjectConstructor (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="ObjectConstructor (FreeMarker 2.3.23 API)";
+            parent.document.title="ObjectConstructor (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/ObjectFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ObjectFactory.html b/docs/api/freemarker/template/utility/ObjectFactory.html
index 7fadec2..0e9c7fd 100644
--- a/docs/api/freemarker/template/utility/ObjectFactory.html
+++ b/docs/api/freemarker/template/utility/ObjectFactory.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>ObjectFactory (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ObjectFactory (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="ObjectFactory (FreeMarker 2.3.23 API)";
+            parent.document.title="ObjectFactory (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -94,7 +94,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">freemarker.template.utility</div>
-<h2 title="Interface ObjectFactory" class="title">Interface ObjectFactory</h2>
+<h2 title="Interface ObjectFactory" class="title">Interface ObjectFactory&lt;T&gt;</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -102,8 +102,8 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public interface <span class="typeNameLabel">ObjectFactory</span></pre>
-<div class="block">Used for the trivial cases of the factory pattern. Will have generic type argument as soon as we switch to Java 5.</div>
+<pre>public interface <span class="typeNameLabel">ObjectFactory&lt;T&gt;</span></pre>
+<div class="block">Used for the trivial cases of the factory pattern. Has a generic type argument since 2.3.24.</div>
 <dl>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.3.22</dd>
@@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab";
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colFirst"><code><a href="../../../freemarker/template/utility/ObjectFactory.html" title="type parameter in ObjectFactory">T</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/template/utility/ObjectFactory.html#createObject--">createObject</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
@@ -151,8 +151,8 @@ var activeTableTab = "activeTableTab";
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createObject</h4>
-<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;createObject()
-             throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<pre><a href="../../../freemarker/template/utility/ObjectFactory.html" title="type parameter in ObjectFactory">T</a>&nbsp;createObject()
+        throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html b/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html
index 0dbc0ad..08fc827 100644
--- a/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.html
+++ b/docs/api/freemarker/template/utility/ObjectWrapperWithAPISupport.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>ObjectWrapperWithAPISupport (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ObjectWrapperWithAPISupport (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="ObjectWrapperWithAPISupport (FreeMarker 2.3.23 API)";
+            parent.document.title="ObjectWrapperWithAPISupport (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/OptimizerUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/OptimizerUtil.html b/docs/api/freemarker/template/utility/OptimizerUtil.html
index 04b4d68..9764fa6 100644
--- a/docs/api/freemarker/template/utility/OptimizerUtil.html
+++ b/docs/api/freemarker/template/utility/OptimizerUtil.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>OptimizerUtil (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>OptimizerUtil (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="OptimizerUtil (FreeMarker 2.3.23 API)";
+            parent.document.title="OptimizerUtil (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/RichObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/RichObjectWrapper.html b/docs/api/freemarker/template/utility/RichObjectWrapper.html
index 5404a11..42cb2c5 100644
--- a/docs/api/freemarker/template/utility/RichObjectWrapper.html
+++ b/docs/api/freemarker/template/utility/RichObjectWrapper.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>RichObjectWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>RichObjectWrapper (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="RichObjectWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="RichObjectWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/SecurityUtilities.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/SecurityUtilities.html b/docs/api/freemarker/template/utility/SecurityUtilities.html
index d3e85bf..2293741 100644
--- a/docs/api/freemarker/template/utility/SecurityUtilities.html
+++ b/docs/api/freemarker/template/utility/SecurityUtilities.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>SecurityUtilities (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SecurityUtilities (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="SecurityUtilities (FreeMarker 2.3.23 API)";
+            parent.document.title="SecurityUtilities (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/StandardCompress.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/StandardCompress.html b/docs/api/freemarker/template/utility/StandardCompress.html
index f5d3b0d..f9238e4 100644
--- a/docs/api/freemarker/template/utility/StandardCompress.html
+++ b/docs/api/freemarker/template/utility/StandardCompress.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>StandardCompress (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>StandardCompress (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="StandardCompress (FreeMarker 2.3.23 API)";
+            parent.document.title="StandardCompress (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {


[44/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/PathRegexMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/PathRegexMatcher.html b/docs/api/freemarker/cache/PathRegexMatcher.html
new file mode 100644
index 0000000..45dfdb2
--- /dev/null
+++ b/docs/api/freemarker/cache/PathRegexMatcher.html
@@ -0,0 +1,296 @@
+<!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>PathRegexMatcher (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="PathRegexMatcher (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/PathRegexMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/PathRegexMatcher.html" target="_top">Frames</a></li>
+<li><a href="PathRegexMatcher.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.cache</div>
+<h2 title="Class PathRegexMatcher" class="title">Class PathRegexMatcher</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/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">freemarker.cache.TemplateSourceMatcher</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.PathRegexMatcher</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">PathRegexMatcher</span>
+extends <a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></pre>
+<div class="block">Matches the whole template source name (also known as template source path) with the given regular expression.
+ Note that the template source name is relative to the template storage root defined by the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>;
+ it's not the full path of a file on the file system.</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/cache/PathRegexMatcher.html#PathRegexMatcher-java.lang.String-">PathRegexMatcher</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;regex)</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>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/PathRegexMatcher.html#matches-java.lang.String-java.lang.Object-">matches</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;sourceName,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</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="PathRegexMatcher-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PathRegexMatcher</h4>
+<pre>public&nbsp;PathRegexMatcher(<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;regex)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>regex</code> - Glob with the syntax defined by <a href="../../freemarker/template/utility/StringUtil.html#globToRegularExpression-java.lang.String-"><code>StringUtil.globToRegularExpression(String)</code></a>. Must not
+            start with <code>/</code>.</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="matches-java.lang.String-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>matches</h4>
+<pre>public&nbsp;boolean&nbsp;matches(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</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/PathRegexMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/PathRegexMatcher.html" target="_top">Frames</a></li>
+<li><a href="PathRegexMatcher.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/SoftCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/SoftCacheStorage.html b/docs/api/freemarker/cache/SoftCacheStorage.html
index a47141b..fa6ddfb 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>SoftCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SoftCacheStorage (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="SoftCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="SoftCacheStorage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -117,13 +117,10 @@ var activeTableTab = "activeTableTab";
 <pre>public class <span class="typeNameLabel">SoftCacheStorage</span>
 extends <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>
 implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a>, <a href="../../freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache">CacheStorageWithGetSize</a></pre>
-<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.
- This class is thread-safe to the extent that its underlying map is. The 
- default implementation uses a concurrent map on Java 5 and above, so it's
- thread-safe in that case.</div>
+<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. This
+ class is thread-safe to the extent that its underlying map is. The parameterless constructor uses a thread-safe map
+ since 2.3.24 or Java 5.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../freemarker/template/Configuration.html#setCacheStorage-freemarker.cache.CacheStorage-"><code>Configuration.setCacheStorage(CacheStorage)</code></a></dd>
@@ -146,7 +143,9 @@ implements <a href="../../freemarker/cache/ConcurrentCacheStorage.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/SoftCacheStorage.html#SoftCacheStorage--">SoftCacheStorage</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/SoftCacheStorage.html#SoftCacheStorage--">SoftCacheStorage</a></span>()</code>
+<div class="block">Creates an instance that uses a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentMap</code></a> internally.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/SoftCacheStorage.html#SoftCacheStorage-java.util.Map-">SoftCacheStorage</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;backingMap)</code>&nbsp;</td>
@@ -183,8 +182,7 @@ implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="i
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/SoftCacheStorage.html#isConcurrent--">isConcurrent</a></span>()</code>
-<div class="block">Returns true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</div>
+<div class="block">Returns true if the underlying Map is a <code>ConcurrentMap</code>.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
@@ -225,6 +223,7 @@ implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="i
 <li class="blockList">
 <h4>SoftCacheStorage</h4>
 <pre>public&nbsp;SoftCacheStorage()</pre>
+<div class="block">Creates an instance that uses a <a href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentMap.html?is-external=true" title="class or interface in java.util.concurrent"><code>ConcurrentMap</code></a> internally.</div>
 </li>
 </ul>
 <a name="SoftCacheStorage-java.util.Map-">
@@ -251,9 +250,7 @@ implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="i
 <li class="blockList">
 <h4>isConcurrent</h4>
 <pre>public&nbsp;boolean&nbsp;isConcurrent()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/cache/ConcurrentCacheStorage.html#isConcurrent--">ConcurrentCacheStorage</a></code></span></div>
-<div class="block">Returns true if this instance of cache storage is concurrently 
- accessible from multiple threads without synchronization.</div>
+<div class="block">Returns true if the underlying Map is a <code>ConcurrentMap</code>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/cache/ConcurrentCacheStorage.html#isConcurrent--">isConcurrent</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a></code></dd>
@@ -360,7 +357,7 @@ implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="i
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/NullCacheStorage.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/StatefulTemplateLoader.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/StatefulTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/StatefulTemplateLoader.html b/docs/api/freemarker/cache/StatefulTemplateLoader.html
index bc60083..278e967 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>StatefulTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>StatefulTemplateLoader (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="StatefulTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="StatefulTemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public interface <span class="typeNameLabel">StatefulTemplateLoader</span>
 extends <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></pre>
-<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. caches of earlier lookups for performance 
  optimization purposes etc.) and support resetting of their state.</div>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/StringTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/StringTemplateLoader.html b/docs/api/freemarker/cache/StringTemplateLoader.html
index a70d207..4d99428 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>StringTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>StringTemplateLoader (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="StringTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="StringTemplateLoader (FreeMarker 2.3.24-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";
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <pre>public class <span class="typeNameLabel">StringTemplateLoader</span>
 extends <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>
 implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></pre>
-<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.
 
  In most case the regular way of loading templates from files will be fine.
@@ -226,6 +226,12 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 </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/StringTemplateLoader.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.</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/StringTemplateLoader.html#toString--">toString</a></span>()</code>
 <div class="block">Show class name and some details that are useful in template-not-found errors.</div>
@@ -315,6 +321,24 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 </dl>
 </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.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - Exactly the key with which the template was added.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Whether a template was found with the given key (and hence was removed now)</dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="closeTemplateSource-java.lang.Object-">
 <!--   -->
 </a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/StrongCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/StrongCacheStorage.html b/docs/api/freemarker/cache/StrongCacheStorage.html
index 51b4046..ca13e99 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>StrongCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>StrongCacheStorage (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="StrongCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="StrongCacheStorage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -117,12 +117,9 @@ var activeTableTab = "activeTableTab";
 <pre>public class <span class="typeNameLabel">StrongCacheStorage</span>
 extends <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>
 implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a>, <a href="../../freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache">CacheStorageWithGetSize</a></pre>
-<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>.
- It holds a strong reference to all objects it was passed, therefore prevents
- the cache from being purged during garbage collection.
- This class is thread-safe to the extent that its underlying map is. The 
- default implementation uses a concurrent map on Java 5 and above, so it's
- thread-safe in that case.</div>
+<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>. It holds a strong reference to all objects
+ it was passed, therefore prevents the cache from being purged during garbage collection. This class is always
+ thread-safe since 2.3.24, before that if we are running on Java 5 or later.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../freemarker/template/Configuration.html#setCacheStorage-freemarker.cache.CacheStorage-"><code>Configuration.setCacheStorage(CacheStorage)</code></a></dd>
@@ -179,7 +176,7 @@ implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="i
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/StrongCacheStorage.html#isConcurrent--">isConcurrent</a></span>()</code>
-<div class="block">Returns true if the underlying Map is a <code>ConcurrentMap</code>.</div>
+<div class="block">Always returns <code>true</code>.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
@@ -237,7 +234,7 @@ implements <a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="i
 <li class="blockList">
 <h4>isConcurrent</h4>
 <pre>public&nbsp;boolean&nbsp;isConcurrent()</pre>
-<div class="block">Returns true if the underlying Map is a <code>ConcurrentMap</code>.</div>
+<div class="block">Always returns <code>true</code>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/cache/ConcurrentCacheStorage.html#isConcurrent--">isConcurrent</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/cache/ConcurrentCacheStorage.html" title="interface in freemarker.cache">ConcurrentCacheStorage</a></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/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 74d17b6..d308798 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_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>TemplateCache.MaybeMissingTemplate (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateCache.MaybeMissingTemplate (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="TemplateCache.MaybeMissingTemplate (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateCache.MaybeMissingTemplate (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/TemplateCache.MaybeMissingTemplate.html" target="_top">Frames</a></li>
@@ -242,7 +242,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/TemplateCache.MaybeMissingTemplate.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/TemplateCache.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateCache.html b/docs/api/freemarker/cache/TemplateCache.html
index 6eab95e..c32c926 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_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>TemplateCache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateCache (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TemplateCache (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateCache (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":41,"i2":10,"i3":10,"i4":41,"i5":10,"i6":10,"i7":42,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":42,"i14":10,"i15":10};
+var methods = {"i0":10,"i1":41,"i2":10,"i3":10,"i4":41,"i5":10,"i6":10,"i7":42,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":42,"i15":10,"i16":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -217,9 +217,21 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
              <a href="../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
              <a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
              <a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
-             <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
+             <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
+<div class="block">Same as
+ <a href="../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-"><code>TemplateCache(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="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
+             <a href="../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache">CacheStorage</a>&nbsp;cacheStorage,
+             <a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a>&nbsp;templateLookupStrategy,
+             <a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a>&nbsp;templateNameFormat,
+             <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>&nbsp;templateConfigurations,
+             <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.template.Configuration-">TemplateCache</a></span>(<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader,
              <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
 <div class="block">Same as <a href="../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> with a new <a href="../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache"><code>SoftCacheStorage</code></a>
@@ -309,18 +321,22 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </td>
 </tr>
 <tr id="i8" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#getTemplateConfigurations--">getTemplateConfigurations</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#getTemplateLoader--">getTemplateLoader</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache">TemplateLookupStrategy</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#getTemplateLookupStrategy--">getTemplateLookupStrategy</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache">TemplateNameFormat</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#getTemplateNameFormat--">getTemplateNameFormat</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#removeTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-">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,
               <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,
@@ -330,14 +346,17 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">Removes an entry from the cache, hence forcing the re-loading of it when it's next time requested.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#removeTemplate-java.lang.String-java.util.Locale-java.lang.String-boolean-">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,
               <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/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
-              boolean&nbsp;parse)</code>&nbsp;</td>
+              boolean&nbsp;parse)</code>
+<div class="block">Same as <a href="../../freemarker/cache/TemplateCache.html#removeTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-"><code>removeTemplate(String, Locale, Object, String, boolean)</code></a> with <code>null</code>
+ <code>customLookupCondition</code>.</div>
+</td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></span>(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -345,14 +364,14 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#setDelay-long-">setDelay</a></span>(long&nbsp;delay)</code>
 <div class="block">Sets the delay in milliseconds between checking for newer versions of a
  template sources.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateCache.html#setLocalizedLookup-boolean-">setLocalizedLookup</a></span>(boolean&nbsp;localizedLookup)</code>
 <div class="block">Setis if localized template lookup is enabled or not.</div>
@@ -410,7 +429,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>TemplateCache</h4>
-<pre>public&nbsp;TemplateCache()</pre>
+<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;TemplateCache()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-"><code>TemplateCache(TemplateLoader)</code></a> instead. The default loader is useless in most
      applications, also it can mean a security risk.</span></div>
 <div class="block">Returns a template cache that will first try to load a template from
@@ -424,7 +444,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>TemplateCache</h4>
-<pre>public&nbsp;TemplateCache(<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader)</pre>
+<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;TemplateCache(<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;templateLoader)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> instead.</span></div>
 </li>
 </ul>
@@ -434,8 +455,9 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>TemplateCache</h4>
-<pre>public&nbsp;TemplateCache(<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)</pre>
+<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;TemplateCache(<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)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> instead.</span></div>
 </li>
 </ul>
@@ -476,6 +498,26 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <a name="TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.template.Configuration-">
 <!--   -->
 </a>
+<ul class="blockList">
+<li class="blockList">
+<h4>TemplateCache</h4>
+<pre>public&nbsp;TemplateCache(<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/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</pre>
+<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(TemplateLoader, CacheStorage, TemplateLookupStrategy, TemplateNameFormat,
+ TemplateConfigurationFactory, Configuration)</code></a> with <code>null</code> for <code>templateConfigurations</code>-s.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.22</dd>
+</dl>
+</li>
+</ul>
+<a name="TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.cache.TemplateLookupStrategy-freemarker.cache.TemplateNameFormat-freemarker.cache.TemplateConfigurationFactory-freemarker.template.Configuration-">
+<!--   -->
+</a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TemplateCache</h4>
@@ -483,16 +525,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
                      <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)</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>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>
+<dd><code>templateConfigurations</code> - The <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> to use. Can be <code>null</code> (then all templates will use the
+            settings coming from the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> as is).</dd>
 <dd><code>config</code> - The <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> this cache will be used for. Can be <code>null</code> for backward compatibility,
             as it can be set with <a href="../../freemarker/cache/TemplateCache.html#setConfiguration-freemarker.template.Configuration-"><code>setConfiguration(Configuration)</code></a> later.</dd>
 <dt><span class="simpleTagLabel">Since:</span></dt>
-<dd>2.3.22</dd>
+<dd>2.3.24</dd>
 </dl>
 </li>
 </ul>
@@ -510,7 +556,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setConfiguration</h4>
-<pre>public&nbsp;void&nbsp;setConfiguration(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</pre>
+<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;void&nbsp;setConfiguration(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;config)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use the <a href="../../freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> constructor.</span></div>
 <div class="block">Sets the configuration object to which this cache belongs. This
  method is called by the configuration itself to establish the
@@ -561,6 +608,19 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="getTemplateConfigurations--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTemplateConfigurations</h4>
+<pre>public&nbsp;<a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache">TemplateConfigurationFactory</a>&nbsp;getTemplateConfigurations()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-">
 <!--   -->
 </a>
@@ -608,11 +668,12 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getTemplate</h4>
-<pre>public&nbsp;<a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;getTemplate(<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/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/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
-                            boolean&nbsp;parseAsFTL)
-                     throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<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;<a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;getTemplate(<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/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/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
+                                         boolean&nbsp;parseAsFTL)
+                                  throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/cache/TemplateCache.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-"><code>getTemplate(String, Locale, Object, String, boolean)</code></a>, which can return more detailed
              result when the template is missing.</span></div>
 <div class="block">Similar to <a href="../../freemarker/cache/TemplateCache.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-"><code>getTemplate(String, Locale, Object, String, boolean)</code></a> with <code>null</code>
@@ -632,7 +693,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>createLegacyDefaultTemplateLoader</h4>
-<pre>protected static&nbsp;<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;createLegacyDefaultTemplateLoader()</pre>
+<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>
+protected static&nbsp;<a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a>&nbsp;createLegacyDefaultTemplateLoader()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">The <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> should be always specified by the constructor caller.</span></div>
 <div class="block">Returns the deprecated default template loader of FreeMarker 2.3.0.</div>
 </li>
@@ -712,6 +774,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
                            <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
                            boolean&nbsp;parse)
                     throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block">Same as <a href="../../freemarker/cache/TemplateCache.html#removeTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-"><code>removeTemplate(String, Locale, Object, String, boolean)</code></a> with <code>null</code>
+ <code>customLookupCondition</code>.</div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
@@ -735,7 +799,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  <a href="../../freemarker/cache/TemplateCache.html#setDelay-long-"><code>setDelay(long)</code></a> alone does.
  
  For the meaning of the parameters, see
- <a href="../../freemarker/cache/TemplateCache.html#getTemplate-freemarker.cache.TemplateLoader-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-"><code>getTemplate(TemplateLoader, String, Locale, Object, String, boolean)</code></a>.</div>
+ <a href="../../freemarker/template/Configuration.html#getTemplate-java.lang.String-java.util.Locale-java.lang.Object-java.lang.String-boolean-boolean-"><code>Configuration.getTemplate(String, Locale, Object, String, boolean, boolean)</code></a></div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
@@ -748,9 +812,10 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getFullTemplatePath</h4>
-<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getFullTemplatePath(<a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
-                                         <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;baseName,
-                                         <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;targetName)</pre>
+<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 static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getFullTemplatePath(<a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env,
+                                                      <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;baseName,
+                                                      <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;targetName)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/core/Environment.html#toFullTemplateName-java.lang.String-java.lang.String-"><code>Environment.toFullTemplateName(String, String)</code></a> instead, as that can throw
              <a href="../../freemarker/template/MalformedTemplateNameException.html" title="class in freemarker.template"><code>MalformedTemplateNameException</code></a>, and is on a more logical place anyway.</span></div>
 <dl>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/TemplateConfigurationFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateConfigurationFactory.html b/docs/api/freemarker/cache/TemplateConfigurationFactory.html
new file mode 100644
index 0000000..8440467
--- /dev/null
+++ b/docs/api/freemarker/cache/TemplateConfigurationFactory.html
@@ -0,0 +1,358 @@
+<!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>TemplateConfigurationFactory (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="TemplateConfigurationFactory (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":10,"i2":10,"i3":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateConfigurationFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/TemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfigurationFactory.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.cache</div>
+<h2 title="Class TemplateConfigurationFactory" class="title">Class TemplateConfigurationFactory</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.TemplateConfigurationFactory</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache">ConditionalTemplateConfigurationFactory</a>, <a href="../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html" title="class in freemarker.cache">FirstMatchTemplateConfigurationFactory</a>, <a href="../../freemarker/cache/MergingTemplateConfigurationFactory.html" title="class in freemarker.cache">MergingTemplateConfigurationFactory</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateConfigurationFactory</span>
+extends <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></pre>
+<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>
+<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/cache/TemplateConfigurationFactory.html#TemplateConfigurationFactory--">TemplateConfigurationFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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>abstract <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>
+<div class="block">Returns (maybe creates) the <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateConfigurationFactory.html#getConfiguration--">getConfiguration</a></span>()</code>
+<div class="block">Returns the configuration this object belongs to, or <code>null</code> if it isn't yet bound to a
+ <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-">setConfiguration</a></span>(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Binds this <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> to a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfigurationOfChildren-freemarker.template.Configuration-">setConfigurationOfChildren</a></span>(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</code>
+<div class="block">Calls <a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects.</div>
+</td>
+</tr>
+</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="TemplateConfigurationFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateConfigurationFactory</h4>
+<pre>public&nbsp;TemplateConfigurationFactory()</pre>
+</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-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>get</h4>
+<pre>public abstract&nbsp;<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</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;sourceName,
+                                          <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                                   throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                                          <a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></pre>
+<div class="block">Returns (maybe creates) the <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>sourceName</code> - The name (path) that was used for <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>. See
+            <a href="../../freemarker/template/Template.html#getSourceName--"><code>Template.getSourceName()</code></a> for details.</dd>
+<dd><code>templateSource</code> - The object returned by <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> to apply, or <code>null</code> if the there's no <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for
+         this template source.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - Typically, if there factory needs further I/O to find out more about the template source, but that
+             fails.</dd>
+<dd><code><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">TemplateConfigurationFactoryException</a></code> - If there's a problem that's specific to the factory logic.</dd>
+</dl>
+</li>
+</ul>
+<a name="setConfiguration-freemarker.template.Configuration-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setConfiguration</h4>
+<pre>public final&nbsp;void&nbsp;setConfiguration(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</pre>
+<div class="block">Binds this <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> to a <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>. Once it's bound, it can't be bound to
+ another <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> any more. This is automatically called by
+ <a href="../../freemarker/template/Configuration.html#setTemplateConfigurations-freemarker.cache.TemplateConfigurationFactory-"><code>Configuration.setTemplateConfigurations(TemplateConfigurationFactory)</code></a>.</div>
+</li>
+</ul>
+<a name="getConfiguration--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getConfiguration</h4>
+<pre>public&nbsp;<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;getConfiguration()</pre>
+<div class="block">Returns the configuration this object belongs to, or <code>null</code> if it isn't yet bound to a
+ <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</li>
+</ul>
+<a name="setConfigurationOfChildren-freemarker.template.Configuration-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setConfigurationOfChildren</h4>
+<pre>protected abstract&nbsp;void&nbsp;setConfigurationOfChildren(<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg)</pre>
+<div class="block">Calls <a href="../../freemarker/core/TemplateConfiguration.html#setParentConfiguration-freemarker.template.Configuration-"><code>TemplateConfiguration.setParentConfiguration(Configuration)</code></a> on each enclosed
+ <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> and <a href="../../freemarker/cache/TemplateConfigurationFactory.html#setConfiguration-freemarker.template.Configuration-"><code>setConfiguration(Configuration)</code></a>
+ on each enclosed <a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><code>TemplateConfigurationFactory</code></a> objects. It only supposed to call these on the direct
+ "children" of this object, not on the children of the children.</div>
+</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/TemplateConfigurationFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/TemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfigurationFactory.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>


[36/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/Environment.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/Environment.html b/docs/api/freemarker/core/Environment.html
index b2d837f..e903efd 100644
--- a/docs/api/freemarker/core/Environment.html
+++ b/docs/api/freemarker/core/Environment.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Environment (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Environment (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Environment (FreeMarker 2.3.23 API)";
+            parent.document.title="Environment (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":9,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":42,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":9,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":42,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":42};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -117,19 +117,19 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public final class <span class="typeNameLabel">Environment</span>
 extends <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></pre>
-<div class="block">Object that represents the runtime environment during template processing.
- For every invocation of a <tt>Template.process()</tt> method, a new instance
- of this object is created, and then discarded when <tt>process()</tt> returns.
- This object stores the set of temporary variables created by the template,
- the value of settings set by the template, the reference to the data model root,
- etc. Everything that is needed to fulfill the template processing job.
+<div class="block">Object that represents the runtime environment during template processing. For every invocation of a
+ <tt>Template.process()</tt> method, a new instance of this object is created, and then discarded when
+ <tt>process()</tt> returns. This object stores the set of temporary variables created by the template, the value of
+ settings set by the template, the reference to the data model root, etc. Everything that is needed to fulfill the
+ template processing job.
 
- <p>Data models that need to access the <tt>Environment</tt>
- object that represents the template processing on the current thread can use
- the <a href="../../freemarker/core/Environment.html#getCurrentEnvironment--"><code>getCurrentEnvironment()</code></a> method.
+ <p>
+ Data models that need to access the <tt>Environment</tt> object that represents the template processing on the
+ current thread can use the <a href="../../freemarker/core/Environment.html#getCurrentEnvironment--"><code>getCurrentEnvironment()</code></a> method.
 
- <p>If you need to modify or read this object before or after the <tt>process</tt>
- call, use <a href="../../freemarker/template/Template.html#createProcessingEnvironment-java.lang.Object-java.io.Writer-freemarker.template.ObjectWrapper-"><code>Template.createProcessingEnvironment(Object rootMap, Writer out, ObjectWrapper wrapper)</code></a></div>
+ <p>
+ If you need to modify or read this object before or after the <tt>process</tt> call, use
+ <a href="../../freemarker/template/Template.html#createProcessingEnvironment-java.lang.Object-java.io.Writer-freemarker.template.ObjectWrapper-"><code>Template.createProcessingEnvironment(Object rootMap, Writer out, ObjectWrapper wrapper)</code></a></div>
 </li>
 </ul>
 </div>
@@ -173,7 +173,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></h3>
-<code><a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY">API_BUILTIN_ENABLED_KEY</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_CAMEL_CASE">API_BUILTIN_ENABLED_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_SNAKE_CASE">API_BUILTIN_ENABLED_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY">ARITHMETIC_ENGINE_KEY</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_CAMEL_CASE">ARITHMETIC_ENGINE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_SNAKE_CASE">ARITHMETIC_ENGINE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY">AUTO_FLUSH_KEY</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_CAMEL_CASE">AUTO_FLUSH_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_SNAKE_CASE">AUTO_FLUSH_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY">BOOLEAN_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_CAMEL_CASE">BOOLEAN_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_SNAKE_CASE">BOOLEAN_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY">CLASSIC_COMPATIBLE_KEY</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_CAMEL_CASE">CLASSIC_COMPATIBLE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_SNAKE_CASE">CLASSIC_COMPATIBLE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY">DATE_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_CAMEL_CASE">DATE_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_SNAKE_CASE">DATE_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freem
 arker/core/Configurable.html#DATETIME_FORMAT_KEY">DATETIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_CAMEL_CASE">DATETIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_SNAKE_CASE">DATETIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY">LOCALE_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_CAMEL_CASE">LOCALE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_SNAKE_CASE">LOCALE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY">LOG_TEMPLATE_EXCEPTIONS_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Confi
 gurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY">NEW_BUILTIN_CLASS_RESOLVER_KEY</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY">NUMBER_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_CAMEL_CASE">NUMBER_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_SNAKE_CASE">NUMBER_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY">OBJECT_WRAPPER_KEY</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_CAMEL_CASE">OBJECT_WRAPPER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_SNAKE_CASE">OBJECT_WRAPPER_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY">OUTPUT_ENCODING_KEY</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_CAMEL_CASE">OUTPUT_ENCODING_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_SNAKE_CASE">OUTPUT_ENCODING_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY">SHOW_ERROR_TIPS_KEY</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_CAMEL_CASE">SHOW_ERROR_TIPS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_SNAKE_CASE">SHOW_ERROR_TIPS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY">SQL_DATE_AND_TIME_TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_
 KEY_SNAKE_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS">STRICT_BEAN_MODELS</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY">STRICT_BEAN_MODELS_KEY</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_CAMEL_CASE">STRICT_BEAN_MODELS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_SNAKE_CASE">STRICT_BEAN_MODELS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY">TEMPLATE_EXCEPTION_HANDLER_KEY</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY">TIME_FORMAT_KEY</a>, <a href="..
 /../freemarker/core/Configurable.html#TIME_FORMAT_KEY_CAMEL_CASE">TIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_SNAKE_CASE">TIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY">TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_CAMEL_CASE">TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_SNAKE_CASE">TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY">URL_ESCAPING_CHARSET_KEY</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_CAMEL_CASE">URL_ESCAPING_CHARSET_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_SNAKE_CASE">URL_ESCAPING_CHARSET_KEY_SNAKE_CASE</a></code></li>
+<code><a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY">API_BUILTIN_ENABLED_KEY</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_CAMEL_CASE">API_BUILTIN_ENABLED_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#API_BUILTIN_ENABLED_KEY_SNAKE_CASE">API_BUILTIN_ENABLED_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY">ARITHMETIC_ENGINE_KEY</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_CAMEL_CASE">ARITHMETIC_ENGINE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#ARITHMETIC_ENGINE_KEY_SNAKE_CASE">ARITHMETIC_ENGINE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY">AUTO_FLUSH_KEY</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_CAMEL_CASE">AUTO_FLUSH_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#AUTO_FLUSH_KEY_SNAKE_CASE">AUTO_FLUSH_KEY_SNAKE_CASE</a>
 , <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY">BOOLEAN_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_CAMEL_CASE">BOOLEAN_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#BOOLEAN_FORMAT_KEY_SNAKE_CASE">BOOLEAN_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY">CLASSIC_COMPATIBLE_KEY</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_CAMEL_CASE">CLASSIC_COMPATIBLE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CLASSIC_COMPATIBLE_KEY_SNAKE_CASE">CLASSIC_COMPATIBLE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY">CUSTOM_DATE_FORMATS_KEY</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">CUSTOM_DATE_
 FORMATS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY">CUSTOM_NUMBER_FORMATS_KEY</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY">DATE_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_CAMEL_CASE">DATE_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY_SNAKE_CASE">DATE_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY">DATETIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_CAMEL_CASE">DATETIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#DATETIME_FORMAT_KEY_SNAKE_CASE">DATETI
 ME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY">LOCALE_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_CAMEL_CASE">LOCALE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOCALE_KEY_SNAKE_CASE">LOCALE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY">LOG_TEMPLATE_EXCEPTIONS_KEY</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE">LOG_TEMPLATE_EXCEPTIONS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY">NEW_BUILTIN_CLASS_RESOLVER_KEY</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NEW_BUILTI
 N_CLASS_RESOLVER_KEY_SNAKE_CASE">NEW_BUILTIN_CLASS_RESOLVER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY">NUMBER_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_CAMEL_CASE">NUMBER_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#NUMBER_FORMAT_KEY_SNAKE_CASE">NUMBER_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY">OBJECT_WRAPPER_KEY</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_CAMEL_CASE">OBJECT_WRAPPER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OBJECT_WRAPPER_KEY_SNAKE_CASE">OBJECT_WRAPPER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY">OUTPUT_ENCODING_KEY</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_KEY_CAMEL_CASE">OUTPUT_ENCODING_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#OUTPUT_ENCODING_
 KEY_SNAKE_CASE">OUTPUT_ENCODING_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY">SHOW_ERROR_TIPS_KEY</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_CAMEL_CASE">SHOW_ERROR_TIPS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SHOW_ERROR_TIPS_KEY_SNAKE_CASE">SHOW_ERROR_TIPS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY">SQL_DATE_AND_TIME_TIME_ZONE_KEY</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE">SQL_DATE_AND_TIME_TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS">STRICT_BEAN_MODELS</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY">STRICT_BEAN_MODELS_KEY</a>, <a href="../../freema
 rker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_CAMEL_CASE">STRICT_BEAN_MODELS_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY_SNAKE_CASE">STRICT_BEAN_MODELS_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY">TEMPLATE_EXCEPTION_HANDLER_KEY</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE">TEMPLATE_EXCEPTION_HANDLER_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY">TIME_FORMAT_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_CAMEL_CASE">TIME_FORMAT_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_FORMAT_KEY_SNAKE_CASE">TIME_FORMAT_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY">TIME_ZON
 E_KEY</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_CAMEL_CASE">TIME_ZONE_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#TIME_ZONE_KEY_SNAKE_CASE">TIME_ZONE_KEY_SNAKE_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY">URL_ESCAPING_CHARSET_KEY</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_CAMEL_CASE">URL_ESCAPING_CHARSET_KEY_CAMEL_CASE</a>, <a href="../../freemarker/core/Configurable.html#URL_ESCAPING_CHARSET_KEY_SNAKE_CASE">URL_ESCAPING_CHARSET_KEY_SNAKE_CASE</a></code></li>
 </ul>
 </li>
 </ul>
@@ -233,7 +233,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#applyEqualsOperatorLenient-freemarker.template.TemplateModel-freemarker.template.TemplateModel-">applyEqualsOperatorLenient</a></span>(<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;leftValue,
                           <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;rightValue)</code>
 <div class="block">Compares two <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s according the rules of the FTL "==" operator, except that if the two types
-     are incompatible, they are treated as non-equal instead of throwing an exception.</div>
+ are incompatible, they are treated as non-equal instead of throwing an exception.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
@@ -305,78 +305,84 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getCurrentVisitorNode--">getCurrentVisitorNode</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i15" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getCustomState-java.lang.Object-">getCustomState</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;identityKey)</code>
+<div class="block">Returns the value of a custom state variable, or <code>null</code> if it's missing; see
+ <a href="../../freemarker/core/Environment.html#setCustomState-java.lang.Object-java.lang.Object-"><code>setCustomState(Object, Object)</code></a> for more.</div>
+</td>
+</tr>
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getDataModel--">getDataModel</a></span>()</code>
 <div class="block">Returns the data-model (also known as the template context in some other template engines).</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getDefaultNS--">getDefaultNS</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getGlobalNamespace--">getGlobalNamespace</a></span>()</code>
-<div class="block">Returns the name-space that contains the globally visible non-data-model variables
- (usually created with <code>&amp;lt;#global ...&amp;gt;</code>).</div>
+<div class="block">Returns the name-space that contains the globally visible non-data-model variables (usually created with
+ <code>&amp;lt;#global ...&amp;gt;</code>).</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getGlobalVariable-java.lang.String-">getGlobalVariable</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">Returns the globally visible variable of the given name (or null).</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getGlobalVariables--">getGlobalVariables</a></span>()</code>
 <div class="block">Returns the read-only hash of globally visible variables.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getKnownVariableNames--">getKnownVariableNames</a></span>()</code>
 <div class="block">Returns a set of variable names that are known at the time of call.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getLocalVariable-java.lang.String-">getLocalVariable</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">Returns the loop or macro local variable corresponding to this
- variable name.</div>
+<div class="block">Returns the loop or macro local variable corresponding to this variable name.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getMainNamespace--">getMainNamespace</a></span>()</code>
 <div class="block">Returns the main namespace.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getMainTemplate--">getMainTemplate</a></span>()</code>
 <div class="block">Returns the topmost <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>, with other words, the one for which this <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> was created.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getNamespace-java.lang.String-">getNamespace</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">Returns the name-space for the name if exists, or null.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getNamespaceForPrefix-java.lang.String-">getNamespaceForPrefix</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;prefix)</code>&nbsp;</td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getOut--">getOut</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getPrefixForNamespace-java.lang.String-">getPrefixForNamespace</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;nsURI)</code>&nbsp;</td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getTemplate--">getTemplate</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -386,23 +392,70 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i30" 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/Environment.html#getTemplateDateFormat-int-java.lang.Class-">getTemplateDateFormat</a></span>(int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass)</code>
+<div class="block">Gets a <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> using the date/time/datetime format settings and the current locale and time
+ zone.</div>
+</td>
+</tr>
+<tr id="i31" class="rowColor">
+<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/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass)</code>
+<div class="block">Gets a <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> for the specified format string and the current locale and time zone.</div>
+</td>
+</tr>
+<tr id="i32" 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/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-java.util.Locale-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass,
+                     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
+<div class="block">Like <a href="../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-"><code>getTemplateDateFormat(String, int, Class)</code></a>, but allows you to use a different locale than the
+ current one.</div>
+</td>
+</tr>
+<tr id="i33" class="rowColor">
+<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/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-java.util.Locale-java.util.TimeZone-java.util.TimeZone-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass,
+                     <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,
+                     <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;sqlDateAndTimeTimeZone)</code>
+<div class="block">Like <a href="../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-"><code>getTemplateDateFormat(String, int, Class)</code></a>, but allows you to use a different locale and time zone
+ than the current one.</div>
+</td>
+</tr>
+<tr id="i34" 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/Environment.html#getTemplateDateFormat-java.lang.String-int-java.util.Locale-java.util.TimeZone-boolean-">getTemplateDateFormat</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;formatString,
+                     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)</code>
+<div class="block">Gets a <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> for the specified parameters.</div>
+</td>
+</tr>
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getTemplateForImporting-java.lang.String-">getTemplateForImporting</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
-<div class="block">Gets a template for importing; used with
- <a href="../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-"><code>importLib(Template importedTemplate, String namespace)</code></a>.</div>
+<div class="block">Gets a template for importing; used with <a href="../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-"><code>importLib(Template importedTemplate, String namespace)</code></a>.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getTemplateForInclusion-java.lang.String-java.lang.String-boolean-">getTemplateForInclusion</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
                        boolean&nbsp;parse)</code>
 <div class="block">Same as <a href="../../freemarker/core/Environment.html#getTemplateForInclusion-java.lang.String-java.lang.String-boolean-boolean-"><code>getTemplateForInclusion(String, String, boolean, boolean)</code></a> with <code>false</code>
- <code>ignoreMissign</code> argument.</div>
+ <code>ignoreMissing</code> argument.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getTemplateForInclusion-java.lang.String-java.lang.String-boolean-boolean-">getTemplateForInclusion</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
@@ -411,158 +464,182 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <div class="block">Gets a template for inclusion; used for implementing <a href="../../freemarker/core/Environment.html#include-freemarker.template.Template-"><code>include(Template includedTemplate)</code></a>.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i38" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getTemplateNumberFormat--">getTemplateNumberFormat</a></span>()</code>
+<div class="block">Returns the current number format (<a href="../../freemarker/core/Configurable.html#getNumberFormat--"><code>Configurable.getNumberFormat()</code></a>) as <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>.</div>
+</td>
+</tr>
+<tr id="i39" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getTemplateNumberFormat-java.lang.String-">getTemplateNumberFormat</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;formatString)</code>
+<div class="block">Returns the number format as <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a> for the given format string and the current locale.</div>
+</td>
+</tr>
+<tr id="i40" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getTemplateNumberFormat-java.lang.String-java.util.Locale-">getTemplateNumberFormat</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;formatString,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
+<div class="block">Returns the number format as <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>, for the given format string and locale.</div>
+</td>
+</tr>
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#getVariable-java.lang.String-">getVariable</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">Returns the variable that is visible in this context, or <code>null</code> if the variable is not found.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i42" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#importLib-java.lang.String-java.lang.String-">importLib</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;namespace)</code>
-<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate
- root relative.</div>
+<div class="block">Emulates <code>import</code> directive, except that <code>name</code> must be tempate root relative.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i43" class="rowColor">
 <td class="colFirst"><code><a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core">Environment.Namespace</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#importLib-freemarker.template.Template-java.lang.String-">importLib</a></span>(<a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;loadedTemplate,
          <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;namespace)</code>
 <div class="block">Emulates <code>import</code> directive.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i44" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#include-java.lang.String-java.lang.String-boolean-">include</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding,
        boolean&nbsp;parse)</code>
-<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate
- root relative.</div>
+<div class="block">Emulates <code>include</code> directive, except that <code>name</code> must be tempate root relative.</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i45" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#include-freemarker.template.Template-">include</a></span>(<a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;includedTemplate)</code>
-<div class="block">Processes a Template in the context of this <code>Environment</code>, including its
- output in the <code>Environment</code>'s Writer.</div>
+<div class="block">Processes a Template in the context of this <code>Environment</code>, including its output in the
+ <code>Environment</code>'s Writer.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i46" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#isInAttemptBlock--">isInAttemptBlock</a></span>()</code>
 <div class="block">Tells if we are inside an <tt>#attempt</tt> block (but before <tt>#recover</tt>).</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
+<tr id="i47" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#outputInstructionStack-java.io.PrintWriter-">outputInstructionStack</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/io/PrintWriter.html?is-external=true" title="class or interface in java.io">PrintWriter</a>&nbsp;pw)</code>
 <div class="block">Prints the current FTL stack trace.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<tr id="i48" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#process--">process</a></span>()</code>
 <div class="block">Processes the template to which this environment belongs to.</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
+<tr id="i49" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setCurrentVisitorNode-freemarker.template.TemplateNodeModel-">setCurrentVisitorNode</a></span>(<a href="../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a>&nbsp;node)</code>
 <div class="block">sets TemplateNodeModel as the current visitor node.</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i50" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setCustomState-java.lang.Object-java.lang.Object-">setCustomState</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;identityKey,
+              <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</code>
+<div class="block">Sets the value of a custom state variable.</div>
+</td>
+</tr>
+<tr id="i51" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setDateFormat-java.lang.String-">setDateFormat</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;dateFormat)</code>
 <div class="block">Sets the format used to convert <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>-s to string-s that are date (no time part) values,
  also the format that <code>someString?date</code> will use to parse strings.</div>
 </td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i52" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setDateTimeFormat-java.lang.String-">setDateTimeFormat</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;dateTimeFormat)</code>
 <div class="block">Sets the format used to convert <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>-s to string-s that are date-time (timestamp) values,
  also the format that <code>someString?datetime</code> will use to parse strings.</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i53" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setGlobalVariable-java.lang.String-freemarker.template.TemplateModel-">setGlobalVariable</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="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
 <div class="block">Sets a variable that is visible globally.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i54" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setLocale-java.util.Locale-">setLocale</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
 <div class="block">Sets the default locale used for number and date formatting (among others), also the locale used for searching
  localized template variations when no locale was explicitly requested.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i55" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setLocalVariable-java.lang.String-freemarker.template.TemplateModel-">setLocalVariable</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="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
 <div class="block">Sets a local variable (one effective only during a macro invocation).</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr id="i56" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setNumberFormat-java.lang.String-">setNumberFormat</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;formatName)</code>
 <div class="block">Sets the default number format used to convert numbers to strings.</div>
 </td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr id="i57" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setOut-java.io.Writer-">setOut</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>&nbsp;</td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i58" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setOutputEncoding-java.lang.String-">setOutputEncoding</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;outputEncoding)</code>
 <div class="block">Informs FreeMarker about the charset used for the output.</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i59" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setSQLDateAndTimeTimeZone-java.util.TimeZone-">setSQLDateAndTimeTimeZone</a></span>(<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)</code>
 <div class="block">Sets the time zone used when dealing with <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Date.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Date</code></a> and
  <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Time.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Time</code></a> values.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i60" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-">setTemplateExceptionHandler</a></span>(<a href="../../freemarker/template/TemplateExceptionHandler.html" title="interface in freemarker.template">TemplateExceptionHandler</a>&nbsp;templateExceptionHandler)</code>
 <div class="block">Sets the exception handler used to handle exceptions occurring inside templates.</div>
 </td>
 </tr>
-<tr id="i51" class="rowColor">
+<tr id="i61" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setTimeFormat-java.lang.String-">setTimeFormat</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;timeFormat)</code>
 <div class="block">Sets the format used to convert <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>-s to string-s that are time (no date part) values,
  also the format that <code>someString?time</code> will use to parse strings.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr id="i62" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setTimeZone-java.util.TimeZone-">setTimeZone</a></span>(<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)</code>
 <div class="block">Sets the time zone to use when formatting date/time values.</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr id="i63" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setURLEscapingCharset-java.lang.String-">setURLEscapingCharset</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;urlEscapingCharset)</code>
 <div class="block">Sets the URL escaping charset.</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr id="i64" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#setVariable-java.lang.String-freemarker.template.TemplateModel-">setVariable</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="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;model)</code>
 <div class="block">Sets a variable in the current namespace.</div>
 </td>
 </tr>
-<tr id="i55" class="rowColor">
+<tr id="i65" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#toFullTemplateName-java.lang.String-java.lang.String-">toFullTemplateName</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;baseName,
                   <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;targetName)</code>
@@ -570,12 +647,16 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
  name.</div>
 </td>
 </tr>
-<tr id="i56" class="altColor">
+<tr id="i66" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Environment.html#visit-freemarker.core.TemplateElement-freemarker.template.TemplateDirectiveModel-java.util.Map-java.util.List-">visit</a></span>(freemarker.core.TemplateElement&nbsp;element,
      <a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>&nbsp;directiveModel,
      <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;args,
-     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)</code>&nbsp;</td>
+     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Should be internal API</span></div>
+</div>
+</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -583,7 +664,7 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></h3>
-<code><a href="../../freemarker/core/Configurable.html#clone--">clone</a>, <a href="../../freemarker/core/Configurable.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes</a>, <a href="../../freemarker/core/Configurable.html#getArithmeticEngine--">getArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#getAutoFlush--">getAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#getBooleanFormat--">getBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#getClassicCompatibleAsInt--">getClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#getCorrectedNameForUnknownSetting-java.lang.String-">getCorrectedNameForUnknownSetting</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttribute-java.lang.String-">getCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttributeNames--">getCustomAttributeNames</a>, <a href="../../freemarker/core/Configurable.html#ge
 tDateFormat--">getDateFormat</a>, <a href="../../freemarker/core/Configurable.html#getDateTimeFormat--">getDateTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#getEnvironment--">getEnvironment</a>, <a href="../../freemarker/core/Configurable.html#getLocale--">getLocale</a>, <a href="../../freemarker/core/Configurable.html#getLogTemplateExceptions--">getLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#getNewBuiltinClassResolver--">getNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#getNumberFormat--">getNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#getObjectWrapper--">getObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#getOutputEncoding--">getOutputEncoding</a>, <a href="../../freemarker/core/Configurable.html#getParent--">getParent</a>, <a href="../../freemarker/core/Configurable.html#getSetting-java.lang.String-">getSetting</a>, <a href="../../freemarker/core/Configurable
 .html#getSettings--">getSettings</a>, <a href="../../freemarker/core/Configurable.html#getShowErrorTips--">getShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#getSQLDateAndTimeTimeZone--">getSQLDateAndTimeTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getTemplateExceptionHandler--">getTemplateExceptionHandler</a>, <a href="../../freemarker/core/Configurable.html#getTimeFormat--">getTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#getTimeZone--">getTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getURLEscapingCharset--">getURLEscapingCharset</a>, <a href="../../freemarker/core/Configurable.html#invalidSettingValueException-java.lang.String-java.lang.String-">invalidSettingValueException</a>, <a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabled--">isAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#isClassicCompatible--">isClassicCompatible</a>, <a href="../../freemarker/core/Config
 urable.html#parseAsImportList-java.lang.String-">parseAsImportList</a>, <a href="../../freemarker/core/Configurable.html#parseAsList-java.lang.String-">parseAsList</a>, <a href="../../freemarker/core/Configurable.html#parseAsSegmentedList-java.lang.String-">parseAsSegmentedList</a>, <a href="../../freemarker/core/Configurable.html#removeCustomAttribute-java.lang.String-">removeCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setAPIBuiltinEnabled-boolean-">setAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-">setArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#setAutoFlush-boolean-">setAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#setBooleanFormat-java.lang.String-">setBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#setClassicCompatible-boolean-">setClassicCompatible</a>, <a href="../../freemarker/core/Configurable.html#setClassi
 cCompatibleAsInt-int-">setClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#setCustomAttribute-java.lang.String-java.lang.Object-">setCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setLogTemplateExceptions-boolean-">setLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#setNewBuiltinClassResolver-freemarker.core.TemplateClassResolver-">setNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#setObjectWrapper-freemarker.template.ObjectWrapper-">setObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#setSetting-java.lang.String-java.lang.String-">setSetting</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.io.InputStream-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.util.Properties-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setShowErrorTips-boolean-">setShowErrorTips</a>, <a href="../../fre
 emarker/core/Configurable.html#setStrictBeanModels-boolean-">setStrictBeanModels</a>, <a href="../../freemarker/core/Configurable.html#settingValueAssignmentException-java.lang.String-java.lang.String-java.lang.Throwable-">settingValueAssignmentException</a>, <a href="../../freemarker/core/Configurable.html#unknownSettingException-java.lang.String-">unknownSettingException</a></code></li>
+<code><a href="../../freemarker/core/Configurable.html#clone--">clone</a>, <a href="../../freemarker/core/Configurable.html#doAutoImportsAndIncludes-freemarker.core.Environment-">doAutoImportsAndIncludes</a>, <a href="../../freemarker/core/Configurable.html#getArithmeticEngine--">getArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#getAutoFlush--">getAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#getBooleanFormat--">getBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#getClassicCompatibleAsInt--">getClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#getCorrectedNameForUnknownSetting-java.lang.String-">getCorrectedNameForUnknownSetting</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttribute-java.lang.String-">getCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#getCustomAttributeNames--">getCustomAttributeNames</a>, <a href="../../freemarker/core/Configurable.html#ge
 tCustomDateFormat-java.lang.String-">getCustomDateFormat</a>, <a href="../../freemarker/core/Configurable.html#getCustomDateFormats--">getCustomDateFormats</a>, <a href="../../freemarker/core/Configurable.html#getCustomNumberFormat-java.lang.String-">getCustomNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#getCustomNumberFormats--">getCustomNumberFormats</a>, <a href="../../freemarker/core/Configurable.html#getDateFormat--">getDateFormat</a>, <a href="../../freemarker/core/Configurable.html#getDateTimeFormat--">getDateTimeFormat</a>, <a href="../../freemarker/core/Configurable.html#getEnvironment--">getEnvironment</a>, <a href="../../freemarker/core/Configurable.html#getLocale--">getLocale</a>, <a href="../../freemarker/core/Configurable.html#getLogTemplateExceptions--">getLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#getNewBuiltinClassResolver--">getNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#getNumb
 erFormat--">getNumberFormat</a>, <a href="../../freemarker/core/Configurable.html#getObjectWrapper--">getObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#getOutputEncoding--">getOutputEncoding</a>, <a href="../../freemarker/core/Configurable.html#getParent--">getParent</a>, <a href="../../freemarker/core/Configurable.html#getSetting-java.lang.String-">getSetting</a>, <a href="../../freemarker/core/Configurable.html#getSettingNames-boolean-">getSettingNames</a>, <a href="../../freemarker/core/Configurable.html#getSettings--">getSettings</a>, <a href="../../freemarker/core/Configurable.html#getShowErrorTips--">getShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#getSQLDateAndTimeTimeZone--">getSQLDateAndTimeTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getTemplateExceptionHandler--">getTemplateExceptionHandler</a>, <a href="../../freemarker/core/Configurable.html#getTimeFormat--">getTimeFormat</a>, <a href="../../freemarker/core/Co
 nfigurable.html#getTimeZone--">getTimeZone</a>, <a href="../../freemarker/core/Configurable.html#getURLEscapingCharset--">getURLEscapingCharset</a>, <a href="../../freemarker/core/Configurable.html#hasCustomFormats--">hasCustomFormats</a>, <a href="../../freemarker/core/Configurable.html#invalidSettingValueException-java.lang.String-java.lang.String-">invalidSettingValueException</a>, <a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabled--">isAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabledSet--">isAPIBuiltinEnabledSet</a>, <a href="../../freemarker/core/Configurable.html#isArithmeticEngineSet--">isArithmeticEngineSet</a>, <a href="../../freemarker/core/Configurable.html#isAutoFlushSet--">isAutoFlushSet</a>, <a href="../../freemarker/core/Configurable.html#isBooleanFormatSet--">isBooleanFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isClassicCompatible--">isClassicCompatible</a>, <a href="../../freemarker/cor
 e/Configurable.html#isClassicCompatibleSet--">isClassicCompatibleSet</a>, <a href="../../freemarker/core/Configurable.html#isCustomDateFormatsSet--">isCustomDateFormatsSet</a>, <a href="../../freemarker/core/Configurable.html#isCustomNumberFormatsSet--">isCustomNumberFormatsSet</a>, <a href="../../freemarker/core/Configurable.html#isDateFormatSet--">isDateFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isDateTimeFormatSet--">isDateTimeFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isLocaleSet--">isLocaleSet</a>, <a href="../../freemarker/core/Configurable.html#isLogTemplateExceptionsSet--">isLogTemplateExceptionsSet</a>, <a href="../../freemarker/core/Configurable.html#isNewBuiltinClassResolverSet--">isNewBuiltinClassResolverSet</a>, <a href="../../freemarker/core/Configurable.html#isNumberFormatSet--">isNumberFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isObjectWrapperSet--">isObjectWrapperSet</a>, <a href="../../freemarker/core/C
 onfigurable.html#isOutputEncodingSet--">isOutputEncodingSet</a>, <a href="../../freemarker/core/Configurable.html#isShowErrorTipsSet--">isShowErrorTipsSet</a>, <a href="../../freemarker/core/Configurable.html#isSQLDateAndTimeTimeZoneSet--">isSQLDateAndTimeTimeZoneSet</a>, <a href="../../freemarker/core/Configurable.html#isTemplateExceptionHandlerSet--">isTemplateExceptionHandlerSet</a>, <a href="../../freemarker/core/Configurable.html#isTimeFormatSet--">isTimeFormatSet</a>, <a href="../../freemarker/core/Configurable.html#isTimeZoneSet--">isTimeZoneSet</a>, <a href="../../freemarker/core/Configurable.html#isURLEscapingCharsetSet--">isURLEscapingCharsetSet</a>, <a href="../../freemarker/core/Configurable.html#parseAsImportList-java.lang.String-">parseAsImportList</a>, <a href="../../freemarker/core/Configurable.html#parseAsList-java.lang.String-">parseAsList</a>, <a href="../../freemarker/core/Configurable.html#parseAsSegmentedList-java.lang.String-">parseAsSegmentedList</a>, <a href
 ="../../freemarker/core/Configurable.html#removeCustomAttribute-java.lang.String-">removeCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setAPIBuiltinEnabled-boolean-">setAPIBuiltinEnabled</a>, <a href="../../freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-">setArithmeticEngine</a>, <a href="../../freemarker/core/Configurable.html#setAutoFlush-boolean-">setAutoFlush</a>, <a href="../../freemarker/core/Configurable.html#setBooleanFormat-java.lang.String-">setBooleanFormat</a>, <a href="../../freemarker/core/Configurable.html#setClassicCompatible-boolean-">setClassicCompatible</a>, <a href="../../freemarker/core/Configurable.html#setClassicCompatibleAsInt-int-">setClassicCompatibleAsInt</a>, <a href="../../freemarker/core/Configurable.html#setCustomAttribute-java.lang.String-java.lang.Object-">setCustomAttribute</a>, <a href="../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-">setCustomDateFormats</a
 >, <a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-">setCustomNumberFormats</a>, <a href="../../freemarker/core/Configurable.html#setLogTemplateExceptions-boolean-">setLogTemplateExceptions</a>, <a href="../../freemarker/core/Configurable.html#setNewBuiltinClassResolver-freemarker.core.TemplateClassResolver-">setNewBuiltinClassResolver</a>, <a href="../../freemarker/core/Configurable.html#setObjectWrapper-freemarker.template.ObjectWrapper-">setObjectWrapper</a>, <a href="../../freemarker/core/Configurable.html#setSetting-java.lang.String-java.lang.String-">setSetting</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.io.InputStream-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setSettings-java.util.Properties-">setSettings</a>, <a href="../../freemarker/core/Configurable.html#setShowErrorTips-boolean-">setShowErrorTips</a>, <a href="../../freemarker/core/Configurable.html#setStrictBeanModels-boolean-">se
 tStrictBeanModels</a>, <a href="../../freemarker/core/Configurable.html#settingValueAssignmentException-java.lang.String-java.lang.String-java.lang.Throwable-">settingValueAssignmentException</a>, <a href="../../freemarker/core/Configurable.html#unknownSettingException-java.lang.String-">unknownSettingException</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -644,7 +725,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>getTemplate</h4>
-<pre>public&nbsp;<a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;getTemplate()</pre>
+<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;<a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;getTemplate()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/core/Environment.html#getMainTemplate--"><code>getMainTemplate()</code></a> instead (or <a href="../../freemarker/core/Environment.html#getCurrentNamespace--"><code>getCurrentNamespace()</code></a> and then
              <a href="../../freemarker/core/Environment.Namespace.html#getTemplate--"><code>Environment.Namespace.getTemplate()</code></a>); the value returned by this method is often not what you expect when
              it comes to macro/function invocations.</span></div>
@@ -731,12 +813,14 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <ul class="blockList">
 <li class="blockList">
 <h4>visit</h4>
-<pre>public&nbsp;void&nbsp;visit(freemarker.core.TemplateElement&nbsp;element,
-                  <a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>&nbsp;directiveModel,
-                  <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;args,
-                  <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)
-           throws <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a>,
-                  <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<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;void&nbsp;visit(freemarker.core.TemplateElement&nbsp;element,
+                               <a href="../../freemarker/template/TemplateDirectiveModel.html" title="interface in freemarker.template">TemplateDirectiveModel</a>&nbsp;directiveModel,
+                               <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;args,
+                               <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;bodyParameterNames)
+                        throws <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a>,
+                               <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Should be internal API</span></div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></code></dd>
@@ -970,8 +1054,8 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
                                           <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;rightValue)
                                    throws <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></pre>
 <div class="block">Compares two <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s according the rules of the FTL "==" operator, except that if the two types
-     are incompatible, they are treated as non-equal instead of throwing an exception. Comparing dates of
-     different types (date-only VS time-only VS date-time) will still throw an exception, however.</div>
+ are incompatible, they are treated as non-equal instead of throwing an exception. Comparing dates of different
+ types (date-only VS time-only VS date-time) will still throw an exception, however.</div>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></code></dd>
@@ -1078,14 +1162,28 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 <h4>setNumberFormat</h4>
 <pre>public&nbsp;void&nbsp;setNumberFormat(<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;formatName)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-">Configurable</a></code></span></div>
-<div class="block">Sets the default number format used to convert numbers to strings. Currently, this is either a
- <a href="http://docs.oracle.com/javase/8/docs/api/java/text/DecimalFormat.html?is-external=true" title="class or interface in java.text"><code>DecimalFormat</code></a> pattern (like <code>"0.##"</code>), or one of the following special values:
+<div class="block">Sets the default number format used to convert numbers to strings. Currently, this is one of these:
  <ul>
    <li><code>"number"</code>: The number format returned by <a href="http://docs.oracle.com/javase/8/docs/api/java/text/NumberFormat.html?is-external=true#getNumberInstance-java.util.Locale-" title="class or interface in java.text"><code>NumberFormat.getNumberInstance(Locale)</code></a></li>
    <li><code>"currency"</code>: The number format returned by <a href="http://docs.oracle.com/javase/8/docs/api/java/text/NumberFormat.html?is-external=true#getCurrencyInstance-java.util.Locale-" title="class or interface in java.text"><code>NumberFormat.getCurrencyInstance(Locale)</code></a></li>
    <li><code>"percent"</code>: The number format returned by <a href="http://docs.oracle.com/javase/8/docs/api/java/text/NumberFormat.html?is-external=true#getPercentInstance-java.util.Locale-" title="class or interface in java.text"><code>NumberFormat.getPercentInstance(Locale)</code></a></li>
    <li><code>"computer"</code>: The number format used by FTL's <code>c</code> built-in (like in <code>someNumber?c</code>).</li>
+   <li><a href="http://docs.oracle.com/javase/8/docs/api/java/text/DecimalFormat.html?is-external=true" title="class or interface in java.text"><code>DecimalFormat</code></a> pattern (like <code>"0.##"</code>). This syntax has a FreeMarker-specific
+       extension, so that you can specify options like the rounding mode and the symbols used in this string. For
+       example, <code>",000;; roundingMode=halfUp groupingSeparator=_"</code> will format numbers like <code>",000"</code>
+       would, but with half-up rounding mode, and <code>_</code> as the group separator. See more about "extended Java
+       decimal format" in the FreeMarker Manual.
+       </li>
+   <li>If the string starts with <code>@</code> character followed by a letter then it's interpreted as a custom number
+       format, but only if either <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a> is at least 2.3.24, or
+       there's any custom formats defined (even if custom date/time/dateTime format). The format of a such string
+       is <code>"@<i>name</i>"</code> or <code>"@<i>name</i> <i>parameters</i>"</code>, where
+       <code><i>name</i></code> is the key in the <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> set by <a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>Configurable.setCustomNumberFormats(Map)</code></a>, and
+       <code><i>parameters</i></code> is parsed by the custom <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>.
+   </li>
  </ul>
+ 
+   
  <p>Defaults to <tt>"number"</tt>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
@@ -1093,6 +1191,92 @@ extends <a href="../../freemarker/core/Configurable.html" title="class in freema
 </dl>
 </li>
 </ul>
+<a name="getTemplateNumberFormat--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTemplateNumberFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a>&nbsp;getTemplateNumberFormat()
+                                             throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">Returns the current number format (<a href="../../freemarker/core/Configurable.html#getNumberFormat--"><code>Configurable.getNumberFormat()</code></a>) as <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>.
+ 
+ <p>
+ Performance notes: The result is stored for reuse, so calling this method frequently is usually not a problem.
+ However, at least as of this writing (2.3.24), changing the current locale <a href="../../freemarker/core/Environment.html#setLocale-java.util.Locale-"><code>setLocale(Locale)</code></a> or changing
+ the current number format (<a href="../../freemarker/core/Environment.html#setNumberFormat-java.lang.String-"><code>setNumberFormat(String)</code></a>) will drop the stored value, so it will have to be
+ recalculated.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></code></dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="getTemplateNumberFormat-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTemplateNumberFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a>&nbsp;getTemplateNumberFormat(<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;formatString)
+                                             throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">Returns the number format as <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a> for the given format string and the current locale.
+ (The current locale is the locale returned by <a href="../../freemarker/core/Configurable.html#getLocale--"><code>Configurable.getLocale()</code></a>.) Note that the result will be cached in the
+ <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> instance (though at least in 2.3.24 the cache will be flushed if the current locale of the
+ <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> is changed).</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>formatString</code> - A string that you could also use as the value of the <code>numberFormat</code> configuration setting. Can't
+            be <code>null</code>.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></code></dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="getTemplateNumberFormat-java.lang.String-java.util.Locale-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTemplateNumberFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a>&nbsp;getTemplateNumberFormat(<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;formatString,
+                                                    <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)
+                                             throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">Returns the number format as <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>, for the given format string and locale. To get a
+ number format for the current locale, use <a href="../../freemarker/core/Environment.html#getTemplateNumberFormat-java.lang.String-"><code>getTemplateNumberFormat(String)</code></a> instead.
+ 
+ <p>
+ Note on performance (which was true at least for 2.3.24): Unless the locale happens to be equal to the current
+ locale, the <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>-level format cache can't be used, so the format string has to be parsed and the
+ matching factory has to be get an invoked, which is much more expensive than getting the format from the cache.
+ Thus the returned format should be stored by the caller for later reuse (but only within the current thread and
+ in relation to the current <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment

<TRUNCATED>


[06/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/package-frame.html b/docs/api/freemarker/template/utility/package-frame.html
index d4bd288..71cfdc6 100644
--- a/docs/api/freemarker/template/utility/package-frame.html
+++ b/docs/api/freemarker/template/utility/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: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>freemarker.template.utility (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.template.utility (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/package-summary.html b/docs/api/freemarker/template/utility/package-summary.html
index d4c4a42..cf2364a 100644
--- a/docs/api/freemarker/template/utility/package-summary.html
+++ b/docs/api/freemarker/template/utility/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: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>freemarker.template.utility (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.template.utility (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.template.utility (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.template.utility (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -101,7 +101,7 @@
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility">ObjectFactory</a></td>
+<td class="colFirst"><a href="../../../freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility">ObjectFactory</a>&lt;T&gt;</td>
 <td class="colLast">
 <div class="block">Used for the trivial cases of the factory pattern.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/package-tree.html b/docs/api/freemarker/template/utility/package-tree.html
index b56cdf1..6ad0178 100644
--- a/docs/api/freemarker/template/utility/package-tree.html
+++ b/docs/api/freemarker/template/utility/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: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>freemarker.template.utility Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.template.utility 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.template.utility Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.template.utility Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -145,7 +145,7 @@
 <ul>
 <li type="circle">freemarker.template.utility.<a href="../../../freemarker/template/utility/DateUtil.CalendarFieldsToDateConverter.html" title="interface in freemarker.template.utility"><span class="typeNameLink">DateUtil.CalendarFieldsToDateConverter</span></a></li>
 <li type="circle">freemarker.template.utility.<a href="../../../freemarker/template/utility/DateUtil.DateToISO8601CalendarFactory.html" title="interface in freemarker.template.utility"><span class="typeNameLink">DateUtil.DateToISO8601CalendarFactory</span></a></li>
-<li type="circle">freemarker.template.utility.<a href="../../../freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility"><span class="typeNameLink">ObjectFactory</span></a></li>
+<li type="circle">freemarker.template.utility.<a href="../../../freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility"><span class="typeNameLink">ObjectFactory</span></a>&lt;T&gt;</li>
 <li type="circle">freemarker.template.<a href="../../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><span class="typeNameLink">ObjectWrapper</span></a>
 <ul>
 <li type="circle">freemarker.template.<a href="../../../freemarker/template/ObjectWrapperAndUnwrapper.html" title="interface in freemarker.template"><span class="typeNameLink">ObjectWrapperAndUnwrapper</span></a>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/utility/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/utility/package-use.html b/docs/api/freemarker/template/utility/package-use.html
index bb81252..fc87261 100644
--- a/docs/api/freemarker/template/utility/package-use.html
+++ b/docs/api/freemarker/template/utility/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.template.utility (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.template.utility (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.template.utility (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.template.utility (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/help-doc.html
----------------------------------------------------------------------
diff --git a/docs/api/help-doc.html b/docs/api/help-doc.html
index f0ac802..deb89eb 100644
--- a/docs/api/help-doc.html
+++ b/docs/api/help-doc.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>API Help (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>API Help (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="API Help (FreeMarker 2.3.23 API)";
+            parent.document.title="API Help (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {



[33/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonSequenceException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonSequenceException.html b/docs/api/freemarker/core/NonSequenceException.html
index ed9420d..eb86cf4 100644
--- a/docs/api/freemarker/core/NonSequenceException.html
+++ b/docs/api/freemarker/core/NonSequenceException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonSequenceException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonSequenceException (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="NonSequenceException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonSequenceException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonSequenceOrCollectionException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonSequenceOrCollectionException.html b/docs/api/freemarker/core/NonSequenceOrCollectionException.html
index 432c0cc..7862e66 100644
--- a/docs/api/freemarker/core/NonSequenceOrCollectionException.html
+++ b/docs/api/freemarker/core/NonSequenceOrCollectionException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonSequenceOrCollectionException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonSequenceOrCollectionException (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="NonSequenceOrCollectionException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonSequenceOrCollectionException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonStringException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonStringException.html b/docs/api/freemarker/core/NonStringException.html
index 86e0d01..5fa0fd1 100644
--- a/docs/api/freemarker/core/NonStringException.html
+++ b/docs/api/freemarker/core/NonStringException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonStringException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonStringException (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="NonStringException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonStringException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -45,7 +45,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonStringOrTemplateOutputException.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/NonStringException.html" target="_top">Frames</a></li>
@@ -252,7 +252,7 @@ extends <a href="../../freemarker/core/UnexpectedTypeException.html" title="clas
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonStringOrTemplateOutputException.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/NonStringException.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonStringOrTemplateOutputException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonStringOrTemplateOutputException.html b/docs/api/freemarker/core/NonStringOrTemplateOutputException.html
new file mode 100644
index 0000000..e01f987
--- /dev/null
+++ b/docs/api/freemarker/core/NonStringOrTemplateOutputException.html
@@ -0,0 +1,296 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NonStringOrTemplateOutputException (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="NonStringOrTemplateOutputException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/NonStringOrTemplateOutputException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/NonStringException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/OptInTemplateClassResolver.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/NonStringOrTemplateOutputException.html" target="_top">Frames</a></li>
+<li><a href="NonStringOrTemplateOutputException.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="#methods.inherited.from.class.freemarker.template.TemplateException">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>Method</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 NonStringOrTemplateOutputException" class="title">Class NonStringOrTemplateOutputException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">freemarker.template.TemplateException</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">freemarker.core.UnexpectedTypeException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.NonStringOrTemplateOutputException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">NonStringOrTemplateOutputException</span>
+extends <a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">UnexpectedTypeException</a></pre>
+<div class="block">Indicates that a <a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> (or maybe something that can be automatically coerced
+ to that) or <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.NonStringOrTemplateOutputException">Serialized Form</a></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/NonStringOrTemplateOutputException.html#NonStringOrTemplateOutputException-freemarker.core.Environment-">NonStringOrTemplateOutputException</a></span>(<a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/NonStringOrTemplateOutputException.html#NonStringOrTemplateOutputException-java.lang.String-freemarker.core.Environment-">NonStringOrTemplateOutputException</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;description,
+                                  <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.template.TemplateException">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></h3>
+<code><a href="../../freemarker/template/TemplateException.html#getBlamedExpressionString--">getBlamedExpressionString</a>, <a href="../../freemarker/template/TemplateException.html#getCauseException--">getCauseException</a>, <a href="../../freemarker/template/TemplateException.html#getColumnNumber--">getColumnNumber</a>, <a href="../../freemarker/template/TemplateException.html#getEndColumnNumber--">getEndColumnNumber</a>, <a href="../../freemarker/template/TemplateException.html#getEndLineNumber--">getEndLineNumber</a>, <a href="../../freemarker/template/TemplateException.html#getEnvironment--">getEnvironment</a>, <a href="../../freemarker/template/TemplateException.html#getFTLInstructionStack--">getFTLInstructionStack</a>, <a href="../../freemarker/template/TemplateException.html#getLineNumber--">getLineNumber</a>, <a href="../../freemarker/template/TemplateException.html#getMessage--">getMessage</a>, <a href="../../freemarker/template/TemplateException.html#getMessageWithoutStac
 kTop--">getMessageWithoutStackTop</a>, <a href="../../freemarker/template/TemplateException.html#getTemplateName--">getTemplateName</a>, <a href="../../freemarker/template/TemplateException.html#getTemplateSourceName--">getTemplateSourceName</a>, <a href="../../freemarker/template/TemplateException.html#printStackTrace-java.io.PrintStream-">printStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStackTrace-java.io.PrintStream-boolean-boolean-boolean-">printStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStackTrace-java.io.PrintWriter-">printStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStackTrace-java.io.PrintWriter-boolean-boolean-boolean-">printStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStandardStackTrace-java.io.PrintStream-">printStandardStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStandardStackTrace-java.io.PrintWriter
 -">printStandardStackTrace</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or interface in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or
  interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="NonStringOrTemplateOutputException-freemarker.core.Environment-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NonStringOrTemplateOutputException</h4>
+<pre>public&nbsp;NonStringOrTemplateOutputException(<a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</pre>
+</li>
+</ul>
+<a name="NonStringOrTemplateOutputException-java.lang.String-freemarker.core.Environment-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NonStringOrTemplateOutputException</h4>
+<pre>public&nbsp;NonStringOrTemplateOutputException(<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;description,
+                                          <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</pre>
+</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/NonStringOrTemplateOutputException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/NonStringException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/OptInTemplateClassResolver.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/NonStringOrTemplateOutputException.html" target="_top">Frames</a></li>
+<li><a href="NonStringOrTemplateOutputException.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="#methods.inherited.from.class.freemarker.template.TemplateException">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/OptInTemplateClassResolver.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/OptInTemplateClassResolver.html b/docs/api/freemarker/core/OptInTemplateClassResolver.html
index 6a4cb14..f436193 100644
--- a/docs/api/freemarker/core/OptInTemplateClassResolver.html
+++ b/docs/api/freemarker/core/OptInTemplateClassResolver.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>OptInTemplateClassResolver (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>OptInTemplateClassResolver (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="OptInTemplateClassResolver (FreeMarker 2.3.23 API)";
+            parent.document.title="OptInTemplateClassResolver (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,8 +50,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/NonStringException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/ParseException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/OutputFormat.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/OptInTemplateClassResolver.html" target="_top">Frames</a></li>
@@ -317,8 +317,8 @@ implements <a href="../../freemarker/core/TemplateClassResolver.html" title="int
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/NonStringException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/ParseException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/OutputFormat.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/OptInTemplateClassResolver.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/OutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/OutputFormat.html b/docs/api/freemarker/core/OutputFormat.html
new file mode 100644
index 0000000..3618e94
--- /dev/null
+++ b/docs/api/freemarker/core/OutputFormat.html
@@ -0,0 +1,371 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>OutputFormat (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="OutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/OutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/ParseException.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/OutputFormat.html" target="_top">Frames</a></li>
+<li><a href="OutputFormat.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 OutputFormat" class="title">Class OutputFormat</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.OutputFormat</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a>, <a href="../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a>, <a href="../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a>, <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>, <a href="../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a>, <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">OutputFormat</span>
+extends <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></pre>
+<div class="block">Represents an output format. If you need auto-escaping, see its subclass, <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a>, 
+<a href="../../freemarker/template/Configuration.html#setRegisteredCustomOutputFormats-java.util.Collection-"><code>Configuration.setRegisteredCustomOutputFormats(java.util.Collection)</code></a>, 
+<a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a></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/OutputFormat.html#OutputFormat--">OutputFormat</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></span>()</code>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a></span>()</code>
+<div class="block">Returns the short description of this format, to be used in error messages.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></span>()</code>
+<div class="block">Should be like <code>"foo=\"something\", bar=123"</code>; this will be inserted inside the parentheses in
+ <a href="../../freemarker/core/OutputFormat.html#toString--"><code>toString()</code></a>.</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#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="OutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>OutputFormat</h4>
+<pre>public&nbsp;OutputFormat()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+</li>
+</ul>
+<a name="isOutputFormatMixingAllowed--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOutputFormatMixingAllowed</h4>
+<pre>public abstract&nbsp;boolean&nbsp;isOutputFormatMixingAllowed()</pre>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
+ if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
+ application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
+ inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
+ inserted value is made by escaping plain text and the target format is non-escaping, in which case format
+ conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
+ will be demand for that.)
+ 
+ <p>
+ <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;toString()</pre>
+<div class="block">Returns the short description of this format, to be used in error messages.
+ Override <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--"><code>toStringExtraProperties()</code></a> to customize this.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><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></code>&nbsp;in class&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="toStringExtraProperties--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toStringExtraProperties</h4>
+<pre>protected&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;toStringExtraProperties()</pre>
+<div class="block">Should be like <code>"foo=\"something\", bar=123"</code>; this will be inserted inside the parentheses in
+ <a href="../../freemarker/core/OutputFormat.html#toString--"><code>toString()</code></a>. Shouldn't return <code>null</code>; should return <code>""</code> if there are no extra properties.</div>
+</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/OutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/ParseException.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/OutputFormat.html" target="_top">Frames</a></li>
+<li><a href="OutputFormat.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/ParseException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/ParseException.html b/docs/api/freemarker/core/ParseException.html
index 9ddb69d..e143beb 100644
--- a/docs/api/freemarker/core/ParseException.html
+++ b/docs/api/freemarker/core/ParseException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ParseException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ParseException (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="ParseException (FreeMarker 2.3.23 API)";
+            parent.document.title="ParseException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,8 +50,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/StopException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/core/ParseException.html" target="_top">Frames</a></li>
@@ -193,146 +193,154 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#BLANK">BLANK</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#AUTOESC">AUTOESC</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#BREAK">BREAK</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#BLANK">BLANK</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#BUILT_IN">BUILT_IN</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#BREAK">BREAK</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CALL">CALL</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#BUILT_IN">BUILT_IN</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CASE">CASE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CALL">CALL</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSE_BRACKET">CLOSE_BRACKET</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CASE">CASE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSE_PAREN">CLOSE_PAREN</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSE_BRACKET">CLOSE_BRACKET</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSE_TAG1">CLOSE_TAG1</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSE_PAREN">CLOSE_PAREN</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSE_TAG2">CLOSE_TAG2</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSE_TAG1">CLOSE_TAG1</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSING_CURLY_BRACKET">CLOSING_CURLY_BRACKET</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSE_TAG2">CLOSE_TAG2</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#COLON">COLON</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#CLOSING_CURLY_BRACKET">CLOSING_CURLY_BRACKET</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#COLON">COLON</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#columnNumber">columnNumber</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#COMMA">COMMA</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#COMMENT">COMMENT</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#COMPRESS">COMPRESS</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>freemarker.core.Token</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#currentToken">currentToken</a></span></code>
 <div class="block">This is the last token that has been consumed successfully.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DECIMAL">DECIMAL</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DEFAUL">DEFAUL</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DEFAULT">DEFAULT</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DIRECTIVE_END">DIRECTIVE_END</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DIV_EQUALS">DIV_EQUALS</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DIVIDE">DIVIDE</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DOLLAR_INTERPOLATION_OPENING">DOLLAR_INTERPOLATION_OPENING</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DOT">DOT</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DOT_DOT">DOT_DOT</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DOT_DOT_ASTERISK">DOT_DOT_ASTERISK</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DOT_DOT_LESS">DOT_DOT_LESS</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DOUBLE_EQUALS">DOUBLE_EQUALS</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#DOUBLE_STAR">DOUBLE_STAR</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#ELLIPSIS">ELLIPSIS</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#ELSE">ELSE</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#ELSE_IF">ELSE_IF</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#EMPTY_DIRECTIVE_END">EMPTY_DIRECTIVE_END</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#END_ASSIGN">END_ASSIGN</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#END_ATTEMPT">END_ATTEMPT</a></span></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#END_AUTOESC">END_AUTOESC</a></span></code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#END_COMPRESS">END_COMPRESS</a></span></code>&nbsp;</td>
@@ -375,8 +383,16 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#END_NOAUTOESC">END_NOAUTOESC</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#END_NOESCAPE">END_NOESCAPE</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#END_OUTPUTFORMAT">END_OUTPUTFORMAT</a></span></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#END_RECOVER">END_RECOVER</a></span></code>&nbsp;</td>
@@ -611,48 +627,56 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NODIRECTIVE">NODIRECTIVE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOAUTOESC">NOAUTOESC</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOESCAPE">NOESCAPE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NODIRECTIVE">NODIRECTIVE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NON_ESCAPED_ID_START_CHAR">NON_ESCAPED_ID_START_CHAR</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOESCAPE">NOESCAPE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOPARSE">NOPARSE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NON_ESCAPED_ID_START_CHAR">NON_ESCAPED_ID_START_CHAR</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOT_EQUALS">NOT_EQUALS</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOPARSE">NOPARSE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOTRIM">NOTRIM</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOT_EQUALS">NOT_EQUALS</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OPEN_BRACKET">OPEN_BRACKET</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#NOTRIM">NOTRIM</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OPEN_MISPLACED_INTERPOLATION">OPEN_MISPLACED_INTERPOLATION</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OPEN_BRACKET">OPEN_BRACKET</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OPEN_PAREN">OPEN_PAREN</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OPEN_MISPLACED_INTERPOLATION">OPEN_MISPLACED_INTERPOLATION</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OPENING_CURLY_BRACKET">OPENING_CURLY_BRACKET</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OPEN_PAREN">OPEN_PAREN</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OPENING_CURLY_BRACKET">OPENING_CURLY_BRACKET</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OR">OR</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#OUTPUTFORMAT">OUTPUTFORMAT</a></span></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/ParseException.html#PERCENT">PERCENT</a></span></code>&nbsp;</td>
@@ -1115,7 +1139,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>specialConstructor</h4>
-<pre>protected&nbsp;boolean specialConstructor</pre>
+<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>
+protected&nbsp;boolean specialConstructor</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Will be remove without replacement in 2.4.</span></div>
 </li>
 </ul>
@@ -1496,6 +1521,45 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 </dl>
 </li>
 </ul>
+<a name="OUTPUTFORMAT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>OUTPUTFORMAT</h4>
+<pre>public static final&nbsp;int OUTPUTFORMAT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.ParseException.OUTPUTFORMAT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="AUTOESC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>AUTOESC</h4>
+<pre>public static final&nbsp;int AUTOESC</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.ParseException.AUTOESC">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="NOAUTOESC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NOAUTOESC</h4>
+<pre>public static final&nbsp;int NOAUTOESC</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.ParseException.NOAUTOESC">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="COMPRESS">
 <!--   -->
 </a>
@@ -1704,6 +1768,45 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 </dl>
 </li>
 </ul>
+<a name="END_OUTPUTFORMAT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>END_OUTPUTFORMAT</h4>
+<pre>public static final&nbsp;int END_OUTPUTFORMAT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.ParseException.END_OUTPUTFORMAT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="END_AUTOESC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>END_AUTOESC</h4>
+<pre>public static final&nbsp;int END_AUTOESC</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.ParseException.END_AUTOESC">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="END_NOAUTOESC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>END_NOAUTOESC</h4>
+<pre>public static final&nbsp;int END_NOAUTOESC</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.ParseException.END_NOAUTOESC">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="END_COMPRESS">
 <!--   -->
 </a>
@@ -3102,7 +3205,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>ParseException</h4>
-<pre>protected&nbsp;ParseException()</pre>
+<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>
+protected&nbsp;ParseException()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use a constructor to which you pass description, template, and positions.</span></div>
 <div class="block">The following constructors are for use by you for whatever
  purpose you can think of.  Constructing the exception in this
@@ -3119,9 +3223,10 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>ParseException</h4>
-<pre>public&nbsp;ParseException(<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;description,
-                      int&nbsp;lineNumber,
-                      int&nbsp;columnNumber)</pre>
+<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;ParseException(<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;description,
+                                   int&nbsp;lineNumber,
+                                   int&nbsp;columnNumber)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use a constructor to which you can also pass the template, and the end positions.</span></div>
 </li>
 </ul>
@@ -3168,10 +3273,11 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>ParseException</h4>
-<pre>public&nbsp;ParseException(<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;description,
-                      <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
-                      int&nbsp;lineNumber,
-                      int&nbsp;columnNumber)</pre>
+<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;ParseException(<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;description,
+                                   <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
+                                   int&nbsp;lineNumber,
+                                   int&nbsp;columnNumber)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/core/ParseException.html#ParseException-java.lang.String-freemarker.template.Template-int-int-int-int-"><code>ParseException(String, Template, int, int, int, int)</code></a> instead, as IDE-s need the end
  position of the error too.</span></div>
 <dl>
@@ -3186,11 +3292,12 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>ParseException</h4>
-<pre>public&nbsp;ParseException(<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;description,
-                      <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
-                      int&nbsp;lineNumber,
-                      int&nbsp;columnNumber,
-                      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+<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;ParseException(<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;description,
+                                   <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>&nbsp;template,
+                                   int&nbsp;lineNumber,
+                                   int&nbsp;columnNumber,
+                                   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/core/ParseException.html#ParseException-java.lang.String-freemarker.template.Template-int-int-int-int-java.lang.Throwable-"><code>ParseException(String, Template, int, int, int, int, Throwable)</code></a> instead, as IDE-s need
  the end position of the error too.</span></div>
 <dl>
@@ -3414,8 +3521,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.ht
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/StopException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/core/ParseException.html" target="_top">Frames</a></li>


[27/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/UndefinedOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/UndefinedOutputFormat.html b/docs/api/freemarker/core/UndefinedOutputFormat.html
new file mode 100644
index 0000000..cfd2863
--- /dev/null
+++ b/docs/api/freemarker/core/UndefinedOutputFormat.html
@@ -0,0 +1,359 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>UndefinedOutputFormat (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="UndefinedOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":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/UndefinedOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnexpectedTypeException.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/UndefinedOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="UndefinedOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 UndefinedOutputFormat" class="title">Class UndefinedOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.UndefinedOutputFormat</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">UndefinedOutputFormat</span>
+extends <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></pre>
+<div class="block">Represents the output format used when the template output format is undecided. This is the default output format if
+ FreeMarker can't select anything more specific (see
+ <a href="../../freemarker/template/Configuration.html#setTemplateConfigurations-freemarker.cache.TemplateConfigurationFactory-"><code>Configuration.setTemplateConfigurations(freemarker.cache.TemplateConfigurationFactory)</code></a>). This format doesn't
+ support auto-escaping (<a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a>). It will print
+ <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s as is (doesn't try to convert them).</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core"><code>PlainTextOutputFormat</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/UndefinedOutputFormat.html#INSTANCE">INSTANCE</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/UndefinedOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/UndefinedOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/UndefinedOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></span>()</code>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a> INSTANCE</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="isOutputFormatMixingAllowed--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOutputFormatMixingAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputFormatMixingAllowed()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
+ if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
+ application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
+ inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
+ inserted value is made by escaping plain text and the target format is non-escaping, in which case format
+ conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
+ will be demand for that.)
+ 
+ <p>
+ <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</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/UndefinedOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnexpectedTypeException.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/UndefinedOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="UndefinedOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/UnexpectedTypeException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/UnexpectedTypeException.html b/docs/api/freemarker/core/UnexpectedTypeException.html
index da9a345..1c2ea74 100644
--- a/docs/api/freemarker/core/UnexpectedTypeException.html
+++ b/docs/api/freemarker/core/UnexpectedTypeException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>UnexpectedTypeException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>UnexpectedTypeException (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="UnexpectedTypeException (FreeMarker 2.3.23 API)";
+            parent.document.title="UnexpectedTypeException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -44,8 +44,8 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnformattableValueException.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/UnexpectedTypeException.html" target="_top">Frames</a></li>
@@ -123,7 +123,7 @@
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../freemarker/core/NonBooleanException.html" title="class in freemarker.core">NonBooleanException</a>, <a href="../../freemarker/core/NonDateException.html" title="class in freemarker.core">NonDateException</a>, <a href="../../freemarker/core/NonExtendedHashException.html" title="class in freemarker.core">NonExtendedHashException</a>, <a href="../../freemarker/core/NonHashException.html" title="class in freemarker.core">NonHashException</a>, <a href="../../freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a>, <a href="../../freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a>, <a href="../../freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a>, <a href="../../freemarker/core/NonSequenceException.html" title="class in freemarker.core">NonSequenceException</a>, <a href="../../freemarker/core/NonSequenceOrCollectionException.html" title="
 class in freemarker.core">NonSequenceOrCollectionException</a>, <a href="../../freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a></dd>
+<dd><a href="../../freemarker/core/NonBooleanException.html" title="class in freemarker.core">NonBooleanException</a>, <a href="../../freemarker/core/NonDateException.html" title="class in freemarker.core">NonDateException</a>, <a href="../../freemarker/core/NonExtendedHashException.html" title="class in freemarker.core">NonExtendedHashException</a>, <a href="../../freemarker/core/NonHashException.html" title="class in freemarker.core">NonHashException</a>, <a href="../../freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">NonMarkupOutputException</a>, <a href="../../freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a>, <a href="../../freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a>, <a href="../../freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a>, <a href="../../freemarker/core/NonSequenceException.html" title="clas
 s in freemarker.core">NonSequenceException</a>, <a href="../../freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a>, <a href="../../freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a>, <a href="../../freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">NonStringOrTemplateOutputException</a></dd>
 </dl>
 <hr>
 <br>
@@ -239,8 +239,8 @@ extends <a href="../../freemarker/template/TemplateException.html" title="class
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnformattableValueException.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/UnexpectedTypeException.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/UnformattableValueException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/UnformattableValueException.html b/docs/api/freemarker/core/UnformattableValueException.html
new file mode 100644
index 0000000..7aa82e2
--- /dev/null
+++ b/docs/api/freemarker/core/UnformattableValueException.html
@@ -0,0 +1,291 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>UnformattableValueException (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="UnformattableValueException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UnformattableValueException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.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/UnformattableValueException.html" target="_top">Frames</a></li>
+<li><a href="UnformattableValueException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 UnformattableValueException" class="title">Class UnformattableValueException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.UnformattableValueException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeFormattingUnsupportedException</a>, <a href="../../freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeParsingUnsupportedException</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">UnformattableValueException</span>
+extends <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">Thrown when a <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> can't be formatted because of the value/properties of it are outside of that the
+ <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> supports. For example, a formatter may not support dates before year 1, or can't format
+ NaN. The most often used subclass is <a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core"><code>UnknownDateTypeFormattingUnsupportedException</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.UnformattableValueException">Serialized Form</a></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/UnformattableValueException.html#UnformattableValueException-java.lang.String-">UnformattableValueException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/UnformattableValueException.html#UnformattableValueException-java.lang.String-java.lang.Throwable-">UnformattableValueException</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;message,
+                           <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UnformattableValueException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UnformattableValueException</h4>
+<pre>public&nbsp;UnformattableValueException(<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;message,
+                                   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="UnformattableValueException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UnformattableValueException</h4>
+<pre>public&nbsp;UnformattableValueException(<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;message)</pre>
+</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/UnformattableValueException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.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/UnformattableValueException.html" target="_top">Frames</a></li>
+<li><a href="UnformattableValueException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/UnknownDateTypeFormattingUnsupportedException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/UnknownDateTypeFormattingUnsupportedException.html b/docs/api/freemarker/core/UnknownDateTypeFormattingUnsupportedException.html
new file mode 100644
index 0000000..1136826
--- /dev/null
+++ b/docs/api/freemarker/core/UnknownDateTypeFormattingUnsupportedException.html
@@ -0,0 +1,276 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>UnknownDateTypeFormattingUnsupportedException (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="UnknownDateTypeFormattingUnsupportedException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UnknownDateTypeFormattingUnsupportedException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnknownDateTypeParsingUnsupportedException.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/UnknownDateTypeFormattingUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="UnknownDateTypeFormattingUnsupportedException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 UnknownDateTypeFormattingUnsupportedException" class="title">Class UnknownDateTypeFormattingUnsupportedException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">freemarker.core.UnformattableValueException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.UnknownDateTypeFormattingUnsupportedException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">UnknownDateTypeFormattingUnsupportedException</span>
+extends <a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a></pre>
+<div class="block">Thrown when a <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> can't be formatted because its type is <a href="../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.UnknownDateTypeFormattingUnsupportedException">Serialized Form</a></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/UnknownDateTypeFormattingUnsupportedException.html#UnknownDateTypeFormattingUnsupportedException--">UnknownDateTypeFormattingUnsupportedException</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UnknownDateTypeFormattingUnsupportedException--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UnknownDateTypeFormattingUnsupportedException</h4>
+<pre>public&nbsp;UnknownDateTypeFormattingUnsupportedException()</pre>
+</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/UnknownDateTypeFormattingUnsupportedException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnknownDateTypeParsingUnsupportedException.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/UnknownDateTypeFormattingUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="UnknownDateTypeFormattingUnsupportedException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/UnknownDateTypeParsingUnsupportedException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/UnknownDateTypeParsingUnsupportedException.html b/docs/api/freemarker/core/UnknownDateTypeParsingUnsupportedException.html
new file mode 100644
index 0000000..cc51b15
--- /dev/null
+++ b/docs/api/freemarker/core/UnknownDateTypeParsingUnsupportedException.html
@@ -0,0 +1,277 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>UnknownDateTypeParsingUnsupportedException (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="UnknownDateTypeParsingUnsupportedException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UnknownDateTypeParsingUnsupportedException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnparsableValueException.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/UnknownDateTypeParsingUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="UnknownDateTypeParsingUnsupportedException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 UnknownDateTypeParsingUnsupportedException" class="title">Class UnknownDateTypeParsingUnsupportedException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">freemarker.core.UnformattableValueException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.UnknownDateTypeParsingUnsupportedException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">UnknownDateTypeParsingUnsupportedException</span>
+extends <a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a></pre>
+<div class="block">Thrown when a string can't be parsed to <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, because the provided target type is
+ <a href="../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.UnknownDateTypeParsingUnsupportedException">Serialized Form</a></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/UnknownDateTypeParsingUnsupportedException.html#UnknownDateTypeParsingUnsupportedException--">UnknownDateTypeParsingUnsupportedException</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UnknownDateTypeParsingUnsupportedException--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UnknownDateTypeParsingUnsupportedException</h4>
+<pre>public&nbsp;UnknownDateTypeParsingUnsupportedException()</pre>
+</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/UnknownDateTypeParsingUnsupportedException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnparsableValueException.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/UnknownDateTypeParsingUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="UnknownDateTypeParsingUnsupportedException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/UnparsableValueException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/UnparsableValueException.html b/docs/api/freemarker/core/UnparsableValueException.html
new file mode 100644
index 0000000..9f0cdbd
--- /dev/null
+++ b/docs/api/freemarker/core/UnparsableValueException.html
@@ -0,0 +1,286 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>UnparsableValueException (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="UnparsableValueException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/UnparsableValueException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnregisteredOutputFormatException.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/UnparsableValueException.html" target="_top">Frames</a></li>
+<li><a href="UnparsableValueException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 UnparsableValueException" class="title">Class UnparsableValueException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.UnparsableValueException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">UnparsableValueException</span>
+extends <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">Thrown when the content of the string that should be parsed by the <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> doesn't match what the
+ format expects.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.UnparsableValueException">Serialized Form</a></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/UnparsableValueException.html#UnparsableValueException-java.lang.String-">UnparsableValueException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/UnparsableValueException.html#UnparsableValueException-java.lang.String-java.lang.Throwable-">UnparsableValueException</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;message,
+                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="UnparsableValueException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>UnparsableValueException</h4>
+<pre>public&nbsp;UnparsableValueException(<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;message,
+                                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="UnparsableValueException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UnparsableValueException</h4>
+<pre>public&nbsp;UnparsableValueException(<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;message)</pre>
+</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/UnparsableValueException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/UnregisteredOutputFormatException.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/UnparsableValueException.html" target="_top">Frames</a></li>
+<li><a href="UnparsableValueException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>


[04/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/index.html
----------------------------------------------------------------------
diff --git a/docs/api/index.html b/docs/api/index.html
index cca0305..d86c12b 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -2,9 +2,9 @@
 <!-- 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>FreeMarker 2.3.23 API</title>
+<title>FreeMarker 2.3.24-incubating API</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
     if (targetPage != "" && targetPage != "undefined")

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/overview-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/overview-frame.html b/docs/api/overview-frame.html
index f98b491..9faa9b4 100644
--- a/docs/api/overview-frame.html
+++ b/docs/api/overview-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>Overview List (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Overview List (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/overview-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/overview-summary.html b/docs/api/overview-summary.html
index f34b9a6..91decf0 100644
--- a/docs/api/overview-summary.html
+++ b/docs/api/overview-summary.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>Overview (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Overview (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="Overview (FreeMarker 2.3.23 API)";
+            parent.document.title="Overview (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -71,7 +71,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">FreeMarker 2.3.23</h1>
+<h1 class="title">FreeMarker 2.3.24-incubating</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/overview-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/overview-tree.html b/docs/api/overview-tree.html
index 691e908..980ad83 100644
--- a/docs/api/overview-tree.html
+++ b/docs/api/overview-tree.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>Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>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="Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -149,11 +149,21 @@
 </ul>
 </li>
 <li type="circle">freemarker.debug.<a href="freemarker/debug/Breakpoint.html" title="class in freemarker.debug"><span class="typeNameLink">Breakpoint</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, 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>)</li>
+<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.template.utility.<a href="freemarker/template/utility/CaptureOutput.html" title="class in freemarker.template.utility"><span class="typeNameLink">CaptureOutput</span></a> (implements freemarker.template.<a href="freemarker/template/TemplateTransformModel.html" title="interface in freemarker.template">TemplateTransformModel</a>)</li>
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/ClassUtil.html" title="class in freemarker.template.utility"><span class="typeNameLink">ClassUtil</span></a></li>
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/Collections12.html" title="class in freemarker.template.utility"><span class="typeNameLink">Collections12</span></a></li>
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/CollectionUtils.html" title="class in freemarker.template.utility"><span class="typeNameLink">CollectionUtils</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/CommandLine.html" title="class in freemarker.core"><span class="typeNameLink">CommandLine</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">CommonTemplateMarkupOutputModel</span></a>&lt;MO&gt; (implements freemarker.core.<a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;)
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateCombinedMarkupOutputModel</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateHTMLOutputModel</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateRTFOutputModel</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateXHTMLOutputModel</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateXMLOutputModel</span></a></li>
+</ul>
+</li>
 <li type="circle">java.awt.<a href="http://docs.oracle.com/javase/8/docs/api/java/awt/Component.html?is-external=true" title="class or interface in java.awt"><span class="typeNameLink">Component</span></a> (implements java.awt.image.<a href="http://docs.oracle.com/javase/8/docs/api/java/awt/image/ImageObserver.html?is-external=true" title="class or interface in java.awt.image">ImageObserver</a>, java.awt.<a href="http://docs.oracle.com/javase/8/docs/api/java/awt/MenuContainer.html?is-external=true" title="class or interface in java.awt">MenuContainer</a>, 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.awt.<a href="http://docs.oracle.com/javase/8/docs/api/java/awt/Container.html?is-external=true" title="class or interface in java.awt"><span class="typeNameLink">Container</span></a>
@@ -173,9 +183,10 @@
 </li>
 <li type="circle">freemarker.core.<a href="freemarker/core/Configurable.html" title="class in freemarker.core"><span class="typeNameLink">Configurable</span></a>
 <ul>
-<li type="circle">freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template"><span class="typeNameLink">Configuration</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>)</li>
+<li type="circle">freemarker.template.<a href="freemarker/template/Configuration.html" title="class in freemarker.template"><span class="typeNameLink">Configuration</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a>, freemarker.core.<a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>)</li>
 <li type="circle">freemarker.core.<a href="freemarker/core/Environment.html" title="class in freemarker.core"><span class="typeNameLink">Environment</span></a></li>
 <li type="circle">freemarker.template.<a href="freemarker/template/Template.html" title="class in freemarker.template"><span class="typeNameLink">Template</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><span class="typeNameLink">TemplateConfiguration</span></a> (implements freemarker.core.<a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>)</li>
 </ul>
 </li>
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/Constants.html" title="class in freemarker.template.utility"><span class="typeNameLink">Constants</span></a></li>
@@ -240,6 +251,28 @@
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/ObjectConstructor.html" title="class in freemarker.template.utility"><span class="typeNameLink">ObjectConstructor</span></a> (implements freemarker.template.<a href="freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template">TemplateMethodModelEx</a>)</li>
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/OptimizerUtil.html" title="class in freemarker.template.utility"><span class="typeNameLink">OptimizerUtil</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core"><span class="typeNameLink">OptInTemplateClassResolver</span></a> (implements freemarker.core.<a href="freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core">TemplateClassResolver</a>)</li>
+<li type="circle">freemarker.core.<a href="freemarker/core/OutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">OutputFormat</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/CSSOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CSSOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">JavaScriptOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/JSONOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">JSONOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">MarkupOutputFormat</span></a>&lt;MO&gt;
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CommonMarkupOutputFormat</span></a>&lt;MO&gt;
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CombinedMarkupOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">HTMLOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">RTFOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">XHTMLOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">XMLOutputFormat</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">PlainTextOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">UndefinedOutputFormat</span></a></li>
+</ul>
+</li>
 <li type="circle">freemarker.ext.beans.<a href="freemarker/ext/beans/OverloadedMethodsModel.html" title="class in freemarker.ext.beans"><span class="typeNameLink">OverloadedMethodsModel</span></a> (implements freemarker.template.<a href="freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template">TemplateMethodModelEx</a>, freemarker.template.<a href="freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>)</li>
 <li type="circle">org.apache.tools.ant.ProjectComponent
 <ul>
@@ -286,11 +319,50 @@
 </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.core.<a href="freemarker/core/TemplateFormatUtil.html" title="class in freemarker.core"><span class="typeNameLink">TemplateFormatUtil</span></a></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.template.<a href="freemarker/template/TemplateModelListSequence.html" title="class in freemarker.template"><span class="typeNameLink">TemplateModelListSequence</span></a> (implements freemarker.template.<a href="freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</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">freemarker.core.<a href="freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><span class="typeNameLink">TemplateValueFormat</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><span class="typeNameLink">TemplateDateFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><span class="typeNameLink">TemplateNumberFormat</span></a></li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">TemplateValueFormatFactory</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">TemplateDateFormatFactory</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">AliasTemplateDateFormatFactory</span></a></li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">TemplateNumberFormatFactory</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">AliasTemplateNumberFormatFactory</span></a></li>
+</ul>
+</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>
@@ -328,6 +400,7 @@
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/UnsupportedNumberClassException.html" title="class in freemarker.template.utility"><span class="typeNameLink">UnsupportedNumberClassException</span></a></li>
 </ul>
 </li>
+<li type="circle">freemarker.cache.<a href="freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache"><span class="typeNameLink">TemplateConfigurationFactoryException</span></a></li>
 <li type="circle">freemarker.template.<a href="freemarker/template/TemplateException.html" title="class in freemarker.template"><span class="typeNameLink">TemplateException</span></a>
 <ul>
 <li type="circle">freemarker.core._MiscTemplateException
@@ -349,17 +422,38 @@
 <li type="circle">freemarker.core.<a href="freemarker/core/NonDateException.html" title="class in freemarker.core"><span class="typeNameLink">NonDateException</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/NonExtendedHashException.html" title="class in freemarker.core"><span class="typeNameLink">NonExtendedHashException</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/NonHashException.html" title="class in freemarker.core"><span class="typeNameLink">NonHashException</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core"><span class="typeNameLink">NonMarkupOutputException</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/NonMethodException.html" title="class in freemarker.core"><span class="typeNameLink">NonMethodException</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/NonNodeException.html" title="class in freemarker.core"><span class="typeNameLink">NonNodeException</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/NonNumericalException.html" title="class in freemarker.core"><span class="typeNameLink">NonNumericalException</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/NonSequenceException.html" title="class in freemarker.core"><span class="typeNameLink">NonSequenceException</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core"><span class="typeNameLink">NonSequenceOrCollectionException</span></a></li>
 <li type="circle">freemarker.core.<a href="freemarker/core/NonStringException.html" title="class in freemarker.core"><span class="typeNameLink">NonStringException</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core"><span class="typeNameLink">NonStringOrTemplateOutputException</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core"><span class="typeNameLink">TemplateValueFormatException</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core"><span class="typeNameLink">InvalidFormatStringException</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core"><span class="typeNameLink">InvalidFormatParametersException</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core"><span class="typeNameLink">UndefinedCustomFormatException</span></a></li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core"><span class="typeNameLink">ParsingNotSupportedException</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/UnformattableValueException.html" title="class in freemarker.core"><span class="typeNameLink">UnformattableValueException</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core"><span class="typeNameLink">UnknownDateTypeFormattingUnsupportedException</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core"><span class="typeNameLink">UnknownDateTypeParsingUnsupportedException</span></a></li>
 </ul>
 </li>
+<li type="circle">freemarker.core.<a href="freemarker/core/UnparsableValueException.html" title="class in freemarker.core"><span class="typeNameLink">UnparsableValueException</span></a></li>
 </ul>
 </li>
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/UnrecognizedTimeZoneException.html" title="class in freemarker.template.utility"><span class="typeNameLink">UnrecognizedTimeZoneException</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core"><span class="typeNameLink">UnregisteredOutputFormatException</span></a></li>
 </ul>
 </li>
 </ul>
@@ -423,7 +517,7 @@
 </li>
 <li type="circle">freemarker.ext.beans.<a href="freemarker/ext/beans/MethodAppearanceFineTuner.html" title="interface in freemarker.ext.beans"><span class="typeNameLink">MethodAppearanceFineTuner</span></a></li>
 <li type="circle">freemarker.ext.util.<a href="freemarker/ext/util/ModelFactory.html" title="interface in freemarker.ext.util"><span class="typeNameLink">ModelFactory</span></a></li>
-<li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility"><span class="typeNameLink">ObjectFactory</span></a></li>
+<li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/ObjectFactory.html" title="interface in freemarker.template.utility"><span class="typeNameLink">ObjectFactory</span></a>&lt;T&gt;</li>
 <li type="circle">freemarker.template.<a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><span class="typeNameLink">ObjectWrapper</span></a>
 <ul>
 <li type="circle">freemarker.template.<a href="freemarker/template/ObjectWrapperAndUnwrapper.html" title="interface in freemarker.template"><span class="typeNameLink">ObjectWrapperAndUnwrapper</span></a>
@@ -439,6 +533,7 @@
 <li type="circle">freemarker.template.utility.<a href="freemarker/template/utility/RichObjectWrapper.html" title="interface in freemarker.template.utility"><span class="typeNameLink">RichObjectWrapper</span></a> (also extends freemarker.template.<a href="freemarker/template/ObjectWrapperAndUnwrapper.html" title="interface in freemarker.template">ObjectWrapperAndUnwrapper</a>, freemarker.template.utility.<a href="freemarker/template/utility/ObjectWrapperWithAPISupport.html" title="interface in freemarker.template.utility">ObjectWrapperWithAPISupport</a>)</li>
 </ul>
 </li>
+<li type="circle">freemarker.core.<a href="freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><span class="typeNameLink">ParserConfiguration</span></a></li>
 <li type="circle">java.rmi.<a href="http://docs.oracle.com/javase/8/docs/api/java/rmi/Remote.html?is-external=true" title="class or interface in java.rmi"><span class="typeNameLink">Remote</span></a>
 <ul>
 <li type="circle">freemarker.debug.<a href="freemarker/debug/DebuggedEnvironment.html" title="interface in freemarker.debug"><span class="typeNameLink">DebuggedEnvironment</span></a></li>
@@ -478,6 +573,7 @@
 </ul>
 </li>
 <li type="circle">freemarker.template.<a href="freemarker/template/TemplateHashModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateHashModelEx</span></a></li>
+<li type="circle">freemarker.core.<a href="freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><span class="typeNameLink">TemplateMarkupOutputModel</span></a>&lt;MO&gt;</li>
 <li type="circle">freemarker.template.<a href="freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateMethodModel</span></a>
 <ul>
 <li type="circle">freemarker.template.<a href="freemarker/template/TemplateMethodModelEx.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateMethodModelEx</span></a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/serialized-form.html
----------------------------------------------------------------------
diff --git a/docs/api/serialized-form.html b/docs/api/serialized-form.html
index 3bdfce0..ed3aa6e 100644
--- a/docs/api/serialized-form.html
+++ b/docs/api/serialized-form.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>Serialized Form (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Serialized Form (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="Serialized Form (FreeMarker 2.3.23 API)";
+            parent.document.title="Serialized Form (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -76,6 +76,16 @@
 <div class="serializedFormContainer">
 <ul class="blockList">
 <li class="blockList">
+<h2 title="Package">Package&nbsp;freemarker.cache</h2>
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.cache.TemplateConfigurationFactoryException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache">freemarker.cache.TemplateConfigurationFactoryException</a> extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a> implements Serializable</h3>
+</li>
+</ul>
+</li>
+<li class="blockList">
 <h2 title="Package">Package&nbsp;freemarker.core</h2>
 <ul class="blockList">
 <li class="blockList"><a name="freemarker.core._MiscTemplateException">
@@ -157,6 +167,32 @@
 <!--   -->
 </a>
 <h3>Class <a href="freemarker/core/FreeMarkerTree.html" title="class in freemarker.core">freemarker.core.FreeMarkerTree</a> extends <a href="http://docs.oracle.com/javase/8/docs/api/javax/swing/JTree.html?is-external=true" title="class or interface in javax.swing">JTree</a> implements Serializable</h3>
+<dl class="nameValue">
+<dt>serialVersionUID:</dt>
+<dd>1L</dd>
+</dl>
+<ul class="blockList">
+<li class="blockList">
+<h3>Serialized Fields</h3>
+<ul class="blockList">
+<li class="blockListLast">
+<h4>nodeMap</h4>
+<pre><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/Map.html?is-external=true" title="class or interface in java.util">K</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">V</a>&gt; nodeMap</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="blockList"><a name="freemarker.core.InvalidFormatParametersException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">freemarker.core.InvalidFormatParametersException</a> extends <a href="freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a> implements Serializable</h3>
+</li>
+<li class="blockList"><a name="freemarker.core.InvalidFormatStringException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">freemarker.core.InvalidFormatStringException</a> extends <a href="freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a> implements Serializable</h3>
 </li>
 <li class="blockList"><a name="freemarker.core.InvalidReferenceException">
 <!--   -->
@@ -183,6 +219,11 @@
 </a>
 <h3>Class <a href="freemarker/core/NonHashException.html" title="class in freemarker.core">freemarker.core.NonHashException</a> extends <a href="freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">UnexpectedTypeException</a> implements Serializable</h3>
 </li>
+<li class="blockList"><a name="freemarker.core.NonMarkupOutputException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">freemarker.core.NonMarkupOutputException</a> extends <a href="freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">UnexpectedTypeException</a> implements Serializable</h3>
+</li>
 <li class="blockList"><a name="freemarker.core.NonMethodException">
 <!--   -->
 </a>
@@ -213,6 +254,11 @@
 </a>
 <h3>Class <a href="freemarker/core/NonStringException.html" title="class in freemarker.core">freemarker.core.NonStringException</a> extends <a href="freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">UnexpectedTypeException</a> implements Serializable</h3>
 </li>
+<li class="blockList"><a name="freemarker.core.NonStringOrTemplateOutputException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">freemarker.core.NonStringOrTemplateOutputException</a> extends <a href="freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">UnexpectedTypeException</a> implements Serializable</h3>
+</li>
 <li class="blockList"><a name="freemarker.core.ParseException">
 <!--   -->
 </a>
@@ -288,6 +334,11 @@
 </li>
 </ul>
 </li>
+<li class="blockList"><a name="freemarker.core.ParsingNotSupportedException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core">freemarker.core.ParsingNotSupportedException</a> extends <a href="freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a> implements Serializable</h3>
+</li>
 <li class="blockList"><a name="freemarker.core.ReturnInstruction.Return">
 <!--   -->
 </a>
@@ -298,6 +349,16 @@
 </a>
 <h3>Class <a href="freemarker/core/StopException.html" title="class in freemarker.core">freemarker.core.StopException</a> extends <a href="freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a> implements Serializable</h3>
 </li>
+<li class="blockList"><a name="freemarker.core.TemplateElementArrayBuilder">
+<!--   -->
+</a>
+<h3>Class freemarker.core.TemplateElementArrayBuilder extends <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> implements Serializable</h3>
+</li>
+<li class="blockList"><a name="freemarker.core.TemplateValueFormatException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a> extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a> implements Serializable</h3>
+</li>
 <li class="blockList"><a name="freemarker.core.TokenMgrError">
 <!--   -->
 </a>
@@ -334,11 +395,41 @@
 </li>
 </ul>
 </li>
+<li class="blockList"><a name="freemarker.core.UndefinedCustomFormatException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core">freemarker.core.UndefinedCustomFormatException</a> extends <a href="freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a> implements Serializable</h3>
+</li>
 <li class="blockList"><a name="freemarker.core.UnexpectedTypeException">
 <!--   -->
 </a>
 <h3>Class <a href="freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">freemarker.core.UnexpectedTypeException</a> extends <a href="freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a> implements Serializable</h3>
 </li>
+<li class="blockList"><a name="freemarker.core.UnformattableValueException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/UnformattableValueException.html" title="class in freemarker.core">freemarker.core.UnformattableValueException</a> extends <a href="freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a> implements Serializable</h3>
+</li>
+<li class="blockList"><a name="freemarker.core.UnknownDateTypeFormattingUnsupportedException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core">freemarker.core.UnknownDateTypeFormattingUnsupportedException</a> extends <a href="freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a> implements Serializable</h3>
+</li>
+<li class="blockList"><a name="freemarker.core.UnknownDateTypeParsingUnsupportedException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core">freemarker.core.UnknownDateTypeParsingUnsupportedException</a> extends <a href="freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a> implements Serializable</h3>
+</li>
+<li class="blockList"><a name="freemarker.core.UnparsableValueException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/UnparsableValueException.html" title="class in freemarker.core">freemarker.core.UnparsableValueException</a> extends <a href="freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a> implements Serializable</h3>
+</li>
+<li class="blockList"><a name="freemarker.core.UnregisteredOutputFormatException">
+<!--   -->
+</a>
+<h3>Class <a href="freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core">freemarker.core.UnregisteredOutputFormatException</a> extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a> implements Serializable</h3>
+</li>
 </ul>
 </li>
 <li class="blockList">
@@ -479,11 +570,23 @@
 </li>
 <li class="blockList">
 <h4>contentType</h4>
-<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> contentType</pre>
+<pre>freemarker.ext.servlet.FreemarkerServlet.ContentType contentType</pre>
 </li>
 <li class="blockList">
-<h4>noCharsetInContentType</h4>
-<pre>boolean noCharsetInContentType</pre>
+<h4>overrideResponseContentType</h4>
+<pre>freemarker.ext.servlet.FreemarkerServlet.OverrideResponseContentType overrideResponseContentType</pre>
+</li>
+<li class="blockList">
+<h4>responseCharacterEncoding</h4>
+<pre>freemarker.ext.servlet.FreemarkerServlet.ResponseCharacterEncoding responseCharacterEncoding</pre>
+</li>
+<li class="blockList">
+<h4>forcedResponseCharacterEncoding</h4>
+<pre><a href="http://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html?is-external=true" title="class or interface in java.nio.charset">Charset</a> forcedResponseCharacterEncoding</pre>
+</li>
+<li class="blockList">
+<h4>overrideResponseLocale</h4>
+<pre>freemarker.ext.servlet.FreemarkerServlet.OverrideResponseLocale overrideResponseLocale</pre>
 </li>
 <li class="blockList">
 <h4>metaInfTldSources</h4>
@@ -613,8 +716,8 @@
 <pre><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">E</a>&gt; iterator</pre>
 </li>
 <li class="blockListLast">
-<h4>iteratorOwned</h4>
-<pre>boolean iteratorOwned</pre>
+<h4>iteratorOwnedBySomeone</h4>
+<pre>boolean iteratorOwnedBySomeone</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/stylesheet.css
----------------------------------------------------------------------
diff --git a/docs/api/stylesheet.css b/docs/api/stylesheet.css
index 1b70940..024b7d3 100644
--- a/docs/api/stylesheet.css
+++ b/docs/api/stylesheet.css
@@ -461,7 +461,6 @@ Table styles
 .useSummary td, .constantsSummary td, .deprecatedSummary td {
     text-align:left;
     padding:0px 0px 12px 10px;
-    width:100%;
 }
 th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
 td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
@@ -486,6 +485,7 @@ td.colOne, th.colOne {
     font-size:13px;
 }
 .overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
 .overviewSummary td.colOne, .overviewSummary th.colOne,
 .memberSummary td.colFirst, .memberSummary th.colFirst,
 .memberSummary td.colOne, .memberSummary th.colOne,

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/app.html
----------------------------------------------------------------------
diff --git a/docs/app.html b/docs/app.html
index e0f1f79..a1b35bb 100644
--- a/docs/app.html
+++ b/docs/app.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-part">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>Appendixes - FreeMarker Manual</title>
+<title>Appendixes - Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
 <meta property="og:title" content="Appendixes">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/app.html">
-<link rel="canoical" href="http://freemarker.org/docs/app.html">
+<link rel="canonical" href="http://freemarker.org/docs/app.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,17 +25,16 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
   <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">
 Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
+</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">Apache FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheat
 sheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
-      <script>var breadcrumb = ["FreeMarker Manual","Appendixes"];</script>
+      <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes"];</script>
       <script src="toc.js"></script>
       <script src="docgen-resources/main.min.js"></script>
   </div>
@@ -42,14 +42,11 @@ ga('send', 'pageview');
 <h1 class="content-header header-part" id="app" itemprop="headline">Appendixes</h1>
 </div></div><div class="page-menu">
 <div class="page-menu-title">Section Contents</div>
-<ul><li><a class="page-menu-link" href="app_faq.html" data-menu-target="app_faq">FAQ</a></li><li><a class="page-menu-link" href="app_versions.html" data-menu-target="app_versions">Version history</a><ul><li><a class="page-menu-link" href="versions_2_3_23.html" data-menu-target="versions_2_3_23">2.3.23</a></li><li><a class="page-menu-link" href="versions_2_3_22.html" data-menu-target="versions_2_3_22">2.3.22</a></li><li><a class="page-menu-link" href="versions_2_3_21.html" data-menu-target="versions_2_3_21">2.3.21</a></li><li><a class="page-menu-link" href="versions_2_3_20.html" data-menu-target="versions_2_3_20">2.3.20</a></li><li><a class="page-menu-link" href="versions_2_3_19.html" data-menu-target="versions_2_3_19">2.3.19</a></li><li><a class="page-menu-link" href="versions_2_3_18.html" data-menu-target="versions_2_3_18">2.3.18</a></li><li><a class="page-menu-link" href="versions_2_3_17.html" data-menu-target="versions_2_3_17">2.3.17</a></li><li><a class="page-menu-link" href="ve
 rsions_2_3_16.html" data-menu-target="versions_2_3_16">2.3.16</a></li><li><a class="page-menu-link" href="versions_2_3_15.html" data-menu-target="versions_2_3_15">2.3.15</a></li><li><a class="page-menu-link" href="versions_2_3_14.html" data-menu-target="versions_2_3_14">2.3.14</a></li><li><a class="page-menu-link" href="versions_2_3_13.html" data-menu-target="versions_2_3_13">2.3.13</a></li><li><a class="page-menu-link" href="versions_2_3_12.html" data-menu-target="versions_2_3_12">2.3.12</a></li><li><a class="page-menu-link" href="versions_2_3_11.html" data-menu-target="versions_2_3_11">2.3.11</a></li><li><a class="page-menu-link" href="versions_2_3_10.html" data-menu-target="versions_2_3_10">2.3.10</a></li><li><a class="page-menu-link" href="versions_2_3_9.html" data-menu-target="versions_2_3_9">2.3.9</a></li><li><a class="page-menu-link" href="versions_2_3_8.html" data-menu-target="versions_2_3_8">2.3.8</a></li><li><a class="page-menu-link" href="versions_2_3_7.html" data-menu-ta
 rget="versions_2_3_7">2.3.7</a></li><li><a class="page-menu-link" href="versions_2_3_7rc1.html" data-menu-target="versions_2_3_7rc1">2.3.7 RC1</a></li><li><a class="page-menu-link" href="versions_2_3_6.html" data-menu-target="versions_2_3_6">2.3.6</a></li><li><a class="page-menu-link" href="versions_2_3_5.html" data-menu-target="versions_2_3_5">2.3.5</a></li><li><a class="page-menu-link" href="versions_2_3_4.html" data-menu-target="versions_2_3_4">2.3.4</a></li><li><a class="page-menu-link" href="versions_2_3_3.html" data-menu-target="versions_2_3_3">2.3.3</a></li><li><a class="page-menu-link" href="versions_2_3_2.html" data-menu-target="versions_2_3_2">2.3.2</a></li><li><a class="page-menu-link" href="versions_2_3_1.html" data-menu-target="versions_2_3_1">2.3.1</a></li><li><a class="page-menu-link" href="versions_2_3.html" data-menu-target="versions_2_3">2.3</a></li><li><a class="page-menu-link" href="versions_2_2_8.html" data-menu-target="versions_2_2_8">2.2.8</a></li><li><a class
 ="page-menu-link" href="versions_2_2_7.html" data-menu-target="versions_2_2_7">2.2.7</a></li><li><a class="page-menu-link" href="versions_2_2_6.html" data-menu-target="versions_2_2_6">2.2.6</a></li><li><a class="page-menu-link" href="versions_2_2_5.html" data-menu-target="versions_2_2_5">2.2.5</a></li><li><a class="page-menu-link" href="versions_2_2_4.html" data-menu-target="versions_2_2_4">2.2.4</a></li><li><a class="page-menu-link" href="versions_2_2_3.html" data-menu-target="versions_2_2_3">2.2.3</a></li><li><a class="page-menu-link" href="versions_2_2_2.html" data-menu-target="versions_2_2_2">2.2.2</a></li><li><a class="page-menu-link" href="versions_2_2_1.html" data-menu-target="versions_2_2_1">2.2.1</a></li><li><a class="page-menu-link" href="versions_2_2.html" data-menu-target="versions_2_2">2.2</a></li><li><a class="page-menu-link" href="versions_2_1_5.html" data-menu-target="versions_2_1_5">2.1.5</a></li><li><a class="page-menu-link" href="versions_2_1_4.html" data-menu-tar
 get="versions_2_1_4">2.1.4</a></li><li><a class="page-menu-link" href="versions_2_1_3.html" data-menu-target="versions_2_1_3">2.1.3</a></li><li><a class="page-menu-link" href="versions_2_1_2.html" data-menu-target="versions_2_1_2">2.1.2</a></li><li><a class="page-menu-link" href="versions_2_1_1.html" data-menu-target="versions_2_1_1">2.1.1</a></li><li><a class="page-menu-link" href="versions_2_1.html" data-menu-target="versions_2_1">2.1</a></li><li><a class="page-menu-link" href="versions_2_01.html" data-menu-target="versions_2_01">2.01</a></li><li><a class="page-menu-link" href="versions_2_0.html" data-menu-target="versions_2_0">2.0</a></li><li><a class="page-menu-link" href="versions_2_0RC3.html" data-menu-target="versions_2_0RC3">2.0 RC3</a></li><li><a class="page-menu-link" href="versions_2_0RC2.html" data-menu-target="versions_2_0RC2">2.0 RC2</a></li><li><a class="page-menu-link" href="versions_2_0RC1.html" data-menu-target="versions_2_0RC1">2.0 RC1</a></li></ul></li><li><a cla
 ss="page-menu-link" href="app_install.html" data-menu-target="app_install">Installing FreeMarker</a></li><li><a class="page-menu-link" href="app_legal.html" data-menu-target="app_legal">Legal</a><ul><li><a class="page-menu-link" href="app_license.html" data-menu-target="app_license">License</a></li><li><a class="page-menu-link" href="app_eccn.html" data-menu-target="app_eccn">Export Control</a></li></ul></li></ul> </div><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="xgui_declarative_details.html"><span>Previous</span></a><a class="paging-arrow next" href="app_faq.html"><span>Next</span></a></div></div></div></div>      </div>
+<ul><li><a class="page-menu-link" href="app_faq.html" data-menu-target="app_faq">FAQ</a></li><li><a class="page-menu-link" href="app_versions.html" data-menu-target="app_versions">Version history</a><ul><li><a class="page-menu-link" href="versions_2_3_24.html" data-menu-target="versions_2_3_24">2.3.24 (incubating)</a></li><li><a class="page-menu-link" href="versions_2_3_23.html" data-menu-target="versions_2_3_23">2.3.23</a></li><li><a class="page-menu-link" href="versions_2_3_22.html" data-menu-target="versions_2_3_22">2.3.22</a></li><li><a class="page-menu-link" href="versions_2_3_21.html" data-menu-target="versions_2_3_21">2.3.21</a></li><li><a class="page-menu-link" href="versions_2_3_20.html" data-menu-target="versions_2_3_20">2.3.20</a></li><li><a class="page-menu-link" href="versions_2_3_19.html" data-menu-target="versions_2_3_19">2.3.19</a></li><li><a class="page-menu-link" href="versions_2_3_18.html" data-menu-target="versions_2_3_18">2.3.18</a></li><li><a class="page-menu-l
 ink" href="versions_2_3_17.html" data-menu-target="versions_2_3_17">2.3.17</a></li><li><a class="page-menu-link" href="versions_2_3_16.html" data-menu-target="versions_2_3_16">2.3.16</a></li><li><a class="page-menu-link" href="versions_2_3_15.html" data-menu-target="versions_2_3_15">2.3.15</a></li><li><a class="page-menu-link" href="versions_2_3_14.html" data-menu-target="versions_2_3_14">2.3.14</a></li><li><a class="page-menu-link" href="versions_2_3_13.html" data-menu-target="versions_2_3_13">2.3.13</a></li><li><a class="page-menu-link" href="versions_2_3_12.html" data-menu-target="versions_2_3_12">2.3.12</a></li><li><a class="page-menu-link" href="versions_2_3_11.html" data-menu-target="versions_2_3_11">2.3.11</a></li><li><a class="page-menu-link" href="versions_2_3_10.html" data-menu-target="versions_2_3_10">2.3.10</a></li><li><a class="page-menu-link" href="versions_2_3_9.html" data-menu-target="versions_2_3_9">2.3.9</a></li><li><a class="page-menu-link" href="versions_2_3_8.ht
 ml" data-menu-target="versions_2_3_8">2.3.8</a></li><li><a class="page-menu-link" href="versions_2_3_7.html" data-menu-target="versions_2_3_7">2.3.7</a></li><li><a class="page-menu-link" href="versions_2_3_7rc1.html" data-menu-target="versions_2_3_7rc1">2.3.7 RC1</a></li><li><a class="page-menu-link" href="versions_2_3_6.html" data-menu-target="versions_2_3_6">2.3.6</a></li><li><a class="page-menu-link" href="versions_2_3_5.html" data-menu-target="versions_2_3_5">2.3.5</a></li><li><a class="page-menu-link" href="versions_2_3_4.html" data-menu-target="versions_2_3_4">2.3.4</a></li><li><a class="page-menu-link" href="versions_2_3_3.html" data-menu-target="versions_2_3_3">2.3.3</a></li><li><a class="page-menu-link" href="versions_2_3_2.html" data-menu-target="versions_2_3_2">2.3.2</a></li><li><a class="page-menu-link" href="versions_2_3_1.html" data-menu-target="versions_2_3_1">2.3.1</a></li><li><a class="page-menu-link" href="versions_2_3.html" data-menu-target="versions_2_3">2.3</a><
 /li><li><a class="page-menu-link" href="versions_2_2_8.html" data-menu-target="versions_2_2_8">2.2.8</a></li><li><a class="page-menu-link" href="versions_2_2_7.html" data-menu-target="versions_2_2_7">2.2.7</a></li><li><a class="page-menu-link" href="versions_2_2_6.html" data-menu-target="versions_2_2_6">2.2.6</a></li><li><a class="page-menu-link" href="versions_2_2_5.html" data-menu-target="versions_2_2_5">2.2.5</a></li><li><a class="page-menu-link" href="versions_2_2_4.html" data-menu-target="versions_2_2_4">2.2.4</a></li><li><a class="page-menu-link" href="versions_2_2_3.html" data-menu-target="versions_2_2_3">2.2.3</a></li><li><a class="page-menu-link" href="versions_2_2_2.html" data-menu-target="versions_2_2_2">2.2.2</a></li><li><a class="page-menu-link" href="versions_2_2_1.html" data-menu-target="versions_2_2_1">2.2.1</a></li><li><a class="page-menu-link" href="versions_2_2.html" data-menu-target="versions_2_2">2.2</a></li><li><a class="page-menu-link" href="versions_2_1_5.htm
 l" data-menu-target="versions_2_1_5">2.1.5</a></li><li><a class="page-menu-link" href="versions_2_1_4.html" data-menu-target="versions_2_1_4">2.1.4</a></li><li><a class="page-menu-link" href="versions_2_1_3.html" data-menu-target="versions_2_1_3">2.1.3</a></li><li><a class="page-menu-link" href="versions_2_1_2.html" data-menu-target="versions_2_1_2">2.1.2</a></li><li><a class="page-menu-link" href="versions_2_1_1.html" data-menu-target="versions_2_1_1">2.1.1</a></li><li><a class="page-menu-link" href="versions_2_1.html" data-menu-target="versions_2_1">2.1</a></li><li><a class="page-menu-link" href="versions_2_01.html" data-menu-target="versions_2_01">2.01</a></li><li><a class="page-menu-link" href="versions_2_0.html" data-menu-target="versions_2_0">2.0</a></li><li><a class="page-menu-link" href="versions_2_0RC3.html" data-menu-target="versions_2_0RC3">2.0 RC3</a></li><li><a class="page-menu-link" href="versions_2_0RC2.html" data-menu-target="versions_2_0RC2">2.0 RC2</a></li><li><a c
 lass="page-menu-link" href="versions_2_0RC1.html" data-menu-target="versions_2_0RC1">2.0 RC1</a></li></ul></li><li><a class="page-menu-link" href="app_install.html" data-menu-target="app_install">Installing FreeMarker</a></li><li><a class="page-menu-link" href="app_legal.html" data-menu-target="app_legal">Legal</a><ul><li><a class="page-menu-link" href="app_license.html" data-menu-target="app_license">License</a></li><li><a class="page-menu-link" href="app_eccn.html" data-menu-target="app_eccn">Export Control</a></li></ul></li></ul> </div><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="xgui_declarative_details.html"><span>Previous</span></a><a class="paging-arrow next" href="app_faq.html"><span>Next</span></a></div></div></div></div>      </div>
     </div>
-<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/index.html">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><
 li><a href="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generat
 ed for: Freemarker 2.3.23</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2015-07-21T19:53:44Z" title="Tuesday, July 21, 2015 7:53:44 PM GMT">2015-07-21 19:53:44 GMT</time></span></p> <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2015
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The FreeMarker Project</a>. All rights reserved. </p>
+<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href
 ="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generated for: Fr
 eemarker 2.3.24</span><span class="last-updated"> Last generated:
+<time itemprop="dateModified" datetime="2016-03-28T15:17:13Z" title="Monday, March 28, 2016 3:17:13 PM GMT">2016-03-28 15:17:13 GMT</time></span></p> <p class="copyright">
+© <span itemprop="copyrightYear">1999</span>–2016
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>
 </html>
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/app_eccn.html
----------------------------------------------------------------------
diff --git a/docs/app_eccn.html b/docs/app_eccn.html
index 70788e3..8e8f14e 100644
--- a/docs/app_eccn.html
+++ b/docs/app_eccn.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-section">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>Export Control - FreeMarker Manual</title>
+<title>Export Control - Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
 <meta property="og:title" content="Export Control">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/app_eccn.html">
-<link rel="canoical" href="http://freemarker.org/docs/app_eccn.html">
+<link rel="canonical" href="http://freemarker.org/docs/app_eccn.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,17 +25,16 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
   <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_legal.html"><span itemprop="name">Legal</span></a></li><li class="step-3" itemprop="itemListElement" itemscope itemty
 pe="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_eccn.html"><span itemprop="name">Export Control</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
+</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">Apache FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_legal.html"><span itemprop="name">Legal</span></a></li><li class="step-3" itemprop="itemListElement" itemscope
  itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_eccn.html"><span itemprop="name">Export Control</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
-      <script>var breadcrumb = ["FreeMarker Manual","Appendixes","Legal","Export Control"];</script>
+      <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Legal","Export Control"];</script>
       <script src="toc.js"></script>
       <script src="docgen-resources/main.min.js"></script>
   </div>
@@ -46,12 +46,9 @@ ga('send', 'pageview');
         Classification Number (ECCN). Where an ECCN should be filled, the
         label &quot;not subject to EAR&quot; could be used.</p><p>FreeMarker itself doesn&#39;t add any exporting limitations.</p><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="app_license.html"><span>Previous</span></a><a class="paging-arrow next" href="gloss.html"><span>Next</span></a></div></div></div></div>      </div>
     </div>
-<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/index.html">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><
 li><a href="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generat
 ed for: Freemarker 2.3.23</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2015-07-21T19:53:44Z" title="Tuesday, July 21, 2015 7:53:44 PM GMT">2015-07-21 19:53:44 GMT</time></span></p> <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2015
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The FreeMarker Project</a>. All rights reserved. </p>
+<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href
 ="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generated for: Fr
 eemarker 2.3.24</span><span class="last-updated"> Last generated:
+<time itemprop="dateModified" datetime="2016-03-28T15:17:13Z" title="Monday, March 28, 2016 3:17:13 PM GMT">2016-03-28 15:17:13 GMT</time></span></p> <p class="copyright">
+© <span itemprop="copyrightYear">1999</span>–2016
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>
 </html>
-
-
-


[13/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/DefaultArrayAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultArrayAdapter.html b/docs/api/freemarker/template/DefaultArrayAdapter.html
index 57f9cb2..b2bccb3 100644
--- a/docs/api/freemarker/template/DefaultArrayAdapter.html
+++ b/docs/api/freemarker/template/DefaultArrayAdapter.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>DefaultArrayAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DefaultArrayAdapter (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultArrayAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="DefaultArrayAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/DefaultIteratorAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultIteratorAdapter.html b/docs/api/freemarker/template/DefaultIteratorAdapter.html
index 7283898..b2dec72 100644
--- a/docs/api/freemarker/template/DefaultIteratorAdapter.html
+++ b/docs/api/freemarker/template/DefaultIteratorAdapter.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>DefaultIteratorAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DefaultIteratorAdapter (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultIteratorAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="DefaultIteratorAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/DefaultListAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultListAdapter.html b/docs/api/freemarker/template/DefaultListAdapter.html
index 7f30e77..2d17375 100644
--- a/docs/api/freemarker/template/DefaultListAdapter.html
+++ b/docs/api/freemarker/template/DefaultListAdapter.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>DefaultListAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DefaultListAdapter (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultListAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="DefaultListAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/DefaultMapAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultMapAdapter.html b/docs/api/freemarker/template/DefaultMapAdapter.html
index e480b1b..2246057 100644
--- a/docs/api/freemarker/template/DefaultMapAdapter.html
+++ b/docs/api/freemarker/template/DefaultMapAdapter.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>DefaultMapAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DefaultMapAdapter (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultMapAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="DefaultMapAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/DefaultNonListCollectionAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultNonListCollectionAdapter.html b/docs/api/freemarker/template/DefaultNonListCollectionAdapter.html
index 720df2a..acfae2d 100644
--- a/docs/api/freemarker/template/DefaultNonListCollectionAdapter.html
+++ b/docs/api/freemarker/template/DefaultNonListCollectionAdapter.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>DefaultNonListCollectionAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DefaultNonListCollectionAdapter (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultNonListCollectionAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="DefaultNonListCollectionAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/DefaultObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultObjectWrapper.html b/docs/api/freemarker/template/DefaultObjectWrapper.html
index 85f22cf..9c174be 100644
--- a/docs/api/freemarker/template/DefaultObjectWrapper.html
+++ b/docs/api/freemarker/template/DefaultObjectWrapper.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>DefaultObjectWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DefaultObjectWrapper (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultObjectWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="DefaultObjectWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -271,7 +271,7 @@ extends <a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in f
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/DefaultObjectWrapper.html#handleUnknownType-java.lang.Object-">handleUnknownType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</code>
-<div class="block">Called for an object that aren't considered to be of a "basic" Java type, like for an application specific type,
+<div class="block">Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type,
  or for a W3C DOM node.</div>
 </td>
 </tr>
@@ -347,7 +347,8 @@ extends <a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in f
 <ul class="blockList">
 <li class="blockList">
 <h4>DefaultObjectWrapper</h4>
-<pre>public&nbsp;DefaultObjectWrapper()</pre>
+<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;DefaultObjectWrapper()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/DefaultObjectWrapperBuilder.html" title="class in freemarker.template"><code>DefaultObjectWrapperBuilder</code></a>, or in rare cases,
           <a href="../../freemarker/template/DefaultObjectWrapper.html#DefaultObjectWrapper-freemarker.template.Version-"><code>DefaultObjectWrapper(Version)</code></a> instead.</span></div>
 <div class="block">Creates a new instance with the incompatible-improvements-version specified in
@@ -371,6 +372,11 @@ extends <a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in f
               <li>2.3.22 (or higher): The default value of
                   <a href="../../freemarker/template/DefaultObjectWrapper.html#setUseAdaptersForContainers-boolean-"><code>useAdaptersForContainers</code></a> changes to
                   <code>true</code>.</li>
+              <li>2.3.24 (or higher): When wrapping an <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util"><code>Iterator</code></a>, operations on it that only check if the
+                  collection is empty without reading an element from it, such as <code>?has_content</code>,
+                  won't cause the a later iteration (or further emptiness check) to fail anymore. Earlier, in
+                  certain situations, the second operation has failed saying that the iterator "can be listed only
+                  once".  
             </ul></dd>
 <dt><span class="simpleTagLabel">Since:</span></dt>
 <dd>2.3.21</dd>
@@ -462,7 +468,7 @@ extends <a href="../../freemarker/ext/beans/BeansWrapper.html" title="class in f
 <h4>handleUnknownType</h4>
 <pre>protected&nbsp;<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a>&nbsp;handleUnknownType(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)
                                    throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
-<div class="block">Called for an object that aren't considered to be of a "basic" Java type, like for an application specific type,
+<div class="block">Called for an object that isn't considered to be of a "basic" Java type, like for an application specific type,
  or for a W3C DOM node. In its default implementation, W3C <a href="http://docs.oracle.com/javase/8/docs/api/org/w3c/dom/Node.html?is-external=true" title="class or interface in org.w3c.dom"><code>Node</code></a>-s will be wrapped as <a href="../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom"><code>NodeModel</code></a>-s
  (allows DOM tree traversal), Jython objects will be delegated to the <code>JythonWrapper</code>, others will be
  wrapped using <a href="../../freemarker/ext/beans/BeansWrapper.html#wrap-java.lang.Object-"><code>BeansWrapper.wrap(Object)</code></a>.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/DefaultObjectWrapperBuilder.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultObjectWrapperBuilder.html b/docs/api/freemarker/template/DefaultObjectWrapperBuilder.html
index 9c8c229..9135bbd 100644
--- a/docs/api/freemarker/template/DefaultObjectWrapperBuilder.html
+++ b/docs/api/freemarker/template/DefaultObjectWrapperBuilder.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>DefaultObjectWrapperBuilder (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DefaultObjectWrapperBuilder (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultObjectWrapperBuilder (FreeMarker 2.3.23 API)";
+            parent.document.title="DefaultObjectWrapperBuilder (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.html b/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.html
index 8f9c084..520b04e 100644
--- a/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.html
+++ b/docs/api/freemarker/template/DefaultObjectWrapperConfiguration.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>DefaultObjectWrapperConfiguration (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DefaultObjectWrapperConfiguration (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultObjectWrapperConfiguration (FreeMarker 2.3.23 API)";
+            parent.document.title="DefaultObjectWrapperConfiguration (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/LocalizedString.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/LocalizedString.html b/docs/api/freemarker/template/LocalizedString.html
index 742dad9..f01c7f6 100644
--- a/docs/api/freemarker/template/LocalizedString.html
+++ b/docs/api/freemarker/template/LocalizedString.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>LocalizedString (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>LocalizedString (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LocalizedString (FreeMarker 2.3.23 API)";
+            parent.document.title="LocalizedString (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -251,8 +251,12 @@ implements <a href="../../freemarker/template/TemplateScalarModel.html" title="i
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getAsString()
                    throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/template/TemplateScalarModel.html#getAsString--">TemplateScalarModel</a></code></span></div>
-<div class="block">Returns the string representation of this model. Don't return <code>null</code>, as that will cause exception.
- (In classic-compatible mode the engine will convert <code>null</code> into empty string, though.)</div>
+<div class="block">Returns the string representation of this model. Don't return <code>null</code>, as that will cause exception. (In
+ classic-compatible mode the engine will convert <code>null</code> into empty string, though.)
+ 
+ <p>
+ Objects of this type should be immutable, that is, calling <a href="../../freemarker/template/TemplateScalarModel.html#getAsString--"><code>TemplateScalarModel.getAsString()</code></a> should always return the same
+ value as for the first time.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/template/TemplateScalarModel.html#getAsString--">getAsString</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/MalformedTemplateNameException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/MalformedTemplateNameException.html b/docs/api/freemarker/template/MalformedTemplateNameException.html
index ac9454a..46153f9 100644
--- a/docs/api/freemarker/template/MalformedTemplateNameException.html
+++ b/docs/api/freemarker/template/MalformedTemplateNameException.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>MalformedTemplateNameException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>MalformedTemplateNameException (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MalformedTemplateNameException (FreeMarker 2.3.23 API)";
+            parent.document.title="MalformedTemplateNameException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/ObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/ObjectWrapper.html b/docs/api/freemarker/template/ObjectWrapper.html
index a24dfb6..1bb5539 100644
--- a/docs/api/freemarker/template/ObjectWrapper.html
+++ b/docs/api/freemarker/template/ObjectWrapper.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>ObjectWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ObjectWrapper (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ObjectWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="ObjectWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -211,7 +211,8 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <h4>BEANS_WRAPPER</h4>
-<pre>static final&nbsp;<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a> BEANS_WRAPPER</pre>
+<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>
+static final&nbsp;<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a> BEANS_WRAPPER</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/ext/beans/BeansWrapperBuilder.html#build--"><code>BeansWrapperBuilder.build()</code></a> instead; this instance isn't read-only
     and thus can't be trusted.</span></div>
 <div class="block">An <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> that exposes the object methods and JavaBeans properties as hash elements, and has
@@ -227,7 +228,8 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_WRAPPER</h4>
-<pre>static final&nbsp;<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a> DEFAULT_WRAPPER</pre>
+<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>
+static final&nbsp;<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a> DEFAULT_WRAPPER</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/DefaultObjectWrapperBuilder.html#build--"><code>DefaultObjectWrapperBuilder.build()</code></a> instead; this instance isn't read-only and thus can't
              be trusted.</span></div>
 <div class="block">The legacy default object wrapper implementation, focusing on backward compatibility and out-of-the W3C DOM
@@ -240,7 +242,8 @@ var activeTableTab = "activeTableTab";
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SIMPLE_WRAPPER</h4>
-<pre>static final&nbsp;<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a> SIMPLE_WRAPPER</pre>
+<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>
+static final&nbsp;<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a> SIMPLE_WRAPPER</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">No replacement as it was seldom if ever used by anyone; this instance isn't
     read-only and thus can't be trusted.</span></div>
 <div class="block">Object wrapper that uses <code>SimpleXXX</code> wrappers only.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html b/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html
index 4702cd2..0e7d349 100644
--- a/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html
+++ b/docs/api/freemarker/template/ObjectWrapperAndUnwrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>ObjectWrapperAndUnwrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ObjectWrapperAndUnwrapper (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ObjectWrapperAndUnwrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="ObjectWrapperAndUnwrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/ResourceBundleLocalizedString.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/ResourceBundleLocalizedString.html b/docs/api/freemarker/template/ResourceBundleLocalizedString.html
index ceed6d8..142bc59 100644
--- a/docs/api/freemarker/template/ResourceBundleLocalizedString.html
+++ b/docs/api/freemarker/template/ResourceBundleLocalizedString.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>ResourceBundleLocalizedString (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ResourceBundleLocalizedString (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ResourceBundleLocalizedString (FreeMarker 2.3.23 API)";
+            parent.document.title="ResourceBundleLocalizedString (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/SimpleCollection.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleCollection.html b/docs/api/freemarker/template/SimpleCollection.html
index 7662fcc..cc7fdba 100644
--- a/docs/api/freemarker/template/SimpleCollection.html
+++ b/docs/api/freemarker/template/SimpleCollection.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>SimpleCollection (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleCollection (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleCollection (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleCollection (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -249,7 +249,8 @@ implements <a href="../../freemarker/template/TemplateCollectionModel.html" titl
 <ul class="blockList">
 <li class="blockList">
 <h4>SimpleCollection</h4>
-<pre>public&nbsp;SimpleCollection(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a>&nbsp;iterator)</pre>
+<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;SimpleCollection(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a>&nbsp;iterator)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleCollection.html#SimpleCollection-java.util.Iterator-freemarker.template.ObjectWrapper-"><code>SimpleCollection(Iterator, ObjectWrapper)</code></a></span></div>
 </li>
 </ul>
@@ -259,7 +260,8 @@ implements <a href="../../freemarker/template/TemplateCollectionModel.html" titl
 <ul class="blockList">
 <li class="blockList">
 <h4>SimpleCollection</h4>
-<pre>public&nbsp;SimpleCollection(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&nbsp;collection)</pre>
+<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;SimpleCollection(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&nbsp;collection)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleCollection.html#SimpleCollection-java.util.Collection-freemarker.template.ObjectWrapper-"><code>SimpleCollection(Collection, ObjectWrapper)</code></a></span></div>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/SimpleDate.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleDate.html b/docs/api/freemarker/template/SimpleDate.html
index 610bf4b..f697f16 100644
--- a/docs/api/freemarker/template/SimpleDate.html
+++ b/docs/api/freemarker/template/SimpleDate.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>SimpleDate (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleDate (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleDate (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleDate (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/SimpleHash.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleHash.html b/docs/api/freemarker/template/SimpleHash.html
index a8b2e33..9f41ef6 100644
--- a/docs/api/freemarker/template/SimpleHash.html
+++ b/docs/api/freemarker/template/SimpleHash.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>SimpleHash (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleHash (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleHash (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleHash (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -350,7 +350,8 @@ implements <a href="../../freemarker/template/TemplateHashModelEx.html" title="i
 <ul class="blockList">
 <li class="blockList">
 <h4>SimpleHash</h4>
-<pre>public&nbsp;SimpleHash()</pre>
+<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;SimpleHash()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleHash.html#SimpleHash-freemarker.template.ObjectWrapper-"><code>SimpleHash(ObjectWrapper)</code></a></span></div>
 <div class="block">Constructs an empty hash that uses the default wrapper set in
  <a href="../../freemarker/template/WrappingTemplateModel.html#setDefaultObjectWrapper-freemarker.template.ObjectWrapper-"><code>WrappingTemplateModel.setDefaultObjectWrapper(ObjectWrapper)</code></a>.</div>
@@ -362,7 +363,8 @@ implements <a href="../../freemarker/template/TemplateHashModelEx.html" title="i
 <ul class="blockList">
 <li class="blockList">
 <h4>SimpleHash</h4>
-<pre>public&nbsp;SimpleHash(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;map)</pre>
+<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;SimpleHash(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&nbsp;map)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleHash.html#SimpleHash-java.util.Map-freemarker.template.ObjectWrapper-"><code>SimpleHash(Map, ObjectWrapper)</code></a></span></div>
 <div class="block">Creates a new simple hash with the copy of the underlying map and the
  default wrapper set in 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/SimpleList.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleList.html b/docs/api/freemarker/template/SimpleList.html
index 3c592fd..2e21dea 100644
--- a/docs/api/freemarker/template/SimpleList.html
+++ b/docs/api/freemarker/template/SimpleList.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>SimpleList (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleList (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleList (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleList (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -121,7 +121,8 @@
 <div class="block"><span class="deprecationComment">Use SimpleSequence instead.</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">SimpleList</span>
+<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 class <span class="typeNameLabel">SimpleList</span>
 extends <a href="../../freemarker/template/SimpleSequence.html" title="class in freemarker.template">SimpleSequence</a></pre>
 <div class="block">This is a trivial subclass that exists for backward compatibility
  with the SimpleList from FreeMarker Classic.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/SimpleNumber.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleNumber.html b/docs/api/freemarker/template/SimpleNumber.html
index 7949263..b9836a8 100644
--- a/docs/api/freemarker/template/SimpleNumber.html
+++ b/docs/api/freemarker/template/SimpleNumber.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>SimpleNumber (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleNumber (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleNumber (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleNumber (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -304,7 +304,7 @@ implements <a href="../../freemarker/template/TemplateNumberModel.html" title="i
 <h4>getAsNumber</h4>
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;getAsNumber()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/template/TemplateNumberModel.html#getAsNumber--">TemplateNumberModel</a></code></span></div>
-<div class="block">Returns the numeric value. The return value must not be null.</div>
+<div class="block">Returns the numeric value. The return value must not be <code>null</code>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/template/TemplateNumberModel.html#getAsNumber--">getAsNumber</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/SimpleObjectWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleObjectWrapper.html b/docs/api/freemarker/template/SimpleObjectWrapper.html
index 0767d09..d8bb6ce 100644
--- a/docs/api/freemarker/template/SimpleObjectWrapper.html
+++ b/docs/api/freemarker/template/SimpleObjectWrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>SimpleObjectWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleObjectWrapper (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleObjectWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleObjectWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -269,7 +269,8 @@ extends <a href="../../freemarker/template/DefaultObjectWrapper.html" title="cla
 <ul class="blockList">
 <li class="blockList">
 <h4>SimpleObjectWrapper</h4>
-<pre>public&nbsp;SimpleObjectWrapper()</pre>
+<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;SimpleObjectWrapper()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleObjectWrapper.html#SimpleObjectWrapper-freemarker.template.Version-"><code>SimpleObjectWrapper(Version)</code></a> instead.</span></div>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/SimpleScalar.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleScalar.html b/docs/api/freemarker/template/SimpleScalar.html
index 4209a41..dc47a17 100644
--- a/docs/api/freemarker/template/SimpleScalar.html
+++ b/docs/api/freemarker/template/SimpleScalar.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>SimpleScalar (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleScalar (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleScalar (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleScalar (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -255,8 +255,12 @@ implements <a href="../../freemarker/template/TemplateScalarModel.html" title="i
 <h4>getAsString</h4>
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getAsString()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/template/TemplateScalarModel.html#getAsString--">TemplateScalarModel</a></code></span></div>
-<div class="block">Returns the string representation of this model. Don't return <code>null</code>, as that will cause exception.
- (In classic-compatible mode the engine will convert <code>null</code> into empty string, though.)</div>
+<div class="block">Returns the string representation of this model. Don't return <code>null</code>, as that will cause exception. (In
+ classic-compatible mode the engine will convert <code>null</code> into empty string, though.)
+ 
+ <p>
+ Objects of this type should be immutable, that is, calling <a href="../../freemarker/template/TemplateScalarModel.html#getAsString--"><code>TemplateScalarModel.getAsString()</code></a> should always return the same
+ value as for the first time.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../freemarker/template/TemplateScalarModel.html#getAsString--">getAsString</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/SimpleSequence.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/SimpleSequence.html b/docs/api/freemarker/template/SimpleSequence.html
index 9ff3cf7..70b4669 100644
--- a/docs/api/freemarker/template/SimpleSequence.html
+++ b/docs/api/freemarker/template/SimpleSequence.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>SimpleSequence (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>SimpleSequence (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleSequence (FreeMarker 2.3.23 API)";
+            parent.document.title="SimpleSequence (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -365,7 +365,8 @@ implements <a href="../../freemarker/template/TemplateSequenceModel.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>SimpleSequence</h4>
-<pre>public&nbsp;SimpleSequence()</pre>
+<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;SimpleSequence()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleSequence.html#SimpleSequence-freemarker.template.ObjectWrapper-"><code>SimpleSequence(ObjectWrapper)</code></a> instead.</span></div>
 <div class="block">Constructs an empty simple sequence that will use the the default object 
  wrapper set in 
@@ -378,7 +379,8 @@ implements <a href="../../freemarker/template/TemplateSequenceModel.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>SimpleSequence</h4>
-<pre>public&nbsp;SimpleSequence(int&nbsp;capacity)</pre>
+<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;SimpleSequence(int&nbsp;capacity)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleSequence.html#SimpleSequence-java.util.Collection-freemarker.template.ObjectWrapper-"><code>SimpleSequence(Collection, ObjectWrapper)</code></a>.</span></div>
 <div class="block">Constructs an empty simple sequence with preallocated capacity and using
  the default object wrapper set in 
@@ -391,7 +393,8 @@ implements <a href="../../freemarker/template/TemplateSequenceModel.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>SimpleSequence</h4>
-<pre>public&nbsp;SimpleSequence(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&nbsp;collection)</pre>
+<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;SimpleSequence(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&nbsp;collection)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleSequence.html#SimpleSequence-java.util.Collection-freemarker.template.ObjectWrapper-"><code>SimpleSequence(Collection, ObjectWrapper)</code></a>.</span></div>
 <div class="block">Constructs a simple sequence that will contain the elements
  from the specified <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util"><code>Collection</code></a> and will use the the default 
@@ -505,7 +508,8 @@ implements <a href="../../freemarker/template/TemplateSequenceModel.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>add</h4>
-<pre>public&nbsp;void&nbsp;add(boolean&nbsp;b)</pre>
+<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;void&nbsp;add(boolean&nbsp;b)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/SimpleSequence.html#add-java.lang.Object-"><code>add(Object)</code></a> instead, as this bypasses the <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</span></div>
 <div class="block">Adds a boolean value to the end of this sequence. The newly added boolean will be immediately converted into
  <a href="../../freemarker/template/TemplateBooleanModel.html#TRUE"><code>TemplateBooleanModel.TRUE</code></a> or <a href="../../freemarker/template/TemplateBooleanModel.html#FALSE"><code>TemplateBooleanModel.FALSE</code></a>, without using the <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a>.</div>
@@ -521,8 +525,9 @@ implements <a href="../../freemarker/template/TemplateSequenceModel.html" title=
 <ul class="blockList">
 <li class="blockList">
 <h4>toList</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;toList()
-            throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<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;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&nbsp;toList()
+                         throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">No replacement exists; not a reliable way of getting back the original list elemnts.</span></div>
 <div class="block">Builds a deep-copy of the underlying list, unwrapping any values that were already converted to
  <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s. When called for the second time (or later), it just reuses the first result, unless the

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/Template.WrongEncodingException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/Template.WrongEncodingException.html b/docs/api/freemarker/template/Template.WrongEncodingException.html
index 71162b9..c79ada1 100644
--- a/docs/api/freemarker/template/Template.WrongEncodingException.html
+++ b/docs/api/freemarker/template/Template.WrongEncodingException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_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>Template.WrongEncodingException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Template.WrongEncodingException (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Template.WrongEncodingException (FreeMarker 2.3.23 API)";
+            parent.document.title="Template.WrongEncodingException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -190,136 +190,144 @@ extends <a href="../../freemarker/core/ParseException.html" title="class in free
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#BLANK">BLANK</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#AUTOESC">AUTOESC</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#BREAK">BREAK</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#BLANK">BLANK</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#BUILT_IN">BUILT_IN</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#BREAK">BREAK</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CALL">CALL</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#BUILT_IN">BUILT_IN</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CASE">CASE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CALL">CALL</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSE_BRACKET">CLOSE_BRACKET</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CASE">CASE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSE_PAREN">CLOSE_PAREN</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSE_BRACKET">CLOSE_BRACKET</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSE_TAG1">CLOSE_TAG1</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSE_PAREN">CLOSE_PAREN</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSE_TAG2">CLOSE_TAG2</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSE_TAG1">CLOSE_TAG1</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSING_CURLY_BRACKET">CLOSING_CURLY_BRACKET</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSE_TAG2">CLOSE_TAG2</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#COLON">COLON</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#CLOSING_CURLY_BRACKET">CLOSING_CURLY_BRACKET</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#COMMA">COMMA</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#COLON">COLON</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#COMMENT">COMMENT</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#COMMA">COMMA</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#COMPRESS">COMPRESS</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#COMMENT">COMMENT</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DECIMAL">DECIMAL</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#COMPRESS">COMPRESS</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DEFAUL">DEFAUL</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DECIMAL">DECIMAL</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DEFAULT">DEFAULT</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DEFAUL">DEFAUL</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DIRECTIVE_END">DIRECTIVE_END</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DEFAULT">DEFAULT</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DIV_EQUALS">DIV_EQUALS</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DIRECTIVE_END">DIRECTIVE_END</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DIVIDE">DIVIDE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DIV_EQUALS">DIV_EQUALS</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOLLAR_INTERPOLATION_OPENING">DOLLAR_INTERPOLATION_OPENING</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DIVIDE">DIVIDE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOT">DOT</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOLLAR_INTERPOLATION_OPENING">DOLLAR_INTERPOLATION_OPENING</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOT_DOT">DOT_DOT</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOT">DOT</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOT_DOT_ASTERISK">DOT_DOT_ASTERISK</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOT_DOT">DOT_DOT</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOT_DOT_LESS">DOT_DOT_LESS</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOT_DOT_ASTERISK">DOT_DOT_ASTERISK</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOUBLE_EQUALS">DOUBLE_EQUALS</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOT_DOT_LESS">DOT_DOT_LESS</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOUBLE_STAR">DOUBLE_STAR</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOUBLE_EQUALS">DOUBLE_EQUALS</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#ELLIPSIS">ELLIPSIS</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#DOUBLE_STAR">DOUBLE_STAR</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#ELSE">ELSE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#ELLIPSIS">ELLIPSIS</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#ELSE_IF">ELSE_IF</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#ELSE">ELSE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#EMPTY_DIRECTIVE_END">EMPTY_DIRECTIVE_END</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#ELSE_IF">ELSE_IF</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_ASSIGN">END_ASSIGN</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#EMPTY_DIRECTIVE_END">EMPTY_DIRECTIVE_END</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_ASSIGN">END_ASSIGN</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_ATTEMPT">END_ATTEMPT</a></span></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_AUTOESC">END_AUTOESC</a></span></code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_COMPRESS">END_COMPRESS</a></span></code>&nbsp;</td>
@@ -362,8 +370,16 @@ extends <a href="../../freemarker/core/ParseException.html" title="class in free
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_NOAUTOESC">END_NOAUTOESC</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_NOESCAPE">END_NOESCAPE</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_OUTPUTFORMAT">END_OUTPUTFORMAT</a></span></code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#END_RECOVER">END_RECOVER</a></span></code>&nbsp;</td>
@@ -574,48 +590,56 @@ extends <a href="../../freemarker/core/ParseException.html" title="class in free
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NODIRECTIVE">NODIRECTIVE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOAUTOESC">NOAUTOESC</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOESCAPE">NOESCAPE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NODIRECTIVE">NODIRECTIVE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NON_ESCAPED_ID_START_CHAR">NON_ESCAPED_ID_START_CHAR</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOESCAPE">NOESCAPE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOPARSE">NOPARSE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NON_ESCAPED_ID_START_CHAR">NON_ESCAPED_ID_START_CHAR</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOT_EQUALS">NOT_EQUALS</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOPARSE">NOPARSE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOTRIM">NOTRIM</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOT_EQUALS">NOT_EQUALS</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OPEN_BRACKET">OPEN_BRACKET</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#NOTRIM">NOTRIM</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OPEN_MISPLACED_INTERPOLATION">OPEN_MISPLACED_INTERPOLATION</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OPEN_BRACKET">OPEN_BRACKET</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OPEN_PAREN">OPEN_PAREN</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OPEN_MISPLACED_INTERPOLATION">OPEN_MISPLACED_INTERPOLATION</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OPENING_CURLY_BRACKET">OPENING_CURLY_BRACKET</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OPEN_PAREN">OPEN_PAREN</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OPENING_CURLY_BRACKET">OPENING_CURLY_BRACKET</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OR">OR</a></span></code>&nbsp;</td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#OUTPUTFORMAT">OUTPUTFORMAT</a></span></code>&nbsp;</td>
+</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/template/Template.WrongEncodingException.html#PERCENT">PERCENT</a></span></code>&nbsp;</td>
@@ -875,7 +899,8 @@ extends <a href="../../freemarker/core/ParseException.html" title="class in free
 <ul class="blockList">
 <li class="blockList">
 <h4>specifiedEncoding</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> specifiedEncoding</pre>
+<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;<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> specifiedEncoding</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/template/Template.WrongEncodingException.html#getTemplateSpecifiedEncoding--"><code>getTemplateSpecifiedEncoding()</code></a> instead.</span></div>
 </li>
 </ul>
@@ -1256,6 +1281,45 @@ extends <a href="../../freemarker/core/ParseException.html" title="class in free
 </dl>
 </li>
 </ul>
+<a name="OUTPUTFORMAT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>OUTPUTFORMAT</h4>
+<pre>public static final&nbsp;int OUTPUTFORMAT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.template.Template.WrongEncodingException.OUTPUTFORMAT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="AUTOESC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>AUTOESC</h4>
+<pre>public static final&nbsp;int AUTOESC</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.template.Template.WrongEncodingException.AUTOESC">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="NOAUTOESC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NOAUTOESC</h4>
+<pre>public static final&nbsp;int NOAUTOESC</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.template.Template.WrongEncodingException.NOAUTOESC">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="COMPRESS">
 <!--   -->
 </a>
@@ -1464,6 +1528,45 @@ extends <a href="../../freemarker/core/ParseException.html" title="class in free
 </dl>
 </li>
 </ul>
+<a name="END_OUTPUTFORMAT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>END_OUTPUTFORMAT</h4>
+<pre>public static final&nbsp;int END_OUTPUTFORMAT</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.template.Template.WrongEncodingException.END_OUTPUTFORMAT">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="END_AUTOESC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>END_AUTOESC</h4>
+<pre>public static final&nbsp;int END_AUTOESC</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.template.Template.WrongEncodingException.END_AUTOESC">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="END_NOAUTOESC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>END_NOAUTOESC</h4>
+<pre>public static final&nbsp;int END_NOAUTOESC</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.template.Template.WrongEncodingException.END_NOAUTOESC">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="END_COMPRESS">
 <!--   -->
 </a>
@@ -2843,7 +2946,8 @@ extends <a href="../../freemarker/core/ParseException.html" title="class in free
 <ul class="blockList">
 <li class="blockList">
 <h4>WrongEncodingException</h4>
-<pre>public&nbsp;WrongEncodingException(<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;templateSpecifiedEncoding)</pre>
+<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;WrongEncodingException(<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;templateSpecifiedEncoding)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <code>#WrongEncodingException(String, String)</code>.</span></div>
 </li>
 </ul>


[34/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/JavaScriptOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/JavaScriptOutputFormat.html b/docs/api/freemarker/core/JavaScriptOutputFormat.html
new file mode 100644
index 0000000..b7f60ff
--- /dev/null
+++ b/docs/api/freemarker/core/JavaScriptOutputFormat.html
@@ -0,0 +1,357 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JavaScriptOutputFormat (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="JavaScriptOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":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/JavaScriptOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/InvalidReferenceException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/JSONOutputFormat.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/JavaScriptOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="JavaScriptOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 JavaScriptOutputFormat" class="title">Class JavaScriptOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.JavaScriptOutputFormat</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">JavaScriptOutputFormat</span>
+extends <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></pre>
+<div class="block">Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript"). This format doesn't
+ support escaping.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/JavaScriptOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/JavaScriptOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/JavaScriptOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/JavaScriptOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></span>()</code>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a> INSTANCE</pre>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isOutputFormatMixingAllowed--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isOutputFormatMixingAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputFormatMixingAllowed()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
+ if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
+ application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
+ inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
+ inserted value is made by escaping plain text and the target format is non-escaping, in which case format
+ conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
+ will be demand for that.)
+ 
+ <p>
+ <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/JavaScriptOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/InvalidReferenceException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/JSONOutputFormat.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/JavaScriptOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="JavaScriptOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/MarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/MarkupOutputFormat.html b/docs/api/freemarker/core/MarkupOutputFormat.html
new file mode 100644
index 0000000..fec7a45
--- /dev/null
+++ b/docs/api/freemarker/core/MarkupOutputFormat.html
@@ -0,0 +1,577 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>MarkupOutputFormat (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="MarkupOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/MarkupOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonBooleanException.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/MarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="MarkupOutputFormat.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 MarkupOutputFormat" class="title">Class MarkupOutputFormat&lt;MO extends <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.MarkupOutputFormat&lt;MO&gt;</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt><span class="paramLabel">Type Parameters:</span></dt>
+<dd><code>MO</code> - The <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> class this output format can deal with.</dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">MarkupOutputFormat&lt;MO extends <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</span>
+extends <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></pre>
+<div class="block">Superclass of <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>-s that represent a "markup" format, which is any format where certain character
+ sequences have special meaning and thus may need escaping. (Escaping is important for FreeMarker, as typically it has
+ to insert non-markup text from the data-model into the output markup. See also:
+ <a href="../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a>.)
+ 
+ <p>
+ An <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> subclass always has a corresponding <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> subclass pair (like
+ <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a> has <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateHTMLOutputModel</code></a>). The <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> implements the operations
+ related to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> objects of that kind, while the <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> only
+ encapsulates the data (the actual markup or text).
+ 
+ <p>
+ To implement a custom output format, you may want to extend <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a>.</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="colFirst" scope="col">Modifier</th>
+<th class="colLast" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected </code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#MarkupOutputFormat--">MarkupOutputFormat</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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>abstract <a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#concat-MO-MO-">concat</a></span>(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo1,
+      <a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo2)</code>
+<div class="block">Returns a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> that contains the content of both <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>
+ objects concatenated.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</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;plainTextContent)</code>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>abstract <a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</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;markupText)</code>
+<div class="block">Wraps 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"><code>String</code></a> that's already markup to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> interface, to indicate its
+ format.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>abstract <a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</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;textToEsc)</code>
+<div class="block">Converts 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"><code>String</code></a> that's assumed to be plain text to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
+ special characters in the plain text.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a></span>(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">Returns the content as markup text; never <code>null</code>.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a></span>(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">If this <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created with <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>fromPlainTextByEscaping(String)</code></a>, it returns
+ the original plain text, otherwise it returns <code>null</code>.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a></span>()</code>
+<div class="block">Tells if by default auto-escaping should be on for this format.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#isEmpty-MO-">isEmpty</a></span>(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)</code>
+<div class="block">Returns if the markup is empty (0 length).</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</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;builtInName)</code>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></span>(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Prints the parameter model to the output.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a>, <a href="../../freemarker/core/OutputFormat.html#getName--">getName</a>, <a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a>, <a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="MarkupOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MarkupOutputFormat</h4>
+<pre>protected&nbsp;MarkupOutputFormat()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="fromPlainTextByEscaping-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fromPlainTextByEscaping</h4>
+<pre>public abstract&nbsp;<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;fromPlainTextByEscaping(<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;textToEsc)
+                                    throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Converts 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"><code>String</code></a> that's assumed to be plain text to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>, by escaping any
+ special characters in the plain text. This corresponds to <code>?esc</code>, or, to outputting with auto-escaping if
+ that wasn't using <a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-"><code>output(String, Writer)</code></a> as an optimization.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-"><code>escapePlainText(String)</code></a>, 
+<a href="../../freemarker/core/MarkupOutputFormat.html#getSourcePlainText-MO-"><code>getSourcePlainText(TemplateMarkupOutputModel)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="fromMarkup-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fromMarkup</h4>
+<pre>public abstract&nbsp;<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;fromMarkup(<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;markupText)
+                       throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Wraps 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"><code>String</code></a> that's already markup to <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> interface, to indicate its
+ format. This corresponds to <code>?noEsc</code>. (This methods is allowed to throw <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> if
+ the parameter markup text is malformed, but it's unlikely that an implementation chooses to parse the parameter
+ until, and if ever, that becomes necessary.)</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>getMarkupString(TemplateMarkupOutputModel)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="output-freemarker.core.TemplateMarkupOutputModel-java.io.Writer-">
+<!--   -->
+</a><a name="output-MO-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public abstract&nbsp;void&nbsp;output(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo,
+                            <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+                     throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                            <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Prints the parameter model to the output.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="output-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public abstract&nbsp;void&nbsp;output(<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;textToEsc,
+                            <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+                     throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                            <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getSourcePlainText-freemarker.core.TemplateMarkupOutputModel-">
+<!--   -->
+</a><a name="getSourcePlainText-MO-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSourcePlainText</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getSourcePlainText(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)
+                                   throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">If this <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created with <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>fromPlainTextByEscaping(String)</code></a>, it returns
+ the original plain text, otherwise it returns <code>null</code>. Useful for converting between different types
+ of markups, as if the source format can be converted to plain text without loss, then that just has to be
+ re-escaped with the target format to do the conversion.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMarkupString-freemarker.core.TemplateMarkupOutputModel-">
+<!--   -->
+</a><a name="getMarkupString-MO-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMarkupString</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMarkupString(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)
+                                throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Returns the content as markup text; never <code>null</code>. If this <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> was created
+ with <a href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-"><code>fromMarkup(String)</code></a>, it might returns the original markup text literally, but this is not required
+ as far as the returned markup means the same. If this <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> wasn't created
+ with <a href="../../freemarker/core/MarkupOutputFormat.html#fromMarkup-java.lang.String-"><code>fromMarkup(String)</code></a> and it doesn't yet have the markup, it has to generate the markup now.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="concat-freemarker.core.TemplateMarkupOutputModel-freemarker.core.TemplateMarkupOutputModel-">
+<!--   -->
+</a><a name="concat-MO-MO-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>concat</h4>
+<pre>public abstract&nbsp;<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;concat(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo1,
+                          <a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo2)
+                   throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Returns a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> that contains the content of both <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>
+ objects concatenated.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="escapePlainText-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>escapePlainText</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;escapePlainText(<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;plainTextContent)
+                                throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isEmpty-freemarker.core.TemplateMarkupOutputModel-">
+<!--   -->
+</a><a name="isEmpty-MO-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isEmpty</h4>
+<pre>public abstract&nbsp;boolean&nbsp;isEmpty(<a href="../../freemarker/core/MarkupOutputFormat.html" title="type parameter in MarkupOutputFormat">MO</a>&nbsp;mo)
+                         throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Returns if the markup is empty (0 length). This is used by at least <code>?hasContent</code>.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isLegacyBuiltInBypassed-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLegacyBuiltInBypassed</h4>
+<pre>public abstract&nbsp;boolean&nbsp;isLegacyBuiltInBypassed(<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;builtInName)
+                                         throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is. A typical such case would be when a <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateHTMLOutputModel</code></a> of "HTML" format bypasses
+ <code>?html</code>.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isAutoEscapedByDefault--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isAutoEscapedByDefault</h4>
+<pre>public abstract&nbsp;boolean&nbsp;isAutoEscapedByDefault()</pre>
+<div class="block">Tells if by default auto-escaping should be on for this format. It should be <code>true</code> if you need to escape
+ on most of the places where you insert values.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a></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/MarkupOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonBooleanException.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/MarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="MarkupOutputFormat.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonBooleanException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonBooleanException.html b/docs/api/freemarker/core/NonBooleanException.html
index 913cda6..9e73ee3 100644
--- a/docs/api/freemarker/core/NonBooleanException.html
+++ b/docs/api/freemarker/core/NonBooleanException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonBooleanException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonBooleanException (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="NonBooleanException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonBooleanException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -44,7 +44,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/InvalidReferenceException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/NonDateException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -250,7 +250,7 @@ extends <a href="../../freemarker/core/UnexpectedTypeException.html" title="clas
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/InvalidReferenceException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/NonDateException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonDateException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonDateException.html b/docs/api/freemarker/core/NonDateException.html
index 120b2e8..bd79dc3 100644
--- a/docs/api/freemarker/core/NonDateException.html
+++ b/docs/api/freemarker/core/NonDateException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonDateException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonDateException (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="NonDateException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonDateException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonExtendedHashException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonExtendedHashException.html b/docs/api/freemarker/core/NonExtendedHashException.html
index a4260b9..a60237a 100644
--- a/docs/api/freemarker/core/NonExtendedHashException.html
+++ b/docs/api/freemarker/core/NonExtendedHashException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonExtendedHashException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonExtendedHashException (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="NonExtendedHashException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonExtendedHashException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonHashException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonHashException.html b/docs/api/freemarker/core/NonHashException.html
index 89a0c85..e200592 100644
--- a/docs/api/freemarker/core/NonHashException.html
+++ b/docs/api/freemarker/core/NonHashException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonHashException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonHashException (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="NonHashException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonHashException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -45,7 +45,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/NonExtendedHashException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/NonMethodException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonMarkupOutputException.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/NonHashException.html" target="_top">Frames</a></li>
@@ -253,7 +253,7 @@ extends <a href="../../freemarker/core/UnexpectedTypeException.html" title="clas
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/NonExtendedHashException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/NonMethodException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonMarkupOutputException.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/NonHashException.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonMarkupOutputException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonMarkupOutputException.html b/docs/api/freemarker/core/NonMarkupOutputException.html
new file mode 100644
index 0000000..0a4dd0c
--- /dev/null
+++ b/docs/api/freemarker/core/NonMarkupOutputException.html
@@ -0,0 +1,297 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>NonMarkupOutputException (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="NonMarkupOutputException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/NonMarkupOutputException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/NonHashException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonMethodException.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/NonMarkupOutputException.html" target="_top">Frames</a></li>
+<li><a href="NonMarkupOutputException.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="#methods.inherited.from.class.freemarker.template.TemplateException">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>Method</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 NonMarkupOutputException" class="title">Class NonMarkupOutputException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">freemarker.template.TemplateException</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">freemarker.core.UnexpectedTypeException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.NonMarkupOutputException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">NonMarkupOutputException</span>
+extends <a href="../../freemarker/core/UnexpectedTypeException.html" title="class in freemarker.core">UnexpectedTypeException</a></pre>
+<div class="block">Indicates that a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.NonMarkupOutputException">Serialized Form</a></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/NonMarkupOutputException.html#NonMarkupOutputException-freemarker.core.Environment-">NonMarkupOutputException</a></span>(<a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/NonMarkupOutputException.html#NonMarkupOutputException-java.lang.String-freemarker.core.Environment-">NonMarkupOutputException</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;description,
+                        <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.template.TemplateException">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></h3>
+<code><a href="../../freemarker/template/TemplateException.html#getBlamedExpressionString--">getBlamedExpressionString</a>, <a href="../../freemarker/template/TemplateException.html#getCauseException--">getCauseException</a>, <a href="../../freemarker/template/TemplateException.html#getColumnNumber--">getColumnNumber</a>, <a href="../../freemarker/template/TemplateException.html#getEndColumnNumber--">getEndColumnNumber</a>, <a href="../../freemarker/template/TemplateException.html#getEndLineNumber--">getEndLineNumber</a>, <a href="../../freemarker/template/TemplateException.html#getEnvironment--">getEnvironment</a>, <a href="../../freemarker/template/TemplateException.html#getFTLInstructionStack--">getFTLInstructionStack</a>, <a href="../../freemarker/template/TemplateException.html#getLineNumber--">getLineNumber</a>, <a href="../../freemarker/template/TemplateException.html#getMessage--">getMessage</a>, <a href="../../freemarker/template/TemplateException.html#getMessageWithoutStac
 kTop--">getMessageWithoutStackTop</a>, <a href="../../freemarker/template/TemplateException.html#getTemplateName--">getTemplateName</a>, <a href="../../freemarker/template/TemplateException.html#getTemplateSourceName--">getTemplateSourceName</a>, <a href="../../freemarker/template/TemplateException.html#printStackTrace-java.io.PrintStream-">printStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStackTrace-java.io.PrintStream-boolean-boolean-boolean-">printStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStackTrace-java.io.PrintWriter-">printStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStackTrace-java.io.PrintWriter-boolean-boolean-boolean-">printStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStandardStackTrace-java.io.PrintStream-">printStandardStackTrace</a>, <a href="../../freemarker/template/TemplateException.html#printStandardStackTrace-java.io.PrintWriter
 -">printStandardStackTrace</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or interface in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or
  interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="NonMarkupOutputException-freemarker.core.Environment-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NonMarkupOutputException</h4>
+<pre>public&nbsp;NonMarkupOutputException(<a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</pre>
+</li>
+</ul>
+<a name="NonMarkupOutputException-java.lang.String-freemarker.core.Environment-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>NonMarkupOutputException</h4>
+<pre>public&nbsp;NonMarkupOutputException(<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;description,
+                                <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</pre>
+</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/NonMarkupOutputException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/NonHashException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonMethodException.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/NonMarkupOutputException.html" target="_top">Frames</a></li>
+<li><a href="NonMarkupOutputException.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="#methods.inherited.from.class.freemarker.template.TemplateException">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonMethodException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonMethodException.html b/docs/api/freemarker/core/NonMethodException.html
index f6f206d..eb91976 100644
--- a/docs/api/freemarker/core/NonMethodException.html
+++ b/docs/api/freemarker/core/NonMethodException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonMethodException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonMethodException (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="NonMethodException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonMethodException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -44,7 +44,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/NonHashException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/NonNodeException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -252,7 +252,7 @@ extends <a href="../../freemarker/core/UnexpectedTypeException.html" title="clas
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/NonHashException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/NonNodeException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonNodeException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonNodeException.html b/docs/api/freemarker/core/NonNodeException.html
index ad66995..602f012 100644
--- a/docs/api/freemarker/core/NonNodeException.html
+++ b/docs/api/freemarker/core/NonNodeException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonNodeException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonNodeException (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="NonNodeException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonNodeException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/NonNumericalException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/NonNumericalException.html b/docs/api/freemarker/core/NonNumericalException.html
index 05381c1..4f5ec7d 100644
--- a/docs/api/freemarker/core/NonNumericalException.html
+++ b/docs/api/freemarker/core/NonNumericalException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NonNumericalException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NonNumericalException (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="NonNumericalException (FreeMarker 2.3.23 API)";
+            parent.document.title="NonNumericalException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {



[35/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/FreeMarkerTree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/FreeMarkerTree.html b/docs/api/freemarker/core/FreeMarkerTree.html
index 89b6fc1..ffab735 100644
--- a/docs/api/freemarker/core/FreeMarkerTree.html
+++ b/docs/api/freemarker/core/FreeMarkerTree.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>FreeMarkerTree (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>FreeMarkerTree (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="FreeMarkerTree (FreeMarker 2.3.23 API)";
+            parent.document.title="FreeMarkerTree (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/InvalidReferenceException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/HTMLOutputFormat.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/FreeMarkerTree.html" target="_top">Frames</a></li>
@@ -137,7 +137,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Will be removed, as Swing classes aren't accessible on Google App Engine.</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">FreeMarkerTree</span>
+<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 class <span class="typeNameLabel">FreeMarkerTree</span>
 extends <a href="http://docs.oracle.com/javase/8/docs/api/javax/swing/JTree.html?is-external=true" title="class or interface in javax.swing">JTree</a></pre>
 <div class="block">Allows exposure of a FreeMarker template's AST as a Swing tree.</div>
 <dl>
@@ -396,7 +397,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/javax/swing/JTree.html
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/Environment.Namespace.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/InvalidReferenceException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/HTMLOutputFormat.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/FreeMarkerTree.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/HTMLOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/HTMLOutputFormat.html b/docs/api/freemarker/core/HTMLOutputFormat.html
new file mode 100644
index 0000000..afb4e64
--- /dev/null
+++ b/docs/api/freemarker/core/HTMLOutputFormat.html
@@ -0,0 +1,443 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HTMLOutputFormat (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="HTMLOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":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/HTMLOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/FreeMarkerTree.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/InvalidFormatParametersException.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/HTMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="HTMLOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 HTMLOutputFormat" class="title">Class HTMLOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.MarkupOutputFormat</a>&lt;MO&gt;</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.HTMLOutputFormat</li>
+</ul>
+</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">HTMLOutputFormat</span>
+extends <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</pre>
+<div class="block">Represents the HTML output format (MIME type "text/html", name "HTML"). This format escapes by default (via
+ <a href="../../freemarker/template/utility/StringUtil.html#XHTMLEnc-java.lang.String-"><code>StringUtil.XHTMLEnc(String)</code></a>). The <code>?html</code>, <code>?xhtml</code> and <code>?xml</code> built-ins silently bypass
+ template output values of the type produced by this output format (<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateHTMLOutputModel</code></a>).</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/HTMLOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/HTMLOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</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;plainTextContent)</code>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/HTMLOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/HTMLOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/HTMLOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</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;builtInName)</code>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>protected <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/HTMLOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</code>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</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/core/HTMLOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.CommonMarkupOutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></h3>
+<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isEmpty-MO-">isEmpty</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a> INSTANCE</pre>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="output-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public&nbsp;void&nbsp;output(<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;textToEsc,
+                   <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+            throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                   <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="escapePlainText-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>escapePlainText</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;escapePlainText(<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;plainTextContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="isLegacyBuiltInBypassed-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLegacyBuiltInBypassed</h4>
+<pre>public&nbsp;boolean&nbsp;isLegacyBuiltInBypassed(<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;builtInName)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is. A typical such case would be when a <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateHTMLOutputModel</code></a> of "HTML" format bypasses
+ <code>?html</code>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>newTemplateMarkupOutputModel</h4>
+<pre>protected&nbsp;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&nbsp;newTemplateMarkupOutputModel(<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;plainTextContent,
+                                                               <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;markupContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonMarkupOutputFormat</a></code></span></div>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/HTMLOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/FreeMarkerTree.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/InvalidFormatParametersException.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/HTMLOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="HTMLOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/InvalidFormatParametersException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/InvalidFormatParametersException.html b/docs/api/freemarker/core/InvalidFormatParametersException.html
new file mode 100644
index 0000000..5b41f63
--- /dev/null
+++ b/docs/api/freemarker/core/InvalidFormatParametersException.html
@@ -0,0 +1,291 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>InvalidFormatParametersException (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="InvalidFormatParametersException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/InvalidFormatParametersException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/InvalidFormatStringException.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/InvalidFormatParametersException.html" target="_top">Frames</a></li>
+<li><a href="InvalidFormatParametersException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 InvalidFormatParametersException" class="title">Class InvalidFormatParametersException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">freemarker.core.InvalidFormatStringException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.InvalidFormatParametersException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">InvalidFormatParametersException</span>
+extends <a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a></pre>
+<div class="block">Used when creating <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the parameters
+ part of the format string (like some kind of pattern) is malformed.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.InvalidFormatParametersException">Serialized Form</a></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/InvalidFormatParametersException.html#InvalidFormatParametersException-java.lang.String-">InvalidFormatParametersException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/InvalidFormatParametersException.html#InvalidFormatParametersException-java.lang.String-java.lang.Throwable-">InvalidFormatParametersException</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;message,
+                                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="InvalidFormatParametersException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>InvalidFormatParametersException</h4>
+<pre>public&nbsp;InvalidFormatParametersException(<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;message,
+                                        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="InvalidFormatParametersException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>InvalidFormatParametersException</h4>
+<pre>public&nbsp;InvalidFormatParametersException(<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;message)</pre>
+</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/InvalidFormatParametersException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/InvalidFormatStringException.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/InvalidFormatParametersException.html" target="_top">Frames</a></li>
+<li><a href="InvalidFormatParametersException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/InvalidFormatStringException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/InvalidFormatStringException.html b/docs/api/freemarker/core/InvalidFormatStringException.html
new file mode 100644
index 0000000..ac7a2b4
--- /dev/null
+++ b/docs/api/freemarker/core/InvalidFormatStringException.html
@@ -0,0 +1,290 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>InvalidFormatStringException (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="InvalidFormatStringException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/InvalidFormatStringException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/InvalidReferenceException.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/InvalidFormatStringException.html" target="_top">Frames</a></li>
+<li><a href="InvalidFormatStringException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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 InvalidFormatStringException" class="title">Class InvalidFormatStringException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">freemarker.core.TemplateValueFormatException</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.InvalidFormatStringException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a>, <a href="../../freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core">UndefinedCustomFormatException</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">InvalidFormatStringException</span>
+extends <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">Used when creating <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the format
+ string (like the value of the <code>dateFormat</code> setting) is malformed.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.core.InvalidFormatStringException">Serialized Form</a></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/InvalidFormatStringException.html#InvalidFormatStringException-java.lang.String-">InvalidFormatStringException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/InvalidFormatStringException.html#InvalidFormatStringException-java.lang.String-java.lang.Throwable-">InvalidFormatStringException</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;message,
+                            <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="InvalidFormatStringException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>InvalidFormatStringException</h4>
+<pre>public&nbsp;InvalidFormatStringException(<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;message,
+                                    <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</li>
+</ul>
+<a name="InvalidFormatStringException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>InvalidFormatStringException</h4>
+<pre>public&nbsp;InvalidFormatStringException(<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;message)</pre>
+</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/InvalidFormatStringException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/InvalidReferenceException.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/InvalidFormatStringException.html" target="_top">Frames</a></li>
+<li><a href="InvalidFormatStringException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/InvalidReferenceException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/InvalidReferenceException.html b/docs/api/freemarker/core/InvalidReferenceException.html
index a4a2489..66e8339 100644
--- a/docs/api/freemarker/core/InvalidReferenceException.html
+++ b/docs/api/freemarker/core/InvalidReferenceException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>InvalidReferenceException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>InvalidReferenceException (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="InvalidReferenceException (FreeMarker 2.3.23 API)";
+            parent.document.title="InvalidReferenceException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -44,8 +44,8 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/FreeMarkerTree.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/NonBooleanException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/JavaScriptOutputFormat.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/InvalidReferenceException.html" target="_top">Frames</a></li>
@@ -256,8 +256,8 @@ extends <a href="../../freemarker/template/TemplateException.html" title="class
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/FreeMarkerTree.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/NonBooleanException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/JavaScriptOutputFormat.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/InvalidReferenceException.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/JSONOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/JSONOutputFormat.html b/docs/api/freemarker/core/JSONOutputFormat.html
new file mode 100644
index 0000000..1baa3ef
--- /dev/null
+++ b/docs/api/freemarker/core/JSONOutputFormat.html
@@ -0,0 +1,356 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>JSONOutputFormat (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="JSONOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":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/JSONOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/MarkupOutputFormat.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/JSONOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="JSONOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 JSONOutputFormat" class="title">Class JSONOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.JSONOutputFormat</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">JSONOutputFormat</span>
+extends <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></pre>
+<div class="block">Represents the JSON output format (MIME type "application/json", name "JSON"). This format doesn't support escaping.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/JSONOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/JSONOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/JSONOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/JSONOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></span>()</code>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a> INSTANCE</pre>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isOutputFormatMixingAllowed--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isOutputFormatMixingAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputFormatMixingAllowed()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
+ if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
+ application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
+ inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
+ inserted value is made by escaping plain text and the target format is non-escaping, in which case format
+ conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
+ will be demand for that.)
+ 
+ <p>
+ <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/JSONOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/MarkupOutputFormat.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/JSONOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="JSONOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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>


[43/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/TemplateConfigurationFactoryException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateConfigurationFactoryException.html b/docs/api/freemarker/cache/TemplateConfigurationFactoryException.html
new file mode 100644
index 0000000..460afbd
--- /dev/null
+++ b/docs/api/freemarker/cache/TemplateConfigurationFactoryException.html
@@ -0,0 +1,280 @@
+<!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>TemplateConfigurationFactoryException (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="TemplateConfigurationFactoryException (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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateConfigurationFactoryException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/TemplateConfigurationFactoryException.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfigurationFactoryException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</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.cache</div>
+<h2 title="Class TemplateConfigurationFactoryException" class="title">Class TemplateConfigurationFactoryException</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="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">java.lang.Throwable</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">java.lang.Exception</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.TemplateConfigurationFactoryException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">TemplateConfigurationFactoryException</span>
+extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<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>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#freemarker.cache.TemplateConfigurationFactoryException">Serialized Form</a></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/cache/TemplateConfigurationFactoryException.html#TemplateConfigurationFactoryException-java.lang.String-">TemplateConfigurationFactoryException</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;message)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html#TemplateConfigurationFactoryException-java.lang.String-java.lang.Throwable-">TemplateConfigurationFactoryException</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;message,
+                                     <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;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">Throwable</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#addSuppressed-java.lang.Throwable-" title="class or interface in java.lang">addSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#fillInStackTrace--" title="class or interface in java.lang">fillInStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getCause--" title="class or interface in java.lang">getCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getLocalizedMessage--" title="class or interface in java.lang">getLocalizedMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getMessage--" title="class or interface in java.lang">getMessage</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getStackTrace--" title="class or inter
 face in java.lang">getStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#getSuppressed--" title="class or interface in java.lang">getSuppressed</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#initCause-java.lang.Throwable-" title="class or interface in java.lang">initCause</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace--" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintStream-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#printStackTrace-java.io.PrintWriter-" title="class or interface in java.lang">printStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lan
 g/Throwable.html?is-external=true#setStackTrace-java.lang.StackTraceElement:A-" title="class or interface in java.lang">setStackTrace</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="TemplateConfigurationFactoryException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>TemplateConfigurationFactoryException</h4>
+<pre>public&nbsp;TemplateConfigurationFactoryException(<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;message)</pre>
+</li>
+</ul>
+<a name="TemplateConfigurationFactoryException-java.lang.String-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateConfigurationFactoryException</h4>
+<pre>public&nbsp;TemplateConfigurationFactoryException(<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;message,
+                                             <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</pre>
+</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/TemplateConfigurationFactoryException.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/TemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/TemplateConfigurationFactoryException.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfigurationFactoryException.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="#methods.inherited.from.class.java.lang.Throwable">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/TemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateLoader.html b/docs/api/freemarker/cache/TemplateLoader.html
index 4705c05..6ab9bfa 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_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>TemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateLoader (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="TemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/TemplateLookupContext.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache">ClassTemplateLoader</a>, <a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a>, <a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a>, <a href="../../freemarker/cache/StringTemplateLoader.html" title="class in freemarker.cache">StringTemplateLoader</a>, <a href="../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache">URLTemplateLoader</a>, <a href="../../freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache">WebappTemplateLoader</a></dd>
+<dd><a href="../../freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache">ByteArrayTemplateLoader</a>, <a href="../../freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache">ClassTemplateLoader</a>, <a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache">FileTemplateLoader</a>, <a href="../../freemarker/cache/MultiTemplateLoader.html" title="class in freemarker.cache">MultiTemplateLoader</a>, <a href="../../freemarker/cache/StringTemplateLoader.html" title="class in freemarker.cache">StringTemplateLoader</a>, <a href="../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache">URLTemplateLoader</a>, <a href="../../freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache">WebappTemplateLoader</a></dd>
 </dl>
 <hr>
 <br>
@@ -343,7 +343,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/TemplateCache.MaybeMissingTemplate.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateConfigurationFactoryException.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/TemplateLookupContext.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/TemplateLookupContext.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateLookupContext.html b/docs/api/freemarker/cache/TemplateLookupContext.html
index 0c81bb7..e1a80ab 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_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>TemplateLookupContext (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TemplateLookupContext (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="TemplateLookupContext (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateLookupContext (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/TemplateLookupResult.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateLookupResult.html b/docs/api/freemarker/cache/TemplateLookupResult.html
index f48dd87..fd0fa74 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_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>TemplateLookupResult (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>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="TemplateLookupResult (FreeMarker 2.3.23 API)";
+            parent.document.title="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/TemplateLookupStrategy.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateLookupStrategy.html b/docs/api/freemarker/cache/TemplateLookupStrategy.html
index 4ba6c7e..47defb7 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_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>TemplateLookupStrategy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>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="TemplateLookupStrategy (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateLookupStrategy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public abstract class <span class="typeNameLabel">TemplateLookupStrategy</span>
 extends <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></pre>
-<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>). This usually means trying various
  <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>-level template names (so called source names; see also <a href="../../freemarker/template/Template.html#getSourceName--"><code>Template.getSourceName()</code></a>) that
  were deduced from the requested name. Trying a name usually means calling

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/TemplateNameFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateNameFormat.html b/docs/api/freemarker/cache/TemplateNameFormat.html
index a947939..9035db3 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_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>TemplateNameFormat (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>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="TemplateNameFormat (FreeMarker 2.3.23 API)";
+            parent.document.title="TemplateNameFormat (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -45,7 +45,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/TemplateNameFormat.html" target="_top">Frames</a></li>
@@ -275,7 +275,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/cache/TemplateLookupStrategy.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/TemplateNameFormat.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/TemplateSourceMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/TemplateSourceMatcher.html b/docs/api/freemarker/cache/TemplateSourceMatcher.html
new file mode 100644
index 0000000..8c87fd3
--- /dev/null
+++ b/docs/api/freemarker/cache/TemplateSourceMatcher.html
@@ -0,0 +1,246 @@
+<!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>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="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 class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateSourceMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/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>
+<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="#methods.inherited.from.class.java.lang.Object">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>Method</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.cache</div>
+<h2 title="Class TemplateSourceMatcher" class="title">Class TemplateSourceMatcher</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.TemplateSourceMatcher</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/cache/AndMatcher.html" title="class in freemarker.cache">AndMatcher</a>, <a href="../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a>, <a href="../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a>, <a href="../../freemarker/cache/NotMatcher.html" title="class in freemarker.cache">NotMatcher</a>, <a href="../../freemarker/cache/OrMatcher.html" title="class in freemarker.cache">OrMatcher</a>, <a href="../../freemarker/cache/PathGlobMatcher.html" title="class in freemarker.cache">PathGlobMatcher</a>, <a href="../../freemarker/cache/PathRegexMatcher.html" title="class in freemarker.cache">PathRegexMatcher</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateSourceMatcher</span>
+extends <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></pre>
+<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/cache/TemplateSourceMatcher.html#TemplateSourceMatcher--">TemplateSourceMatcher</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<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="TemplateSourceMatcher--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateSourceMatcher</h4>
+<pre>public&nbsp;TemplateSourceMatcher()</pre>
+</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/TemplateSourceMatcher.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/URLTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/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>
+<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="#methods.inherited.from.class.java.lang.Object">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>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/URLTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/URLTemplateLoader.html b/docs/api/freemarker/cache/URLTemplateLoader.html
index ce97e11..aaab77e 100644
--- a/docs/api/freemarker/cache/URLTemplateLoader.html
+++ b/docs/api/freemarker/cache/URLTemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>URLTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>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="URLTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="URLTemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -491,7 +491,7 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/cache/TemplateNameFormat.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/WebappTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/WebappTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/WebappTemplateLoader.html b/docs/api/freemarker/cache/WebappTemplateLoader.html
index c94441e..da15802 100644
--- a/docs/api/freemarker/cache/WebappTemplateLoader.html
+++ b/docs/api/freemarker/cache/WebappTemplateLoader.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>WebappTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>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="WebappTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="WebappTemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -138,7 +138,7 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 </tr>
 <tr class="altColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/cache/WebappTemplateLoader.html#WebappTemplateLoader-javax.servlet.ServletContext-">WebappTemplateLoader</a></span>(javax.servlet.ServletContext&nbsp;servletContext)</code>
-<div class="block">Creates a resource template cache that will use the specified servlet context to load the resources.</div>
+<div class="block">Creates a template loader that will use the specified servlet context to load the resources.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -249,7 +249,7 @@ implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface
 <li class="blockList">
 <h4>WebappTemplateLoader</h4>
 <pre>public&nbsp;WebappTemplateLoader(javax.servlet.ServletContext&nbsp;servletContext)</pre>
-<div class="block">Creates a resource template cache that will use the specified servlet context to load the resources. It will use
+<div class="block">Creates a template loader that will use the specified servlet context to load the resources. It will use
  the base path of <code>"/"</code> meaning templates will be resolved relative to the servlet context root
  location.</div>
 <dl>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/AndMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/AndMatcher.html b/docs/api/freemarker/cache/class-use/AndMatcher.html
new file mode 100644
index 0000000..89c1575
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/AndMatcher.html
@@ -0,0 +1,125 @@
+<!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.AndMatcher (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.AndMatcher (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/AndMatcher.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/AndMatcher.html" target="_top">Frames</a></li>
+<li><a href="AndMatcher.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.AndMatcher" class="title">Uses of Class<br>freemarker.cache.AndMatcher</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.cache.AndMatcher</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/AndMatcher.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/AndMatcher.html" target="_top">Frames</a></li>
+<li><a href="AndMatcher.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/ByteArrayTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/ByteArrayTemplateLoader.html b/docs/api/freemarker/cache/class-use/ByteArrayTemplateLoader.html
new file mode 100644
index 0000000..cc045d1
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/ByteArrayTemplateLoader.html
@@ -0,0 +1,125 @@
+<!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.ByteArrayTemplateLoader (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.ByteArrayTemplateLoader (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/ByteArrayTemplateLoader.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/ByteArrayTemplateLoader.html" target="_top">Frames</a></li>
+<li><a href="ByteArrayTemplateLoader.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.ByteArrayTemplateLoader" class="title">Uses of Class<br>freemarker.cache.ByteArrayTemplateLoader</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.cache.ByteArrayTemplateLoader</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/ByteArrayTemplateLoader.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/ByteArrayTemplateLoader.html" target="_top">Frames</a></li>
+<li><a href="ByteArrayTemplateLoader.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/CacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/CacheStorage.html b/docs/api/freemarker/cache/class-use/CacheStorage.html
index 9af4f36..63576f1 100644
--- a/docs/api/freemarker/cache/class-use/CacheStorage.html
+++ b/docs/api/freemarker/cache/class-use/CacheStorage.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 Interface freemarker.cache.CacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.cache.CacheStorage (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.cache.CacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.cache.CacheStorage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -150,10 +150,8 @@ start with <a href="../../../freemarker/template/Configuration.html" title="clas
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache">SoftCacheStorage</a></span></code>
-<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">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">
@@ -205,6 +203,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/CacheStorageWithGetSize.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/CacheStorageWithGetSize.html b/docs/api/freemarker/cache/class-use/CacheStorageWithGetSize.html
index 870909e..70728e0 100644
--- a/docs/api/freemarker/cache/class-use/CacheStorageWithGetSize.html
+++ b/docs/api/freemarker/cache/class-use/CacheStorageWithGetSize.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 Interface freemarker.cache.CacheStorageWithGetSize (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.cache.CacheStorageWithGetSize (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.cache.CacheStorageWithGetSize (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.cache.CacheStorageWithGetSize (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -120,10 +120,8 @@
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache">SoftCacheStorage</a></span></code>
-<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">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">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/ClassTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/ClassTemplateLoader.html b/docs/api/freemarker/cache/class-use/ClassTemplateLoader.html
index b263865..122f6fa 100644
--- a/docs/api/freemarker/cache/class-use/ClassTemplateLoader.html
+++ b/docs/api/freemarker/cache/class-use/ClassTemplateLoader.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.ClassTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.ClassTemplateLoader (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.ClassTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.ClassTemplateLoader (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/ConcurrentCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/ConcurrentCacheStorage.html b/docs/api/freemarker/cache/class-use/ConcurrentCacheStorage.html
index 3265832..6b68d0b 100644
--- a/docs/api/freemarker/cache/class-use/ConcurrentCacheStorage.html
+++ b/docs/api/freemarker/cache/class-use/ConcurrentCacheStorage.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 Interface freemarker.cache.ConcurrentCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.cache.ConcurrentCacheStorage (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.cache.ConcurrentCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.cache.ConcurrentCacheStorage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -114,10 +114,8 @@
 <tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/cache/SoftCacheStorage.html" title="class in freemarker.cache">SoftCacheStorage</a></span></code>
-<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">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="altColor">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/class-use/ConditionalTemplateConfigurationFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/ConditionalTemplateConfigurationFactory.html b/docs/api/freemarker/cache/class-use/ConditionalTemplateConfigurationFactory.html
new file mode 100644
index 0000000..f50e6cc
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/ConditionalTemplateConfigurationFactory.html
@@ -0,0 +1,125 @@
+<!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.ConditionalTemplateConfigurationFactory (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.ConditionalTemplateConfigurationFactory (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/ConditionalTemplateConfigurationFactory.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/ConditionalTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="ConditionalTemplateConfigurationFactory.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.ConditionalTemplateConfigurationFactory" class="title">Uses of Class<br>freemarker.cache.ConditionalTemplateConfigurationFactory</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.cache.ConditionalTemplateConfigurationFactory</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/ConditionalTemplateConfigurationFactory.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/ConditionalTemplateConfigurationFactory.html" target="_top">Frames</a></li>
+<li><a href="ConditionalTemplateConfigurationFactory.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/FileExtensionMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/FileExtensionMatcher.html b/docs/api/freemarker/cache/class-use/FileExtensionMatcher.html
new file mode 100644
index 0000000..7c5ef36
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/FileExtensionMatcher.html
@@ -0,0 +1,169 @@
+<!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.FileExtensionMatcher (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.FileExtensionMatcher (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/FileExtensionMatcher.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/FileExtensionMatcher.html" target="_top">Frames</a></li>
+<li><a href="FileExtensionMatcher.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.FileExtensionMatcher" class="title">Uses of Class<br>freemarker.cache.FileExtensionMatcher</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/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</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/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> that return <a href="../../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/cache/FileExtensionMatcher.html" title="class in freemarker.cache">FileExtensionMatcher</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FileExtensionMatcher.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/FileExtensionMatcher.html#caseInsensitive-boolean-">caseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Fluid API variation of <a href="../../../freemarker/cache/FileExtensionMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</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/FileExtensionMatcher.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/FileExtensionMatcher.html" target="_top">Frames</a></li>
+<li><a href="FileExtensionMatcher.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/FileNameGlobMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/FileNameGlobMatcher.html b/docs/api/freemarker/cache/class-use/FileNameGlobMatcher.html
new file mode 100644
index 0000000..d22e7b9
--- /dev/null
+++ b/docs/api/freemarker/cache/class-use/FileNameGlobMatcher.html
@@ -0,0 +1,169 @@
+<!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.FileNameGlobMatcher (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.FileNameGlobMatcher (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/FileNameGlobMatcher.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/FileNameGlobMatcher.html" target="_top">Frames</a></li>
+<li><a href="FileNameGlobMatcher.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.FileNameGlobMatcher" class="title">Uses of Class<br>freemarker.cache.FileNameGlobMatcher</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/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</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/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> that return <a href="../../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/cache/FileNameGlobMatcher.html" title="class in freemarker.cache">FileNameGlobMatcher</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FileNameGlobMatcher.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/FileNameGlobMatcher.html#caseInsensitive-boolean-">caseInsensitive</a></span>(boolean&nbsp;caseInsensitive)</code>
+<div class="block">Fluid API variation of <a href="../../../freemarker/cache/FileNameGlobMatcher.html#setCaseInsensitive-boolean-"><code>setCaseInsensitive(boolean)</code></a></div>
+</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/FileNameGlobMatcher.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/FileNameGlobMatcher.html" target="_top">Frames</a></li>
+<li><a href="FileNameGlobMatcher.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/FileTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/class-use/FileTemplateLoader.html b/docs/api/freemarker/cache/class-use/FileTemplateLoader.html
index 04d9270..7f7f791 100644
--- a/docs/api/freemarker/cache/class-use/FileTemplateLoader.html
+++ b/docs/api/freemarker/cache/class-use/FileTemplateLoader.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.FileTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.cache.FileTemplateLoader (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.FileTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.cache.FileTemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {



[21/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/TemplateValueFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateValueFormat.html b/docs/api/freemarker/core/class-use/TemplateValueFormat.html
new file mode 100644
index 0000000..23f4b8f
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateValueFormat.html
@@ -0,0 +1,175 @@
+<!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.core.TemplateValueFormat (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.core.TemplateValueFormat (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/core/TemplateValueFormat.html" title="class in freemarker.core">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/core/class-use/TemplateValueFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormat.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.core.TemplateValueFormat" class="title">Uses of Class<br>freemarker.core.TemplateValueFormat</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/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></span></code>
+<div class="block">Represents a date/time/dateTime format; used in templates for formatting and parsing with that format.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></span></code>
+<div class="block">Represents a number format; used in templates for formatting and parsing with that format.</div>
+</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/core/TemplateValueFormat.html" title="class in freemarker.core">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/core/class-use/TemplateValueFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormat.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/core/class-use/TemplateValueFormatException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateValueFormatException.html b/docs/api/freemarker/core/class-use/TemplateValueFormatException.html
new file mode 100644
index 0000000..cec2745
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateValueFormatException.html
@@ -0,0 +1,359 @@
+<!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.core.TemplateValueFormatException (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.core.TemplateValueFormatException (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/core/TemplateValueFormatException.html" title="class in freemarker.core">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/core/class-use/TemplateValueFormatException.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormatException.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.core.TemplateValueFormatException" class="title">Uses of Class<br>freemarker.core.TemplateValueFormatException</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/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></span></code>
+<div class="block">Used when creating <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the parameters
+ part of the format string (like some kind of pattern) is malformed.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core">InvalidFormatStringException</a></span></code>
+<div class="block">Used when creating <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the format
+ string (like the value of the <code>dateFormat</code> setting) is malformed.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core">ParsingNotSupportedException</a></span></code>
+<div class="block">Thrown when the <a href="../../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> doesn't support parsing, and parsing was invoked.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core">UndefinedCustomFormatException</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a></span></code>
+<div class="block">Thrown when a <a href="../../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> can't be formatted because of the value/properties of it are outside of that the
+ <a href="../../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> supports.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeFormattingUnsupportedException</a></span></code>
+<div class="block">Thrown when a <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> can't be formatted because its type is <a href="../../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core">UnknownDateTypeParsingUnsupportedException</a></span></code>
+<div class="block">Thrown when a string can't be parsed to <a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, because the provided target type is
+ <a href="../../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UnparsableValueException.html" title="class in freemarker.core">UnparsableValueException</a></span></code>
+<div class="block">Thrown when the content of the string that should be parsed by the <a href="../../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> doesn't match what the
+ format expects.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that throw <a href="../../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#format-freemarker.template.TemplateDateModel-">format</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#format-freemarker.template.TemplateNumberModel-">format</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#formatToPlainText-freemarker.template.TemplateNumberModel-">formatToPlainText</a></span>(<a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormatFactory.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>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AliasTemplateDateFormatFactory.</span><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>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-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,
+   <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="../../../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>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AliasTemplateNumberFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/AliasTemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-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,
+   <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="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-int-java.lang.Class-">getTemplateDateFormat</a></span>(int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass)</code>
+<div class="block">Gets a <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> using the date/time/datetime format settings and the current locale and time
+ zone.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass)</code>
+<div class="block">Gets a <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> for the specified format string and the current locale and time zone.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-java.util.Locale-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass,
+                     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
+<div class="block">Like <a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-"><code>Environment.getTemplateDateFormat(String, int, Class)</code></a>, but allows you to use a different locale than the
+ current one.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-java.util.Locale-java.util.TimeZone-java.util.TimeZone-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass,
+                     <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,
+                     <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;sqlDateAndTimeTimeZone)</code>
+<div class="block">Like <a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-"><code>Environment.getTemplateDateFormat(String, int, Class)</code></a>, but allows you to use a different locale and time zone
+ than the current one.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.util.Locale-java.util.TimeZone-boolean-">getTemplateDateFormat</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;formatString,
+                     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)</code>
+<div class="block">Gets a <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> for the specified parameters.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateNumberFormat--">getTemplateNumberFormat</a></span>()</code>
+<div class="block">Returns the current number format (<a href="../../../freemarker/core/Configurable.html#getNumberFormat--"><code>Configurable.getNumberFormat()</code></a>) as <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateNumberFormat-java.lang.String-">getTemplateNumberFormat</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;formatString)</code>
+<div class="block">Returns the number format as <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a> for the given format string and the current locale.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateNumberFormat-java.lang.String-java.util.Locale-">getTemplateNumberFormat</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;formatString,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
+<div class="block">Returns the number format as <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>, for the given format string and locale.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormat.html#parse-java.lang.String-">parse</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;s)</code>
+<div class="block">This method is reserved for future purposes; currently it always throws <a href="../../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core"><code>ParsingNotSupportedException</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormat.html#parse-java.lang.String-int-">parse</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;s,
+     int&nbsp;dateType)</code>
+<div class="block">Parsers a string to date/time/datetime, according to this format.</div>
+</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/core/TemplateValueFormatException.html" title="class in freemarker.core">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/core/class-use/TemplateValueFormatException.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormatException.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/core/class-use/TemplateValueFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateValueFormatFactory.html b/docs/api/freemarker/core/class-use/TemplateValueFormatFactory.html
new file mode 100644
index 0000000..4358d86
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateValueFormatFactory.html
@@ -0,0 +1,189 @@
+<!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.core.TemplateValueFormatFactory (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.core.TemplateValueFormatFactory (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/core/TemplateValueFormatFactory.html" title="class in freemarker.core">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/core/class-use/TemplateValueFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormatFactory.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.core.TemplateValueFormatFactory" class="title">Uses of Class<br>freemarker.core.TemplateValueFormatFactory</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/core/TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">AliasTemplateDateFormatFactory</a></span></code>
+<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>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">AliasTemplateNumberFormatFactory</a></span></code>
+<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>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></span></code>
+<div class="block">Factory for a certain kind of date/time/dateTime formatting (<a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>).</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></span></code>
+<div class="block">Factory for a certain kind of number formatting (<a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>).</div>
+</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/core/TemplateValueFormatFactory.html" title="class in freemarker.core">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/core/class-use/TemplateValueFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateValueFormatFactory.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/core/class-use/TemplateXHTMLOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateXHTMLOutputModel.html b/docs/api/freemarker/core/class-use/TemplateXHTMLOutputModel.html
new file mode 100644
index 0000000..40b74b9
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateXHTMLOutputModel.html
@@ -0,0 +1,168 @@
+<!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.core.TemplateXHTMLOutputModel (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.core.TemplateXHTMLOutputModel (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/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateXHTMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateXHTMLOutputModel.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.core.TemplateXHTMLOutputModel" class="title">Uses of Class<br>freemarker.core.TemplateXHTMLOutputModel</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/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a href="../../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">XHTMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/XHTMLOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</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/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateXHTMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateXHTMLOutputModel.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/core/class-use/TemplateXMLOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateXMLOutputModel.html b/docs/api/freemarker/core/class-use/TemplateXMLOutputModel.html
new file mode 100644
index 0000000..e4efa68
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateXMLOutputModel.html
@@ -0,0 +1,168 @@
+<!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.core.TemplateXMLOutputModel (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.core.TemplateXMLOutputModel (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/core/TemplateXMLOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateXMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateXMLOutputModel.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.core.TemplateXMLOutputModel" class="title">Uses of Class<br>freemarker.core.TemplateXMLOutputModel</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/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a href="../../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">XMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/XMLOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</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/core/TemplateXMLOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateXMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateXMLOutputModel.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/core/class-use/UndefinedCustomFormatException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/UndefinedCustomFormatException.html b/docs/api/freemarker/core/class-use/UndefinedCustomFormatException.html
new file mode 100644
index 0000000..32033f6
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/UndefinedCustomFormatException.html
@@ -0,0 +1,125 @@
+<!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.core.UndefinedCustomFormatException (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.core.UndefinedCustomFormatException (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/core/UndefinedCustomFormatException.html" title="class in freemarker.core">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/core/class-use/UndefinedCustomFormatException.html" target="_top">Frames</a></li>
+<li><a href="UndefinedCustomFormatException.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.core.UndefinedCustomFormatException" class="title">Uses of Class<br>freemarker.core.UndefinedCustomFormatException</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.UndefinedCustomFormatException</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/core/UndefinedCustomFormatException.html" title="class in freemarker.core">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/core/class-use/UndefinedCustomFormatException.html" target="_top">Frames</a></li>
+<li><a href="UndefinedCustomFormatException.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/core/class-use/UndefinedOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/UndefinedOutputFormat.html b/docs/api/freemarker/core/class-use/UndefinedOutputFormat.html
new file mode 100644
index 0000000..f62a9a1
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/UndefinedOutputFormat.html
@@ -0,0 +1,167 @@
+<!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.core.UndefinedOutputFormat (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.core.UndefinedOutputFormat (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/core/UndefinedOutputFormat.html" title="class in freemarker.core">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/core/class-use/UndefinedOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="UndefinedOutputFormat.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.core.UndefinedOutputFormat" class="title">Uses of Class<br>freemarker.core.UndefinedOutputFormat</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/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">UndefinedOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/UndefinedOutputFormat.html#INSTANCE">INSTANCE</a></span></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/core/UndefinedOutputFormat.html" title="class in freemarker.core">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/core/class-use/UndefinedOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="UndefinedOutputFormat.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/core/class-use/UnexpectedTypeException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/UnexpectedTypeException.html b/docs/api/freemarker/core/class-use/UnexpectedTypeException.html
index c900ed0..e9e34f4 100644
--- a/docs/api/freemarker/core/class-use/UnexpectedTypeException.html
+++ b/docs/api/freemarker/core/class-use/UnexpectedTypeException.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.core.UnexpectedTypeException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.UnexpectedTypeException (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.core.UnexpectedTypeException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.UnexpectedTypeException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -131,42 +131,55 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core">NonMarkupOutputException</a></span></code>
+<div class="block">Indicates that a <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonMethodException.html" title="class in freemarker.core">NonMethodException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template"><code>TemplateMethodModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonNodeException.html" title="class in freemarker.core">NonNodeException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template"><code>TemplateNodeModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonNumericalException.html" title="class in freemarker.core">NonNumericalException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonSequenceException.html" title="class in freemarker.core">NonSequenceException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> value was expected, but the value had a different type.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core">NonSequenceOrCollectionException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template"><code>TemplateSequenceModel</code></a> or <a href="../../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template"><code>TemplateCollectionModel</code></a> value was expected, but the value
  had a different type.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonStringException.html" title="class in freemarker.core">NonStringException</a></span></code>
 <div class="block">Indicates that a <a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> value was expected (or maybe something that can be automatically coerced
  to that), but the value had a different type.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core">NonStringOrTemplateOutputException</a></span></code>
+<div class="block">Indicates that a <a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template"><code>TemplateScalarModel</code></a> (or maybe something that can be automatically coerced
+ to that) or <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> value was expected, but the value had a different type.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>


[51/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
Updated site for 2.3.24.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/6c6020ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/6c6020ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/6c6020ec

Branch: refs/heads/asf-site
Commit: 6c6020ec31a425e7229756a0b0b50003d0e9fa97
Parents: 872b158
Author: ddekany <dd...@apache.org>
Authored: Mon Mar 28 17:26:19 2016 +0200
Committer: ddekany <dd...@apache.org>
Committed: Mon Mar 28 17:26:19 2016 +0200

----------------------------------------------------------------------
 contribute.html                                 |    4 +-
 docs/alphaidx.html                              |  189 ++-
 docs/api/allclasses-frame.html                  |   63 +-
 docs/api/allclasses-noframe.html                |   63 +-
 docs/api/constant-values.html                   |  996 ++++++++----
 docs/api/deprecated-list.html                   |   45 +-
 docs/api/freemarker/cache/AndMatcher.html       |  289 ++++
 .../cache/ByteArrayTemplateLoader.html          |  505 ++++++
 docs/api/freemarker/cache/CacheStorage.html     |   12 +-
 .../cache/CacheStorageWithGetSize.html          |    8 +-
 .../freemarker/cache/ClassTemplateLoader.html   |   14 +-
 .../cache/ConcurrentCacheStorage.html           |   12 +-
 ...ConditionalTemplateConfigurationFactory.html |  355 ++++
 .../freemarker/cache/FileExtensionMatcher.html  |  340 ++++
 .../freemarker/cache/FileNameGlobMatcher.html   |  342 ++++
 .../freemarker/cache/FileTemplateLoader.html    |   21 +-
 .../FirstMatchTemplateConfigurationFactory.html |  438 +++++
 .../MergingTemplateConfigurationFactory.html    |  340 ++++
 docs/api/freemarker/cache/MruCacheStorage.html  |   12 +-
 .../freemarker/cache/MultiTemplateLoader.html   |   71 +-
 docs/api/freemarker/cache/NotMatcher.html       |  289 ++++
 docs/api/freemarker/cache/NullCacheStorage.html |   16 +-
 docs/api/freemarker/cache/OrMatcher.html        |  289 ++++
 docs/api/freemarker/cache/PathGlobMatcher.html  |  356 +++++
 docs/api/freemarker/cache/PathRegexMatcher.html |  296 ++++
 docs/api/freemarker/cache/SoftCacheStorage.html |   35 +-
 .../cache/StatefulTemplateLoader.html           |   10 +-
 .../freemarker/cache/StringTemplateLoader.html  |   36 +-
 .../freemarker/cache/StrongCacheStorage.html    |   21 +-
 .../TemplateCache.MaybeMissingTemplate.html     |   12 +-
 docs/api/freemarker/cache/TemplateCache.html    |  125 +-
 .../cache/TemplateConfigurationFactory.html     |  358 +++++
 .../TemplateConfigurationFactoryException.html  |  280 ++++
 docs/api/freemarker/cache/TemplateLoader.html   |   14 +-
 .../freemarker/cache/TemplateLookupContext.html |    8 +-
 .../freemarker/cache/TemplateLookupResult.html  |    8 +-
 .../cache/TemplateLookupStrategy.html           |   10 +-
 .../freemarker/cache/TemplateNameFormat.html    |   12 +-
 .../freemarker/cache/TemplateSourceMatcher.html |  246 +++
 .../api/freemarker/cache/URLTemplateLoader.html |   12 +-
 .../freemarker/cache/WebappTemplateLoader.html  |   12 +-
 .../freemarker/cache/class-use/AndMatcher.html  |  125 ++
 .../class-use/ByteArrayTemplateLoader.html      |  125 ++
 .../cache/class-use/CacheStorage.html           |   26 +-
 .../class-use/CacheStorageWithGetSize.html      |   14 +-
 .../cache/class-use/ClassTemplateLoader.html    |    8 +-
 .../cache/class-use/ConcurrentCacheStorage.html |   14 +-
 ...ConditionalTemplateConfigurationFactory.html |  125 ++
 .../cache/class-use/FileExtensionMatcher.html   |  169 ++
 .../cache/class-use/FileNameGlobMatcher.html    |  169 ++
 .../cache/class-use/FileTemplateLoader.html     |    8 +-
 .../FirstMatchTemplateConfigurationFactory.html |  175 ++
 .../MergingTemplateConfigurationFactory.html    |  125 ++
 .../cache/class-use/MruCacheStorage.html        |    8 +-
 .../cache/class-use/MultiTemplateLoader.html    |    8 +-
 .../freemarker/cache/class-use/NotMatcher.html  |  125 ++
 .../cache/class-use/NullCacheStorage.html       |    8 +-
 .../freemarker/cache/class-use/OrMatcher.html   |  125 ++
 .../cache/class-use/PathGlobMatcher.html        |  169 ++
 .../cache/class-use/PathRegexMatcher.html       |  125 ++
 .../cache/class-use/SoftCacheStorage.html       |    8 +-
 .../cache/class-use/StatefulTemplateLoader.html |    8 +-
 .../cache/class-use/StringTemplateLoader.html   |    8 +-
 .../cache/class-use/StrongCacheStorage.html     |    8 +-
 .../TemplateCache.MaybeMissingTemplate.html     |    8 +-
 .../cache/class-use/TemplateCache.html          |    8 +-
 .../class-use/TemplateConfigurationFactory.html |  265 +++
 .../TemplateConfigurationFactoryException.html  |  185 +++
 .../cache/class-use/TemplateLoader.html         |   42 +-
 .../cache/class-use/TemplateLookupContext.html  |    8 +-
 .../cache/class-use/TemplateLookupResult.html   |    8 +-
 .../cache/class-use/TemplateLookupStrategy.html |   20 +-
 .../cache/class-use/TemplateNameFormat.html     |   20 +-
 .../cache/class-use/TemplateSourceMatcher.html  |  231 +++
 .../cache/class-use/URLTemplateLoader.html      |    8 +-
 .../cache/class-use/WebappTemplateLoader.html   |    8 +-
 docs/api/freemarker/cache/package-frame.html    |   23 +-
 docs/api/freemarker/cache/package-summary.html  |  127 +-
 docs/api/freemarker/cache/package-tree.html     |   36 +-
 docs/api/freemarker/cache/package-use.html      |   57 +-
 .../core/AliasTemplateDateFormatFactory.html    |  373 +++++
 .../core/AliasTemplateNumberFormatFactory.html  |  349 ++++
 .../core/ArithmeticEngine.BigDecimalEngine.html |    8 +-
 .../ArithmeticEngine.ConservativeEngine.html    |    8 +-
 docs/api/freemarker/core/ArithmeticEngine.html  |   12 +-
 docs/api/freemarker/core/BugException.html      |    8 +-
 docs/api/freemarker/core/CSSOutputFormat.html   |  356 +++++
 ...lPlaceCustomDataInitializationException.html |   12 +-
 .../core/CombinedMarkupOutputFormat.html        |  552 +++++++
 docs/api/freemarker/core/CommandLine.html       |   19 +-
 .../core/CommonMarkupOutputFormat.html          |  609 +++++++
 .../core/CommonTemplateMarkupOutputModel.html   |  322 ++++
 ...gurable.SettingValueAssignmentException.html |    8 +-
 .../Configurable.UnknownSettingException.html   |   12 +-
 docs/api/freemarker/core/Configurable.html      |  989 +++++++++++-
 docs/api/freemarker/core/CustomAttribute.html   |   62 +-
 .../api/freemarker/core/DirectiveCallPlace.html |   13 +-
 .../freemarker/core/Environment.Namespace.html  |    8 +-
 docs/api/freemarker/core/Environment.html       |  737 ++++++---
 docs/api/freemarker/core/FreeMarkerTree.html    |   15 +-
 docs/api/freemarker/core/HTMLOutputFormat.html  |  443 +++++
 .../core/InvalidFormatParametersException.html  |  291 ++++
 .../core/InvalidFormatStringException.html      |  290 ++++
 .../core/InvalidReferenceException.html         |   16 +-
 docs/api/freemarker/core/JSONOutputFormat.html  |  356 +++++
 .../freemarker/core/JavaScriptOutputFormat.html |  357 +++++
 .../api/freemarker/core/MarkupOutputFormat.html |  577 +++++++
 .../freemarker/core/NonBooleanException.html    |   12 +-
 docs/api/freemarker/core/NonDateException.html  |    8 +-
 .../core/NonExtendedHashException.html          |    8 +-
 docs/api/freemarker/core/NonHashException.html  |   12 +-
 .../core/NonMarkupOutputException.html          |  297 ++++
 .../api/freemarker/core/NonMethodException.html |   12 +-
 docs/api/freemarker/core/NonNodeException.html  |    8 +-
 .../freemarker/core/NonNumericalException.html  |    8 +-
 .../freemarker/core/NonSequenceException.html   |    8 +-
 .../core/NonSequenceOrCollectionException.html  |    8 +-
 .../api/freemarker/core/NonStringException.html |   12 +-
 .../NonStringOrTemplateOutputException.html     |  296 ++++
 .../core/OptInTemplateClassResolver.html        |   16 +-
 docs/api/freemarker/core/OutputFormat.html      |  371 +++++
 docs/api/freemarker/core/ParseException.html    |  239 ++-
 .../freemarker/core/ParserConfiguration.html    |  364 +++++
 .../core/ParsingNotSupportedException.html      |  285 ++++
 .../freemarker/core/PlainTextOutputFormat.html  |  360 +++++
 docs/api/freemarker/core/RTFOutputFormat.html   |  443 +++++
 docs/api/freemarker/core/StopException.html     |   12 +-
 .../freemarker/core/TemplateClassResolver.html  |   12 +-
 .../core/TemplateCombinedMarkupOutputModel.html |  277 ++++
 .../freemarker/core/TemplateConfiguration.html  |  907 +++++++++++
 .../api/freemarker/core/TemplateDateFormat.html |  414 +++++
 .../core/TemplateDateFormatFactory.html         |  342 ++++
 .../api/freemarker/core/TemplateFormatUtil.html |  300 ++++
 .../core/TemplateHTMLOutputModel.html           |  277 ++++
 .../core/TemplateMarkupOutputModel.html         |  271 ++++
 .../freemarker/core/TemplateNumberFormat.html   |  382 +++++
 .../core/TemplateNumberFormatFactory.html       |  318 ++++
 .../freemarker/core/TemplateRTFOutputModel.html |  277 ++++
 .../freemarker/core/TemplateValueFormat.html    |  284 ++++
 .../core/TemplateValueFormatException.html      |  285 ++++
 .../core/TemplateValueFormatFactory.html        |  247 +++
 .../core/TemplateXHTMLOutputModel.html          |  277 ++++
 .../freemarker/core/TemplateXMLOutputModel.html |  277 ++++
 .../core/UndefinedCustomFormatException.html    |  289 ++++
 .../freemarker/core/UndefinedOutputFormat.html  |  359 +++++
 .../core/UnexpectedTypeException.html           |   18 +-
 .../core/UnformattableValueException.html       |  291 ++++
 ...nDateTypeFormattingUnsupportedException.html |  276 ++++
 ...nownDateTypeParsingUnsupportedException.html |  277 ++++
 .../core/UnparsableValueException.html          |  286 ++++
 .../core/UnregisteredOutputFormatException.html |  279 ++++
 docs/api/freemarker/core/XHTMLOutputFormat.html |  443 +++++
 docs/api/freemarker/core/XMLOutputFormat.html   |  443 +++++
 .../AliasTemplateDateFormatFactory.html         |  125 ++
 .../AliasTemplateNumberFormatFactory.html       |  125 ++
 .../ArithmeticEngine.BigDecimalEngine.html      |    8 +-
 .../ArithmeticEngine.ConservativeEngine.html    |    8 +-
 .../core/class-use/ArithmeticEngine.html        |   14 +-
 .../freemarker/core/class-use/BugException.html |    8 +-
 .../core/class-use/CSSOutputFormat.html         |  169 ++
 ...lPlaceCustomDataInitializationException.html |    8 +-
 .../class-use/CombinedMarkupOutputFormat.html   |  167 ++
 .../freemarker/core/class-use/CommandLine.html  |    8 +-
 .../class-use/CommonMarkupOutputFormat.html     |  206 +++
 .../CommonTemplateMarkupOutputModel.html        |  216 +++
 ...gurable.SettingValueAssignmentException.html |    8 +-
 .../Configurable.UnknownSettingException.html   |    8 +-
 .../freemarker/core/class-use/Configurable.html |   20 +-
 .../core/class-use/CustomAttribute.html         |    8 +-
 .../core/class-use/DirectiveCallPlace.html      |    8 +-
 .../core/class-use/Environment.Namespace.html   |   15 +-
 .../freemarker/core/class-use/Environment.html  |   64 +-
 .../core/class-use/FreeMarkerTree.html          |    8 +-
 .../core/class-use/HTMLOutputFormat.html        |  182 +++
 .../InvalidFormatParametersException.html       |  167 ++
 .../class-use/InvalidFormatStringException.html |  174 ++
 .../class-use/InvalidReferenceException.html    |    8 +-
 .../core/class-use/JSONOutputFormat.html        |  169 ++
 .../core/class-use/JavaScriptOutputFormat.html  |  169 ++
 .../core/class-use/MarkupOutputFormat.html      |  255 +++
 .../core/class-use/NonBooleanException.html     |    8 +-
 .../core/class-use/NonDateException.html        |    8 +-
 .../class-use/NonExtendedHashException.html     |    8 +-
 .../core/class-use/NonHashException.html        |    8 +-
 .../class-use/NonMarkupOutputException.html     |  125 ++
 .../core/class-use/NonMethodException.html      |    8 +-
 .../core/class-use/NonNodeException.html        |    8 +-
 .../core/class-use/NonNumericalException.html   |    8 +-
 .../core/class-use/NonSequenceException.html    |    8 +-
 .../NonSequenceOrCollectionException.html       |    8 +-
 .../core/class-use/NonStringException.html      |    8 +-
 .../NonStringOrTemplateOutputException.html     |  125 ++
 .../class-use/OptInTemplateClassResolver.html   |    8 +-
 .../freemarker/core/class-use/OutputFormat.html |  359 +++++
 .../core/class-use/ParseException.html          |    8 +-
 .../core/class-use/ParserConfiguration.html     |  233 +++
 .../class-use/ParsingNotSupportedException.html |  125 ++
 .../core/class-use/PlainTextOutputFormat.html   |  167 ++
 .../core/class-use/RTFOutputFormat.html         |  182 +++
 .../core/class-use/StopException.html           |    8 +-
 .../core/class-use/TemplateClassResolver.html   |    8 +-
 .../TemplateCombinedMarkupOutputModel.html      |  168 ++
 .../core/class-use/TemplateConfiguration.html   |  237 +++
 .../core/class-use/TemplateDateFormat.html      |  231 +++
 .../class-use/TemplateDateFormatFactory.html    |  215 +++
 .../core/class-use/TemplateFormatUtil.html      |  125 ++
 .../core/class-use/TemplateHTMLOutputModel.html |  168 ++
 .../class-use/TemplateMarkupOutputModel.html    |  223 +++
 .../core/class-use/TemplateNumberFormat.html    |  196 +++
 .../class-use/TemplateNumberFormatFactory.html  |  215 +++
 .../core/class-use/TemplateRTFOutputModel.html  |  168 ++
 .../core/class-use/TemplateValueFormat.html     |  175 ++
 .../class-use/TemplateValueFormatException.html |  359 +++++
 .../class-use/TemplateValueFormatFactory.html   |  189 +++
 .../class-use/TemplateXHTMLOutputModel.html     |  168 ++
 .../core/class-use/TemplateXMLOutputModel.html  |  168 ++
 .../UndefinedCustomFormatException.html         |  125 ++
 .../core/class-use/UndefinedOutputFormat.html   |  167 ++
 .../core/class-use/UnexpectedTypeException.html |   31 +-
 .../class-use/UnformattableValueException.html  |  192 +++
 ...nDateTypeFormattingUnsupportedException.html |  125 ++
 ...nownDateTypeParsingUnsupportedException.html |  125 ++
 .../class-use/UnparsableValueException.html     |  125 ++
 .../UnregisteredOutputFormatException.html      |  171 ++
 .../core/class-use/XHTMLOutputFormat.html       |  182 +++
 .../core/class-use/XMLOutputFormat.html         |  182 +++
 docs/api/freemarker/core/package-frame.html     |   49 +-
 docs/api/freemarker/core/package-summary.html   |  286 +++-
 docs/api/freemarker/core/package-tree.html      |   88 +-
 docs/api/freemarker/core/package-use.html       |  196 ++-
 docs/api/freemarker/debug/Breakpoint.html       |    8 +-
 docs/api/freemarker/debug/DebugModel.html       |    8 +-
 .../freemarker/debug/DebuggedEnvironment.html   |    8 +-
 docs/api/freemarker/debug/Debugger.html         |    8 +-
 docs/api/freemarker/debug/DebuggerClient.html   |    8 +-
 docs/api/freemarker/debug/DebuggerListener.html |    8 +-
 .../debug/EnvironmentSuspendedEvent.html        |    8 +-
 .../freemarker/debug/class-use/Breakpoint.html  |    8 +-
 .../freemarker/debug/class-use/DebugModel.html  |    8 +-
 .../debug/class-use/DebuggedEnvironment.html    |    8 +-
 .../freemarker/debug/class-use/Debugger.html    |    8 +-
 .../debug/class-use/DebuggerClient.html         |    8 +-
 .../debug/class-use/DebuggerListener.html       |    8 +-
 .../class-use/EnvironmentSuspendedEvent.html    |    8 +-
 docs/api/freemarker/debug/package-frame.html    |    6 +-
 docs/api/freemarker/debug/package-summary.html  |    8 +-
 docs/api/freemarker/debug/package-tree.html     |    8 +-
 docs/api/freemarker/debug/package-use.html      |    8 +-
 .../freemarker/ext/ant/FreemarkerXmlTask.html   |   11 +-
 docs/api/freemarker/ext/ant/JythonAntTask.html  |    8 +-
 .../ext/ant/UnlinkedJythonOperationsImpl.html   |    8 +-
 .../ext/ant/class-use/FreemarkerXmlTask.html    |    8 +-
 .../ext/ant/class-use/JythonAntTask.html        |    8 +-
 .../class-use/UnlinkedJythonOperationsImpl.html |    8 +-
 docs/api/freemarker/ext/ant/package-frame.html  |    6 +-
 .../api/freemarker/ext/ant/package-summary.html |    8 +-
 docs/api/freemarker/ext/ant/package-tree.html   |    8 +-
 docs/api/freemarker/ext/ant/package-use.html    |    8 +-
 docs/api/freemarker/ext/beans/ArrayModel.html   |    8 +-
 docs/api/freemarker/ext/beans/BeanModel.html    |    8 +-
 .../freemarker/ext/beans/BeansModelCache.html   |    8 +-
 .../BeansWrapper.MethodAppearanceDecision.html  |    8 +-
 ...nsWrapper.MethodAppearanceDecisionInput.html |    8 +-
 docs/api/freemarker/ext/beans/BeansWrapper.html |   36 +-
 .../ext/beans/BeansWrapperBuilder.html          |   10 +-
 .../ext/beans/BeansWrapperConfiguration.html    |    8 +-
 docs/api/freemarker/ext/beans/BooleanModel.html |    8 +-
 .../freemarker/ext/beans/CollectionModel.html   |    8 +-
 docs/api/freemarker/ext/beans/DateModel.html    |    8 +-
 .../freemarker/ext/beans/EnumerationModel.html  |    8 +-
 docs/api/freemarker/ext/beans/HashAdapter.html  |    8 +-
 .../ext/beans/InvalidPropertyException.html     |    8 +-
 .../api/freemarker/ext/beans/IteratorModel.html |    8 +-
 docs/api/freemarker/ext/beans/MapModel.html     |    8 +-
 .../ext/beans/MethodAppearanceFineTuner.html    |    8 +-
 docs/api/freemarker/ext/beans/NumberModel.html  |   10 +-
 .../ext/beans/OverloadedMethodsModel.html       |    8 +-
 .../ext/beans/ResourceBundleModel.html          |    8 +-
 .../freemarker/ext/beans/SimpleMapModel.html    |    8 +-
 .../freemarker/ext/beans/SimpleMethodModel.html |    8 +-
 .../ext/beans/SingletonCustomizer.html          |    8 +-
 docs/api/freemarker/ext/beans/StringModel.html  |    8 +-
 .../ext/beans/class-use/ArrayModel.html         |    8 +-
 .../ext/beans/class-use/BeanModel.html          |    8 +-
 .../ext/beans/class-use/BeansModelCache.html    |    8 +-
 .../BeansWrapper.MethodAppearanceDecision.html  |    8 +-
 ...nsWrapper.MethodAppearanceDecisionInput.html |    8 +-
 .../ext/beans/class-use/BeansWrapper.html       |    8 +-
 .../beans/class-use/BeansWrapperBuilder.html    |    8 +-
 .../class-use/BeansWrapperConfiguration.html    |    8 +-
 .../ext/beans/class-use/BooleanModel.html       |    8 +-
 .../ext/beans/class-use/CollectionModel.html    |    8 +-
 .../ext/beans/class-use/DateModel.html          |    8 +-
 .../ext/beans/class-use/EnumerationModel.html   |    8 +-
 .../ext/beans/class-use/HashAdapter.html        |    8 +-
 .../class-use/InvalidPropertyException.html     |    8 +-
 .../ext/beans/class-use/IteratorModel.html      |    8 +-
 .../ext/beans/class-use/MapModel.html           |    8 +-
 .../class-use/MethodAppearanceFineTuner.html    |    8 +-
 .../ext/beans/class-use/NumberModel.html        |    8 +-
 .../beans/class-use/OverloadedMethodsModel.html |    8 +-
 .../beans/class-use/ResourceBundleModel.html    |    8 +-
 .../ext/beans/class-use/SimpleMapModel.html     |    8 +-
 .../ext/beans/class-use/SimpleMethodModel.html  |    8 +-
 .../beans/class-use/SingletonCustomizer.html    |    8 +-
 .../ext/beans/class-use/StringModel.html        |    8 +-
 .../api/freemarker/ext/beans/package-frame.html |    6 +-
 .../freemarker/ext/beans/package-summary.html   |    8 +-
 docs/api/freemarker/ext/beans/package-tree.html |    8 +-
 docs/api/freemarker/ext/beans/package-use.html  |    8 +-
 docs/api/freemarker/ext/dom/NodeModel.html      |   16 +-
 docs/api/freemarker/ext/dom/Transform.html      |   14 +-
 docs/api/freemarker/ext/dom/XPathSupport.html   |    8 +-
 .../freemarker/ext/dom/class-use/NodeModel.html |    8 +-
 .../freemarker/ext/dom/class-use/Transform.html |    8 +-
 .../ext/dom/class-use/XPathSupport.html         |    8 +-
 docs/api/freemarker/ext/dom/package-frame.html  |    6 +-
 .../api/freemarker/ext/dom/package-summary.html |   10 +-
 docs/api/freemarker/ext/dom/package-tree.html   |    8 +-
 docs/api/freemarker/ext/dom/package-use.html    |   10 +-
 docs/api/freemarker/ext/jdom/NodeListModel.html |   16 +-
 .../ext/jdom/class-use/NodeListModel.html       |    8 +-
 docs/api/freemarker/ext/jdom/package-frame.html |    6 +-
 .../freemarker/ext/jdom/package-summary.html    |    8 +-
 docs/api/freemarker/ext/jdom/package-tree.html  |    8 +-
 docs/api/freemarker/ext/jdom/package-use.html   |    8 +-
 .../api/freemarker/ext/jsp/EventForwarding.html |    8 +-
 docs/api/freemarker/ext/jsp/FreemarkerTag.html  |    8 +-
 ...TaglibFactory.ClasspathMetaInfTldSource.html |    8 +-
 .../TaglibFactory.ClearMetaInfTldSource.html    |    8 +-
 .../ext/jsp/TaglibFactory.MetaInfTldSource.html |    8 +-
 ...Factory.WebInfPerLibJarMetaInfTldSource.html |    8 +-
 docs/api/freemarker/ext/jsp/TaglibFactory.html  |    8 +-
 .../ext/jsp/class-use/EventForwarding.html      |    8 +-
 .../ext/jsp/class-use/FreemarkerTag.html        |    8 +-
 ...TaglibFactory.ClasspathMetaInfTldSource.html |    8 +-
 .../TaglibFactory.ClearMetaInfTldSource.html    |    8 +-
 .../TaglibFactory.MetaInfTldSource.html         |    8 +-
 ...Factory.WebInfPerLibJarMetaInfTldSource.html |    8 +-
 .../ext/jsp/class-use/TaglibFactory.html        |    8 +-
 docs/api/freemarker/ext/jsp/package-frame.html  |    6 +-
 .../api/freemarker/ext/jsp/package-summary.html |    8 +-
 docs/api/freemarker/ext/jsp/package-tree.html   |    8 +-
 docs/api/freemarker/ext/jsp/package-use.html    |    8 +-
 .../freemarker/ext/jython/JythonHashModel.html  |    8 +-
 docs/api/freemarker/ext/jython/JythonModel.html |    8 +-
 .../ext/jython/JythonNumberModel.html           |    8 +-
 .../ext/jython/JythonSequenceModel.html         |    8 +-
 .../ext/jython/JythonVersionAdapter.html        |    8 +-
 .../freemarker/ext/jython/JythonWrapper.html    |    8 +-
 .../ext/jython/class-use/JythonHashModel.html   |    8 +-
 .../ext/jython/class-use/JythonModel.html       |    8 +-
 .../ext/jython/class-use/JythonNumberModel.html |    8 +-
 .../jython/class-use/JythonSequenceModel.html   |    8 +-
 .../jython/class-use/JythonVersionAdapter.html  |    8 +-
 .../ext/jython/class-use/JythonWrapper.html     |    8 +-
 .../freemarker/ext/jython/package-frame.html    |    6 +-
 .../freemarker/ext/jython/package-summary.html  |    8 +-
 .../api/freemarker/ext/jython/package-tree.html |    8 +-
 docs/api/freemarker/ext/jython/package-use.html |    8 +-
 .../ext/rhino/RhinoFunctionModel.html           |    8 +-
 .../ext/rhino/RhinoScriptableModel.html         |   18 +-
 docs/api/freemarker/ext/rhino/RhinoWrapper.html |    8 +-
 .../ext/rhino/class-use/RhinoFunctionModel.html |    8 +-
 .../rhino/class-use/RhinoScriptableModel.html   |    8 +-
 .../ext/rhino/class-use/RhinoWrapper.html       |    8 +-
 .../api/freemarker/ext/rhino/package-frame.html |    6 +-
 .../freemarker/ext/rhino/package-summary.html   |    8 +-
 docs/api/freemarker/ext/rhino/package-tree.html |    8 +-
 docs/api/freemarker/ext/rhino/package-use.html  |    8 +-
 .../ext/servlet/AllHttpScopesHashModel.html     |    8 +-
 .../ext/servlet/FreemarkerServlet.html          |  465 +++++-
 .../ext/servlet/HttpRequestHashModel.html       |    8 +-
 .../servlet/HttpRequestParametersHashModel.html |    8 +-
 .../ext/servlet/HttpSessionHashModel.html       |    8 +-
 .../api/freemarker/ext/servlet/IncludePage.html |    8 +-
 .../ext/servlet/ServletContextHashModel.html    |   13 +-
 .../class-use/AllHttpScopesHashModel.html       |    8 +-
 .../servlet/class-use/FreemarkerServlet.html    |    8 +-
 .../servlet/class-use/HttpRequestHashModel.html |    8 +-
 .../HttpRequestParametersHashModel.html         |    8 +-
 .../servlet/class-use/HttpSessionHashModel.html |    8 +-
 .../ext/servlet/class-use/IncludePage.html      |    8 +-
 .../class-use/ServletContextHashModel.html      |    8 +-
 .../freemarker/ext/servlet/package-frame.html   |    6 +-
 .../freemarker/ext/servlet/package-summary.html |    8 +-
 .../freemarker/ext/servlet/package-tree.html    |    8 +-
 .../api/freemarker/ext/servlet/package-use.html |    8 +-
 .../freemarker/ext/util/IdentityHashMap.html    |    8 +-
 docs/api/freemarker/ext/util/ModelCache.html    |    8 +-
 docs/api/freemarker/ext/util/ModelFactory.html  |    8 +-
 .../ext/util/WrapperTemplateModel.html          |    8 +-
 .../ext/util/class-use/IdentityHashMap.html     |    8 +-
 .../ext/util/class-use/ModelCache.html          |    8 +-
 .../ext/util/class-use/ModelFactory.html        |    8 +-
 .../util/class-use/WrapperTemplateModel.html    |   10 +-
 docs/api/freemarker/ext/util/package-frame.html |    6 +-
 .../freemarker/ext/util/package-summary.html    |    8 +-
 docs/api/freemarker/ext/util/package-tree.html  |    8 +-
 docs/api/freemarker/ext/util/package-use.html   |    8 +-
 docs/api/freemarker/ext/xml/NodeListModel.html  |   11 +-
 .../ext/xml/class-use/NodeListModel.html        |    8 +-
 docs/api/freemarker/ext/xml/package-frame.html  |    6 +-
 .../api/freemarker/ext/xml/package-summary.html |    8 +-
 docs/api/freemarker/ext/xml/package-tree.html   |    8 +-
 docs/api/freemarker/ext/xml/package-use.html    |    8 +-
 docs/api/freemarker/log/Logger.html             |   22 +-
 docs/api/freemarker/log/class-use/Logger.html   |    8 +-
 docs/api/freemarker/log/package-frame.html      |    6 +-
 docs/api/freemarker/log/package-summary.html    |    8 +-
 docs/api/freemarker/log/package-tree.html       |    8 +-
 docs/api/freemarker/log/package-use.html        |    8 +-
 .../template/AdapterTemplateModel.html          |    8 +-
 docs/api/freemarker/template/Configuration.html | 1434 +++++++++++++++--
 .../template/DefaultArrayAdapter.html           |    8 +-
 .../template/DefaultIteratorAdapter.html        |    8 +-
 .../freemarker/template/DefaultListAdapter.html |    8 +-
 .../freemarker/template/DefaultMapAdapter.html  |    8 +-
 .../DefaultNonListCollectionAdapter.html        |    8 +-
 .../template/DefaultObjectWrapper.html          |   20 +-
 .../template/DefaultObjectWrapperBuilder.html   |    8 +-
 .../DefaultObjectWrapperConfiguration.html      |    8 +-
 .../freemarker/template/LocalizedString.html    |   16 +-
 .../MalformedTemplateNameException.html         |    8 +-
 docs/api/freemarker/template/ObjectWrapper.html |   17 +-
 .../template/ObjectWrapperAndUnwrapper.html     |    8 +-
 .../template/ResourceBundleLocalizedString.html |    8 +-
 .../freemarker/template/SimpleCollection.html   |   14 +-
 docs/api/freemarker/template/SimpleDate.html    |    8 +-
 docs/api/freemarker/template/SimpleHash.html    |   14 +-
 docs/api/freemarker/template/SimpleList.html    |   11 +-
 docs/api/freemarker/template/SimpleNumber.html  |   10 +-
 .../template/SimpleObjectWrapper.html           |   11 +-
 docs/api/freemarker/template/SimpleScalar.html  |   16 +-
 .../api/freemarker/template/SimpleSequence.html |   25 +-
 .../Template.WrongEncodingException.html        |  200 ++-
 docs/api/freemarker/template/Template.html      |  294 +++-
 .../template/TemplateBooleanModel.html          |   14 +-
 .../template/TemplateCollectionModel.html       |    8 +-
 .../template/TemplateCollectionModelEx.html     |    8 +-
 .../freemarker/template/TemplateDateModel.html  |   14 +-
 .../template/TemplateDirectiveBody.html         |    8 +-
 .../template/TemplateDirectiveModel.html        |    8 +-
 .../freemarker/template/TemplateException.html  |   14 +-
 .../template/TemplateExceptionHandler.html      |   19 +-
 .../freemarker/template/TemplateHashModel.html  |    8 +-
 .../template/TemplateHashModelEx.html           |    8 +-
 .../template/TemplateMethodModel.html           |   11 +-
 .../template/TemplateMethodModelEx.html         |    8 +-
 docs/api/freemarker/template/TemplateModel.html |   12 +-
 .../template/TemplateModelAdapter.html          |    8 +-
 .../template/TemplateModelException.html        |    8 +-
 .../template/TemplateModelIterator.html         |    8 +-
 .../template/TemplateModelListSequence.html     |    8 +-
 .../template/TemplateModelWithAPISupport.html   |    8 +-
 .../freemarker/template/TemplateNodeModel.html  |    8 +-
 .../template/TemplateNotFoundException.html     |    8 +-
 .../template/TemplateNumberModel.html           |   20 +-
 .../template/TemplateScalarModel.html           |   16 +-
 .../template/TemplateSequenceModel.html         |    8 +-
 .../template/TemplateTransformModel.html        |    8 +-
 .../freemarker/template/TransformControl.html   |    8 +-
 docs/api/freemarker/template/Version.html       |   33 +-
 .../template/WrappingTemplateModel.html         |   17 +-
 .../class-use/AdapterTemplateModel.html         |   10 +-
 .../template/class-use/Configuration.html       |   90 +-
 .../template/class-use/DefaultArrayAdapter.html |    8 +-
 .../class-use/DefaultIteratorAdapter.html       |    8 +-
 .../template/class-use/DefaultListAdapter.html  |    8 +-
 .../template/class-use/DefaultMapAdapter.html   |    8 +-
 .../DefaultNonListCollectionAdapter.html        |    8 +-
 .../class-use/DefaultObjectWrapper.html         |    8 +-
 .../class-use/DefaultObjectWrapperBuilder.html  |    8 +-
 .../DefaultObjectWrapperConfiguration.html      |    8 +-
 .../template/class-use/LocalizedString.html     |    8 +-
 .../MalformedTemplateNameException.html         |    8 +-
 .../template/class-use/ObjectWrapper.html       |    8 +-
 .../class-use/ObjectWrapperAndUnwrapper.html    |    8 +-
 .../ResourceBundleLocalizedString.html          |    8 +-
 .../template/class-use/SimpleCollection.html    |    8 +-
 .../template/class-use/SimpleDate.html          |    8 +-
 .../template/class-use/SimpleHash.html          |    8 +-
 .../template/class-use/SimpleList.html          |    8 +-
 .../template/class-use/SimpleNumber.html        |    8 +-
 .../template/class-use/SimpleObjectWrapper.html |    8 +-
 .../template/class-use/SimpleScalar.html        |    8 +-
 .../template/class-use/SimpleSequence.html      |    8 +-
 .../Template.WrongEncodingException.html        |    8 +-
 .../freemarker/template/class-use/Template.html |   46 +-
 .../class-use/TemplateBooleanModel.html         |    8 +-
 .../class-use/TemplateCollectionModel.html      |    8 +-
 .../class-use/TemplateCollectionModelEx.html    |    8 +-
 .../template/class-use/TemplateDateModel.html   |   48 +-
 .../class-use/TemplateDirectiveBody.html        |    8 +-
 .../class-use/TemplateDirectiveModel.html       |   14 +-
 .../template/class-use/TemplateException.html   |   60 +-
 .../class-use/TemplateExceptionHandler.html     |    8 +-
 .../template/class-use/TemplateHashModel.html   |   10 +-
 .../template/class-use/TemplateHashModelEx.html |    8 +-
 .../template/class-use/TemplateMethodModel.html |    8 +-
 .../class-use/TemplateMethodModelEx.html        |    8 +-
 .../template/class-use/TemplateModel.html       |   76 +-
 .../class-use/TemplateModelAdapter.html         |    8 +-
 .../class-use/TemplateModelException.html       |  194 ++-
 .../class-use/TemplateModelIterator.html        |    8 +-
 .../class-use/TemplateModelListSequence.html    |    8 +-
 .../class-use/TemplateModelWithAPISupport.html  |    8 +-
 .../template/class-use/TemplateNodeModel.html   |   10 +-
 .../class-use/TemplateNotFoundException.html    |    8 +-
 .../template/class-use/TemplateNumberModel.html |   54 +-
 .../template/class-use/TemplateScalarModel.html |    8 +-
 .../class-use/TemplateSequenceModel.html        |   10 +-
 .../class-use/TemplateTransformModel.html       |    8 +-
 .../template/class-use/TransformControl.html    |    8 +-
 .../freemarker/template/class-use/Version.html  |   35 +-
 .../class-use/WrappingTemplateModel.html        |    8 +-
 docs/api/freemarker/template/package-frame.html |    6 +-
 .../freemarker/template/package-summary.html    |   13 +-
 docs/api/freemarker/template/package-tree.html  |   10 +-
 docs/api/freemarker/template/package-use.html   |   52 +-
 .../template/utility/CaptureOutput.html         |   11 +-
 .../freemarker/template/utility/ClassUtil.html  |    8 +-
 .../template/utility/CollectionUtils.html       |    8 +-
 .../template/utility/Collections12.html         |   11 +-
 .../freemarker/template/utility/Constants.html  |    8 +-
 .../template/utility/DOMNodeModel.html          |    8 +-
 .../DateUtil.CalendarFieldsToDateConverter.html |    8 +-
 .../utility/DateUtil.DateParseException.html    |    8 +-
 .../DateUtil.DateToISO8601CalendarFactory.html  |    8 +-
 ...il.TrivialCalendarFieldsToDateConverter.html |    8 +-
 ...til.TrivialDateToISO8601CalendarFactory.html |    8 +-
 .../freemarker/template/utility/DateUtil.html   |    8 +-
 .../freemarker/template/utility/DeepUnwrap.html |   13 +-
 .../freemarker/template/utility/Execute.html    |    8 +-
 .../freemarker/template/utility/HtmlEscape.html |    8 +-
 .../template/utility/JythonRuntime.html         |    8 +-
 .../template/utility/NormalizeNewlines.html     |    8 +-
 .../template/utility/NullArgumentException.html |   36 +-
 .../freemarker/template/utility/NullWriter.html |  101 +-
 .../freemarker/template/utility/NumberUtil.html |    8 +-
 .../template/utility/ObjectConstructor.html     |    8 +-
 .../template/utility/ObjectFactory.html         |   20 +-
 .../utility/ObjectWrapperWithAPISupport.html    |    8 +-
 .../template/utility/OptimizerUtil.html         |    8 +-
 .../template/utility/RichObjectWrapper.html     |    8 +-
 .../template/utility/SecurityUtilities.html     |    8 +-
 .../template/utility/StandardCompress.html      |    8 +-
 .../freemarker/template/utility/StringUtil.html |  260 ++-
 .../template/utility/ToCanonical.html           |   14 +-
 .../utility/UndeclaredThrowableException.html   |    8 +-
 .../utility/UnrecognizedTimeZoneException.html  |    8 +-
 .../UnsupportedNumberClassException.html        |    8 +-
 .../template/utility/WriteProtectable.html      |    8 +-
 .../freemarker/template/utility/XmlEscape.html  |    8 +-
 .../utility/class-use/CaptureOutput.html        |    8 +-
 .../template/utility/class-use/ClassUtil.html   |    8 +-
 .../utility/class-use/CollectionUtils.html      |    8 +-
 .../utility/class-use/Collections12.html        |    8 +-
 .../template/utility/class-use/Constants.html   |    8 +-
 .../utility/class-use/DOMNodeModel.html         |    8 +-
 .../DateUtil.CalendarFieldsToDateConverter.html |    8 +-
 .../class-use/DateUtil.DateParseException.html  |    8 +-
 .../DateUtil.DateToISO8601CalendarFactory.html  |    8 +-
 ...il.TrivialCalendarFieldsToDateConverter.html |    8 +-
 ...til.TrivialDateToISO8601CalendarFactory.html |    8 +-
 .../template/utility/class-use/DateUtil.html    |    8 +-
 .../template/utility/class-use/DeepUnwrap.html  |    8 +-
 .../template/utility/class-use/Execute.html     |    8 +-
 .../template/utility/class-use/HtmlEscape.html  |    8 +-
 .../utility/class-use/JythonRuntime.html        |    8 +-
 .../utility/class-use/NormalizeNewlines.html    |    8 +-
 .../class-use/NullArgumentException.html        |    8 +-
 .../template/utility/class-use/NullWriter.html  |    8 +-
 .../template/utility/class-use/NumberUtil.html  |    8 +-
 .../utility/class-use/ObjectConstructor.html    |    8 +-
 .../utility/class-use/ObjectFactory.html        |    8 +-
 .../class-use/ObjectWrapperWithAPISupport.html  |    8 +-
 .../utility/class-use/OptimizerUtil.html        |    8 +-
 .../utility/class-use/RichObjectWrapper.html    |    8 +-
 .../utility/class-use/SecurityUtilities.html    |    8 +-
 .../utility/class-use/StandardCompress.html     |    8 +-
 .../template/utility/class-use/StringUtil.html  |    8 +-
 .../template/utility/class-use/ToCanonical.html |    8 +-
 .../class-use/UndeclaredThrowableException.html |    8 +-
 .../UnrecognizedTimeZoneException.html          |    8 +-
 .../UnsupportedNumberClassException.html        |    8 +-
 .../utility/class-use/WriteProtectable.html     |    8 +-
 .../template/utility/class-use/XmlEscape.html   |    8 +-
 .../template/utility/package-frame.html         |    6 +-
 .../template/utility/package-summary.html       |   10 +-
 .../template/utility/package-tree.html          |   10 +-
 .../template/utility/package-use.html           |    8 +-
 docs/api/help-doc.html                          |    8 +-
 docs/api/index-all.html                         | 1510 +++++++++++++++++-
 docs/api/index.html                             |    4 +-
 docs/api/overview-frame.html                    |    6 +-
 docs/api/overview-summary.html                  |   10 +-
 docs/api/overview-tree.html                     |  108 +-
 docs/api/serialized-form.html                   |  121 +-
 docs/api/stylesheet.css                         |    2 +-
 docs/app.html                                   |   27 +-
 docs/app_eccn.html                              |   25 +-
 docs/app_faq.html                               |   29 +-
 docs/app_install.html                           |   30 +-
 docs/app_legal.html                             |   25 +-
 docs/app_license.html                           |  246 ++-
 docs/app_versions.html                          |   29 +-
 docs/detailed-toc.html                          |   78 +-
 docs/dgui.html                                  |   27 +-
 docs/dgui_datamodel.html                        |   25 +-
 docs/dgui_datamodel_basics.html                 |   25 +-
 docs/dgui_datamodel_types.html                  |   99 +-
 docs/dgui_misc.html                             |   27 +-
 docs/dgui_misc_alternativesyntax.html           |   25 +-
 docs/dgui_misc_autoescaping.html                |  713 +++++++++
 docs/dgui_misc_namespace.html                   |   29 +-
 docs/dgui_misc_userdefdir.html                  |   25 +-
 docs/dgui_misc_var.html                         |   25 +-
 docs/dgui_misc_whitespace.html                  |   33 +-
 docs/dgui_quickstart.html                       |   25 +-
 docs/dgui_quickstart_basics.html                |   25 +-
 docs/dgui_quickstart_datamodel.html             |   25 +-
 docs/dgui_quickstart_template.html              |   93 +-
 docs/dgui_template.html                         |   25 +-
 docs/dgui_template_directives.html              |   25 +-
 docs/dgui_template_exp.html                     |   57 +-
 docs/dgui_template_overallstructure.html        |   25 +-
 docs/dgui_template_valueinsertion.html          |   96 +-
 docs/docgen-resources/docgen.min.css            |    2 +-
 docs/docgen-resources/fonts/NOTICE              |   20 +
 docs/docgen-resources/fonts/icomoon.svg         |    1 +
 docs/docgen-resources/main.min.js               |    2 +-
 docs/eclipse-toc.xml                            |   41 +-
 docs/gloss.html                                 |   69 +-
 docs/index.html                                 |   27 +-
 docs/pgui.html                                  |   27 +-
 docs/pgui_config.html                           |   27 +-
 docs/pgui_config_basics.html                    |   55 +-
 docs/pgui_config_custom_formats.html            |  698 ++++++++
 docs/pgui_config_errorhandling.html             |  229 +--
 docs/pgui_config_incompatible_improvements.html |   43 +-
 docs/pgui_config_outputformatsautoesc.html      |  208 +++
 docs/pgui_config_settings.html                  |  142 +-
 docs/pgui_config_sharedvariables.html           |   27 +-
 docs/pgui_config_templateconfigurations.html    |  312 ++++
 docs/pgui_config_templateloading.html           |  260 +--
 docs/pgui_datamodel.html                        |   25 +-
 docs/pgui_datamodel_basics.html                 |   25 +-
 docs/pgui_datamodel_directive.html              |   35 +-
 docs/pgui_datamodel_method.html                 |   25 +-
 docs/pgui_datamodel_node.html                   |   25 +-
 docs/pgui_datamodel_objectWrapper.html          |   39 +-
 docs/pgui_datamodel_parent.html                 |   33 +-
 docs/pgui_datamodel_scalar.html                 |   27 +-
 docs/pgui_misc.html                             |   25 +-
 docs/pgui_misc_ant.html                         |   25 +-
 docs/pgui_misc_beanwrapper.html                 |   41 +-
 docs/pgui_misc_charset.html                     |   31 +-
 docs/pgui_misc_jythonwrapper.html               |   37 +-
 docs/pgui_misc_logging.html                     |   31 +-
 docs/pgui_misc_multithreading.html              |   25 +-
 docs/pgui_misc_secureenv.html                   |   25 +-
 docs/pgui_misc_servlet.html                     |   95 +-
 docs/pgui_misc_var.html                         |   25 +-
 docs/pgui_misc_xml_legacy.html                  |   39 +-
 docs/pgui_quickstart.html                       |   25 +-
 docs/pgui_quickstart_all.html                   |   82 +-
 docs/pgui_quickstart_createconfiguration.html   |   70 +-
 docs/pgui_quickstart_createdatamodel.html       |  114 +-
 docs/pgui_quickstart_gettemplate.html           |   50 +-
 docs/pgui_quickstart_merge.html                 |   42 +-
 docs/ref.html                                   |   27 +-
 docs/ref_builtins.html                          |   25 +-
 docs/ref_builtins_alphaidx.html                 |   45 +-
 docs/ref_builtins_boolean.html                  |   25 +-
 docs/ref_builtins_date.html                     |   81 +-
 docs/ref_builtins_expert.html                   |  138 +-
 docs/ref_builtins_hash.html                     |   25 +-
 docs/ref_builtins_loop_var.html                 |   25 +-
 docs/ref_builtins_node.html                     |   25 +-
 docs/ref_builtins_number.html                   |  383 ++++-
 docs/ref_builtins_sequence.html                 |   25 +-
 docs/ref_builtins_string.html                   |  406 ++++-
 docs/ref_builtins_type_independent.html         |   25 +-
 docs/ref_depr_builtin.html                      |   25 +-
 docs/ref_depr_directive.html                    |   25 +-
 docs/ref_depr_numerical_interpolation.html      |   31 +-
 docs/ref_depr_oldmacro.html                     |   31 +-
 docs/ref_depr_oldsyntax.html                    |   25 +-
 docs/ref_depr_transform.html                    |   31 +-
 docs/ref_deprecated.html                        |   25 +-
 docs/ref_directive_alphaidx.html                |   45 +-
 docs/ref_directive_assign.html                  |   31 +-
 docs/ref_directive_attempt.html                 |   35 +-
 docs/ref_directive_autoesc.html                 |  123 ++
 docs/ref_directive_compress.html                |   35 +-
 docs/ref_directive_escape.html                  |   50 +-
 docs/ref_directive_flush.html                   |   31 +-
 docs/ref_directive_ftl.html                     |  200 ++-
 docs/ref_directive_function.html                |   31 +-
 docs/ref_directive_global.html                  |   31 +-
 docs/ref_directive_if.html                      |   33 +-
 docs/ref_directive_import.html                  |   35 +-
 docs/ref_directive_include.html                 |   50 +-
 docs/ref_directive_list.html                    |   75 +-
 docs/ref_directive_local.html                   |   31 +-
 docs/ref_directive_macro.html                   |   47 +-
 docs/ref_directive_noautoesc.html               |  121 ++
 docs/ref_directive_noparse.html                 |   39 +-
 docs/ref_directive_nt.html                      |   39 +-
 docs/ref_directive_outputformat.html            |  187 +++
 docs/ref_directive_setting.html                 |  105 +-
 docs/ref_directive_stop.html                    |   31 +-
 docs/ref_directive_switch.html                  |   31 +-
 docs/ref_directive_t.html                       |   31 +-
 docs/ref_directive_userDefined.html             |   31 +-
 docs/ref_directive_visit.html                   |   37 +-
 docs/ref_directives.html                        |   27 +-
 docs/ref_reservednames.html                     |   25 +-
 docs/ref_specvar.html                           |   77 +-
 docs/search-results.html                        |   23 +-
 docs/sitemap.xml                                |   24 +
 docs/toc.js                                     |  815 +++++++---
 docs/versions_2_0.html                          |   35 +-
 docs/versions_2_01.html                         |   25 +-
 docs/versions_2_0RC1.html                       |   35 +-
 docs/versions_2_0RC2.html                       |   31 +-
 docs/versions_2_0RC3.html                       |   33 +-
 docs/versions_2_1.html                          |   35 +-
 docs/versions_2_1_1.html                        |   31 +-
 docs/versions_2_1_2.html                        |   31 +-
 docs/versions_2_1_3.html                        |   31 +-
 docs/versions_2_1_4.html                        |   27 +-
 docs/versions_2_1_5.html                        |   27 +-
 docs/versions_2_2.html                          |   45 +-
 docs/versions_2_2_1.html                        |   31 +-
 docs/versions_2_2_2.html                        |   27 +-
 docs/versions_2_2_3.html                        |   31 +-
 docs/versions_2_2_4.html                        |   31 +-
 docs/versions_2_2_5.html                        |   27 +-
 docs/versions_2_2_6.html                        |   33 +-
 docs/versions_2_2_7.html                        |   27 +-
 docs/versions_2_2_8.html                        |   33 +-
 docs/versions_2_3.html                          |  115 +-
 docs/versions_2_3_1.html                        |   39 +-
 docs/versions_2_3_10.html                       |   31 +-
 docs/versions_2_3_11.html                       |   33 +-
 docs/versions_2_3_12.html                       |   27 +-
 docs/versions_2_3_13.html                       |   31 +-
 docs/versions_2_3_14.html                       |   31 +-
 docs/versions_2_3_15.html                       |   31 +-
 docs/versions_2_3_16.html                       |   31 +-
 docs/versions_2_3_17.html                       |   33 +-
 docs/versions_2_3_18.html                       |   31 +-
 docs/versions_2_3_19.html                       |   31 +-
 docs/versions_2_3_2.html                        |   27 +-
 docs/versions_2_3_20.html                       |   33 +-
 docs/versions_2_3_21.html                       |   33 +-
 docs/versions_2_3_22.html                       |   33 +-
 docs/versions_2_3_23.html                       |   52 +-
 docs/versions_2_3_24.html                       |  879 +++++++++-
 docs/versions_2_3_3.html                        |   33 +-
 docs/versions_2_3_4.html                        |   33 +-
 docs/versions_2_3_5.html                        |   31 +-
 docs/versions_2_3_6.html                        |   27 +-
 docs/versions_2_3_7.html                        |   31 +-
 docs/versions_2_3_7rc1.html                     |   31 +-
 docs/versions_2_3_8.html                        |   27 +-
 docs/versions_2_3_9.html                        |   27 +-
 docs/xgui.html                                  |   25 +-
 docs/xgui_declarative.html                      |   25 +-
 docs/xgui_declarative_basics.html               |   25 +-
 docs/xgui_declarative_details.html              |   33 +-
 docs/xgui_expose.html                           |   25 +-
 docs/xgui_expose_dom.html                       |   25 +-
 docs/xgui_expose_put.html                       |   25 +-
 docs/xgui_imperative.html                       |   25 +-
 docs/xgui_imperative_formal.html                |   27 +-
 docs/xgui_imperative_learn.html                 |   67 +-
 docs/xgui_preface.html                          |   25 +-
 editors.html                                    |    2 +-
 freemarkerdownload.html                         |  121 +-
 history.html                                    |    2 +-
 index.html                                      |    9 +-
 mailing-lists.html                              |    4 +-
 poweredBy.html                                  |    8 +-
 sitemap-index.xml                               |   18 +
 sourcecode.html                                 |    2 +-
 788 files changed, 48689 insertions(+), 7368 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/contribute.html
----------------------------------------------------------------------
diff --git a/contribute.html b/contribute.html
index 7798a38..fd72857 100644
--- a/contribute.html
+++ b/contribute.html
@@ -170,7 +170,7 @@ ga('send', 'pageview');
 
 
 
-<h2 class="content-header header-simplesect" id="autoid_27">What to do if I want to contribute</h2>
+<h2 class="content-header header-simplesect" id="autoid_26">What to do if I want to contribute</h2>
 
 
         <p>First you should <a href="mailing-lists.html">subsrcribe to the
@@ -189,7 +189,7 @@ ga('send', 'pageview');
       </div></div>      </div>
     </div>
 <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apach
 e/incubator-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2016-01-01T21:18:15Z" title="Friday, January 1, 2016 9:18:15 PM GMT">2016-01-01 21:18:15 GMT</time></span></p> <p class="copyright">
+<time itemprop="dateModified" datetime="2016-03-28T15:16:35Z" title="Monday, March 28, 2016 3:16:35 PM GMT">2016-03-28 15:16:35 GMT</time></span></p> <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2016
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>


[03/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/app_faq.html
----------------------------------------------------------------------
diff --git a/docs/app_faq.html b/docs/app_faq.html
index 699ee5c..834e356 100644
--- a/docs/app_faq.html
+++ b/docs/app_faq.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-appendix">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>FAQ - FreeMarker Manual</title>
+<title>FAQ - Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
 <meta property="og:title" content="FAQ">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/app_faq.html">
-<link rel="canoical" href="http://freemarker.org/docs/app_faq.html">
+<link rel="canonical" href="http://freemarker.org/docs/app_faq.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,17 +25,16 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
   <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_faq.html"><span itemprop="name">FAQ</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only
 ">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li>FAQ</li></ul></div></div></div>    <div class="main-content site-width">
+</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">Apache FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_faq.html"><span itemprop="name">FAQ</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="
 sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li>FAQ</li></ul></div></div></div>    <div class="main-content site-width">
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
-      <script>var breadcrumb = ["FreeMarker Manual","Appendixes","FAQ"];</script>
+      <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","FAQ"];</script>
       <script src="toc.js"></script>
       <script src="docgen-resources/main.min.js"></script>
   </div>
@@ -1686,8 +1686,8 @@ TemplateModel x = env.getVariable(&quot;x&quot;);  // get variable x</pre></div>
               <li>
                 <p>Call <code class="inline-code">httpResp.isCommitted()</code>, and if
                 that returns <code class="inline-code">false</code>, then you call
-                <code class="inline-code">httpResp.reset()</code> and print a ``nice error
-                page&#39;&#39; for the visitor. If the return value was
+                <code class="inline-code">httpResp.reset()</code> and print a "nice
+                error page" for the visitor. If the return value was
                 <code class="inline-code">true</code>, then try to finish the page be
                 printing something that makes clear for the visitor that the
                 page generation was abruptly interrupted because of an error
@@ -1762,12 +1762,9 @@ TemplateModel x = env.getVariable(&quot;x&quot;);  // get variable x</pre></div>
   </div>
 <div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="app.html"><span>Previous</span></a><a class="paging-arrow next" href="app_versions.html"><span>Next</span></a></div></div></div></div>      </div>
     </div>
-<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/index.html">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><
 li><a href="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generat
 ed for: Freemarker 2.3.23</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2015-07-21T19:53:44Z" title="Tuesday, July 21, 2015 7:53:44 PM GMT">2015-07-21 19:53:44 GMT</time></span></p> <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2015
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The FreeMarker Project</a>. All rights reserved. </p>
+<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href
 ="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generated for: Fr
 eemarker 2.3.24</span><span class="last-updated"> Last generated:
+<time itemprop="dateModified" datetime="2016-03-28T15:17:13Z" title="Monday, March 28, 2016 3:17:13 PM GMT">2016-03-28 15:17:13 GMT</time></span></p> <p class="copyright">
+© <span itemprop="copyrightYear">1999</span>–2016
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>
 </html>
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/app_install.html
----------------------------------------------------------------------
diff --git a/docs/app_install.html b/docs/app_install.html
index 8019435..453a609 100644
--- a/docs/app_install.html
+++ b/docs/app_install.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-appendix">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>Installing FreeMarker - FreeMarker Manual</title>
+<title>Installing FreeMarker - Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
 <meta property="og:title" content="Installing FreeMarker">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/app_install.html">
-<link rel="canoical" href="http://freemarker.org/docs/app_install.html">
+<link rel="canonical" href="http://freemarker.org/docs/app_install.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,17 +25,16 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
   <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_install.html"><span itemprop="name">Installing FreeMarker</span></a></li></ul><div class="bookmarks" title="Bookmarks
 "><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
+</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">Apache FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_install.html"><span itemprop="name">Installing FreeMarker</span></a></li></ul><div class="bookmarks" title="Bo
 okmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
-      <script>var breadcrumb = ["FreeMarker Manual","Appendixes","Installing FreeMarker"];</script>
+      <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Installing FreeMarker"];</script>
       <script src="toc.js"></script>
       <script src="docgen-resources/main.min.js"></script>
   </div>
@@ -68,7 +68,7 @@ ga('send', 'pageview');
         </li>
 
         <li>
-          <p>For the custom JSP taglib support, you will need JSP 1.2 API
+          <p>For the custom JSP taglib support, you will need JSP 2.0 API
           or later avilable. No JSP implementation is needed, just the API.
           This is already present in pretty much every servlet container. For
           more information please see <a href="pgui_misc_servlet.html">the
@@ -76,7 +76,8 @@ ga('send', 'pageview');
         </li>
 
         <li>
-          <p>Jython classes are needed for the Jython wrapper.</p>
+          <p>Jython 2.0 or later classes are needed for the Jython
+          wrapper.</p>
         </li>
 
         <li>
@@ -86,12 +87,9 @@ ga('send', 'pageview');
         </li>
       </ul><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="versions_2_0RC1.html"><span>Previous</span></a><a class="paging-arrow next" href="app_legal.html"><span>Next</span></a></div></div></div></div>      </div>
     </div>
-<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/index.html">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><
 li><a href="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generat
 ed for: Freemarker 2.3.23</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2015-07-21T19:53:44Z" title="Tuesday, July 21, 2015 7:53:44 PM GMT">2015-07-21 19:53:44 GMT</time></span></p> <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2015
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The FreeMarker Project</a>. All rights reserved. </p>
+<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href
 ="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generated for: Fr
 eemarker 2.3.24</span><span class="last-updated"> Last generated:
+<time itemprop="dateModified" datetime="2016-03-28T15:17:13Z" title="Monday, March 28, 2016 3:17:13 PM GMT">2016-03-28 15:17:13 GMT</time></span></p> <p class="copyright">
+© <span itemprop="copyrightYear">1999</span>–2016
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>
 </html>
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/app_legal.html
----------------------------------------------------------------------
diff --git a/docs/app_legal.html b/docs/app_legal.html
index 61c03e4..4bd4510 100644
--- a/docs/app_legal.html
+++ b/docs/app_legal.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-appendix">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>Legal - FreeMarker Manual</title>
+<title>Legal - Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
 <meta property="og:title" content="Legal">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/app_legal.html">
-<link rel="canoical" href="http://freemarker.org/docs/app_legal.html">
+<link rel="canonical" href="http://freemarker.org/docs/app_legal.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,17 +25,16 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
   <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_legal.html"><span itemprop="name">Legal</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-
 only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
+</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">Apache FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_legal.html"><span itemprop="name">Legal</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span cla
 ss="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
-      <script>var breadcrumb = ["FreeMarker Manual","Appendixes","Legal"];</script>
+      <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Legal"];</script>
       <script src="toc.js"></script>
       <script src="docgen-resources/main.min.js"></script>
   </div>
@@ -44,12 +44,9 @@ ga('send', 'pageview');
 <div class="page-menu-title">Section Contents</div>
 <ul><li><a class="page-menu-link" href="app_license.html" data-menu-target="app_license">License</a></li><li><a class="page-menu-link" href="app_eccn.html" data-menu-target="app_eccn">Export Control</a></li></ul> </div><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="app_install.html"><span>Previous</span></a><a class="paging-arrow next" href="app_license.html"><span>Next</span></a></div></div></div></div>      </div>
     </div>
-<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/index.html">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><
 li><a href="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generat
 ed for: Freemarker 2.3.23</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2015-07-21T19:53:44Z" title="Tuesday, July 21, 2015 7:53:44 PM GMT">2015-07-21 19:53:44 GMT</time></span></p> <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2015
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The FreeMarker Project</a>. All rights reserved. </p>
+<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href
 ="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generated for: Fr
 eemarker 2.3.24</span><span class="last-updated"> Last generated:
+<time itemprop="dateModified" datetime="2016-03-28T15:17:13Z" title="Monday, March 28, 2016 3:17:13 PM GMT">2016-03-28 15:17:13 GMT</time></span></p> <p class="copyright">
+© <span itemprop="copyrightYear">1999</span>–2016
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>
 </html>
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/app_license.html
----------------------------------------------------------------------
diff --git a/docs/app_license.html b/docs/app_license.html
index 66c2d84..ba272d4 100644
--- a/docs/app_license.html
+++ b/docs/app_license.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-section">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>License - FreeMarker Manual</title>
+<title>License - Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
 <meta property="og:title" content="License">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/app_license.html">
-<link rel="canoical" href="http://freemarker.org/docs/app_license.html">
+<link rel="canonical" href="http://freemarker.org/docs/app_license.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,17 +25,16 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
   <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_legal.html"><span itemprop="name">Legal</span></a></li><li class="step-3" itemprop="itemListElement" itemscope itemty
 pe="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_license.html"><span itemprop="name">License</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
+</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">Apache FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_legal.html"><span itemprop="name">Legal</span></a></li><li class="step-3" itemprop="itemListElement" itemscope
  itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_license.html"><span itemprop="name">License</span></a></li></ul><div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
-      <script>var breadcrumb = ["FreeMarker Manual","Appendixes","Legal","License"];</script>
+      <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Legal","License"];</script>
       <script src="toc.js"></script>
       <script src="docgen-resources/main.min.js"></script>
   </div>
@@ -42,32 +42,220 @@ ga('send', 'pageview');
 <h1 class="content-header header-section1" id="app_license" itemprop="headline">License</h1>
 </div></div>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Copyright 2014 Attila Szegedi, Daniel Dekany, Jonathan Revusky
+<div class="code-wrapper"><pre class="code-block code-unspecified">
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      &quot;control&quot; means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      &quot;Source&quot; form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      &quot;Object&quot; form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      &quot;Work&quot; shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      &quot;Contribution&quot; shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
+
+      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
+      replaced with your own identifying information. (Don&#39;t include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same &quot;printed page&quot; as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
 ==============================================================================
 END LICENSE
 
 
-FreeMarker subcomponents with different copyright owners
---------------------------------------------------------
+Files developed outside the FreeMarker project
+----------------------------------------------
 
 FreeMarker, both in its source code and binary form (freemarker.jar)
 includes a number of files that are licensed by the Apache Software
 Foundation under the Apache License, Version 2.0. This is the same
-license as the license of FreeMaker, but the copyright owner is the
-Apache Software Foundation. These files are:
+license as the license of FreeMaker. These files are:
   
     freemarker/ext/jsp/web-app_2_2.dtd
     freemarker/ext/jsp/web-app_2_3.dtd
@@ -86,14 +274,14 @@ relinquished the copyright in behalf of Visigoth Software Society.
 With FreeMarker 2.3.21 the license has changed to Apache License,
 Version 2.0, and the owner has changed from Visigoth Software Society
 to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
-Dekany, and Jonathan Revusky.</pre></div><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="app_legal.html"><span>Previous</span></a><a class="paging-arrow next" href="app_eccn.html"><span>Next</span></a></div></div></div></div>      </div>
+Dekany, and Jonathan Revusky.
+
+After FreeMarker 2.3.24-pre01 (2015-09-02), the owner changes to the
+Apache Software Foundation.</pre></div><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="app_legal.html"><span>Previous</span></a><a class="paging-arrow next" href="app_eccn.html"><span>Next</span></a></div></div></div></div>      </div>
     </div>
-<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/index.html">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><
 li><a href="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generat
 ed for: Freemarker 2.3.23</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2015-07-21T19:53:44Z" title="Tuesday, July 21, 2015 7:53:44 PM GMT">2015-07-21 19:53:44 GMT</time></span></p> <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2015
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The FreeMarker Project</a>. All rights reserved. </p>
+<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href
 ="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generated for: Fr
 eemarker 2.3.24</span><span class="last-updated"> Last generated:
+<time itemprop="dateModified" datetime="2016-03-28T15:17:13Z" title="Monday, March 28, 2016 3:17:13 PM GMT">2016-03-28 15:17:13 GMT</time></span></p> <p class="copyright">
+© <span itemprop="copyrightYear">1999</span>–2016
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>
 </html>
-
-
-


[30/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateDateFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateDateFormat.html b/docs/api/freemarker/core/TemplateDateFormat.html
new file mode 100644
index 0000000..ee2fb6f
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateDateFormat.html
@@ -0,0 +1,414 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateDateFormat (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="TemplateDateFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":6,"i2":6,"i3":6,"i4":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateDateFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateDateFormatFactory.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/TemplateDateFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateDateFormat.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 TemplateDateFormat" class="title">Class TemplateDateFormat</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/TemplateValueFormat.html" title="class in freemarker.core">freemarker.core.TemplateValueFormat</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateDateFormat</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateDateFormat</span>
+extends <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></pre>
+<div class="block">Represents a date/time/dateTime format; used in templates for formatting and parsing with that format. This is
+ similar to Java's <a href="http://docs.oracle.com/javase/8/docs/api/java/text/DateFormat.html?is-external=true" title="class or interface in java.text"><code>DateFormat</code></a>, but made to fit the requirements of FreeMarker. Also, it makes easier to define
+ formats that can't be represented with Java's existing <a href="http://docs.oracle.com/javase/8/docs/api/java/text/DateFormat.html?is-external=true" title="class or interface in java.text"><code>DateFormat</code></a> implementations.
+ 
+ <p>
+ Implementations need not be thread-safe if the <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core"><code>TemplateNumberFormatFactory</code></a> doesn't recycle them among
+ different <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>-s. As far as FreeMarker's concerned, instances are bound to a single
+ <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>, and <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a>-s are thread-local objects.</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/TemplateDateFormat.html#TemplateDateFormat--">TemplateDateFormat</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateDateFormat.html#format-freemarker.template.TemplateDateModel-">format</a></span>(<a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-">formatToPlainText</a></span>(<a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateDateFormat.html#isLocaleBound--">isLocaleBound</a></span>()</code>
+<div class="block">Tells if this formatter should be re-created if the locale changes.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateDateFormat.html#isTimeZoneBound--">isTimeZoneBound</a></span>()</code>
+<div class="block">Tells if this formatter should be re-created if the time zone changes.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateDateFormat.html#parse-java.lang.String-int-">parse</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;s,
+     int&nbsp;dateType)</code>
+<div class="block">Parsers a string to date/time/datetime, according to this format.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.TemplateValueFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core">TemplateValueFormat</a></h3>
+<code><a href="../../freemarker/core/TemplateValueFormat.html#getDescription--">getDescription</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#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="TemplateDateFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateDateFormat</h4>
+<pre>public&nbsp;TemplateDateFormat()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="formatToPlainText-freemarker.template.TemplateDateModel-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>formatToPlainText</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;formatToPlainText(<a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)
+                                  throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a>,
+                                         <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>dateModel</code> - The date/time/dateTime to format; not <code>null</code>. Most implementations will just work with the return value of
+            <a href="../../freemarker/template/TemplateDateModel.html#getAsDate--"><code>TemplateDateModel.getAsDate()</code></a>, but some may format differently depending on the properties of
+            a custom <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> implementation.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The date/time/dateTime as text, with no escaping (like no HTML escaping); can't be <code>null</code>.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></code> - When a problem occurs during the formatting of the value. Notable subclass:
+             <a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core"><code>UnknownDateTypeFormattingUnsupportedException</code></a></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code> - Exception thrown by the <code>dateModel</code> object when calling its methods.</dd>
+</dl>
+</li>
+</ul>
+<a name="format-freemarker.template.TemplateDateModel-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>format</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;format(<a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)
+              throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a>,
+                     <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Formats the model to markup instead of to plain text if the result markup will be more than just plain text
+ escaped, otherwise falls back to formatting to plain text. If the markup result would be just the result of
+ <a href="../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-"><code>formatToPlainText(TemplateDateModel)</code></a> escaped, it must return the <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> that
+ <a href="../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-"><code>formatToPlainText(TemplateDateModel)</code></a> does.
+ 
+ <p>The implementation in <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> simply calls <a href="../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-"><code>formatToPlainText(TemplateDateModel)</code></a>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>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"><code>String</code></a> or a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>; not <code>null</code>.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="parse-java.lang.String-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>parse</h4>
+<pre>public abstract&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;parse(<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;s,
+                             int&nbsp;dateType)
+                      throws <a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></pre>
+<div class="block">Parsers a string to date/time/datetime, according to this format. Some format implementations may throw
+ <a href="../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core"><code>ParsingNotSupportedException</code></a> here.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>s</code> - The string to parse</dd>
+<dd><code>dateType</code> - The expected date type of the result. Not all <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s will care about this;
+            though those who return a <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> instead of <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> often will. When strings
+            are parsed via <code>?date</code>, <code>?time</code>, or <code>?datetime</code>, then this parameter is
+            <a href="../../freemarker/template/TemplateDateModel.html#DATE"><code>TemplateDateModel.DATE</code></a>, <a href="../../freemarker/template/TemplateDateModel.html#TIME"><code>TemplateDateModel.TIME</code></a>, or <a href="../../freemarker/template/TemplateDateModel.html#DATETIME"><code>TemplateDateModel.DATETIME</code></a>,
+            respectively. This parameter rarely if ever <a href="../../freemarker/template/TemplateDateModel.html#UNKNOWN"><code>TemplateDateModel.UNKNOWN</code></a>, but the implementation
+            that cares about this parameter should be prepared for that. If nothing else, it should throw
+            <a href="../../freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core"><code>UnknownDateTypeParsingUnsupportedException</code></a> then.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The interpretation of the text either as a <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> or <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>. Typically, a
+         <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>. <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a> is used if you have to attach some application-specific
+         meta-information thats also extracted during <a href="../../freemarker/core/TemplateDateFormat.html#formatToPlainText-freemarker.template.TemplateDateModel-"><code>formatToPlainText(TemplateDateModel)</code></a> (so if you format
+         something and then parse it, you get back an equivalent result). It can't be <code>null</code>. Known issue
+         (at least in FTL 2): <code>?date</code>/<code>?time</code>/<code>?datetime</code>, when not invoked as a method, can't
+         return the <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, only the <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> from inside it, hence the additional
+         application-specific meta-info will be lost.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core">TemplateValueFormatException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isLocaleBound--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLocaleBound</h4>
+<pre>public abstract&nbsp;boolean&nbsp;isLocaleBound()</pre>
+<div class="block">Tells if this formatter should be re-created if the locale changes.</div>
+</li>
+</ul>
+<a name="isTimeZoneBound--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isTimeZoneBound</h4>
+<pre>public abstract&nbsp;boolean&nbsp;isTimeZoneBound()</pre>
+<div class="block">Tells if this formatter should be re-created if the time zone changes. Currently always <code>true</code>.</div>
+</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/TemplateDateFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateDateFormatFactory.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/TemplateDateFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateDateFormat.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateDateFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateDateFormatFactory.html b/docs/api/freemarker/core/TemplateDateFormatFactory.html
new file mode 100644
index 0000000..9428b24
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateDateFormatFactory.html
@@ -0,0 +1,342 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateDateFormatFactory (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="TemplateDateFormatFactory (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract 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/TemplateDateFormatFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateFormatUtil.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/TemplateDateFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateDateFormatFactory.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 TemplateDateFormatFactory" class="title">Class TemplateDateFormatFactory</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>freemarker.core.TemplateDateFormatFactory</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">AliasTemplateDateFormatFactory</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">TemplateDateFormatFactory</span>
+extends <a href="../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core">TemplateValueFormatFactory</a></pre>
+<div class="block">Factory for a certain kind of date/time/dateTime formatting (<a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>). Usually a singleton
+ (one-per-VM or one-per-<a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>), and so must be thread-safe.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-"><code>Configurable.setCustomDateFormats(java.util.Map)</code></a></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/TemplateDateFormatFactory.html#TemplateDateFormatFactory--">TemplateDateFormatFactory</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract 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>abstract <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/TemplateDateFormatFactory.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="TemplateDateFormatFactory--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TemplateDateFormatFactory</h4>
+<pre>public&nbsp;TemplateDateFormatFactory()</pre>
+</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 abstract&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">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="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/TemplateDateFormatFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateFormatUtil.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/TemplateDateFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateDateFormatFactory.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateFormatUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateFormatUtil.html b/docs/api/freemarker/core/TemplateFormatUtil.html
new file mode 100644
index 0000000..bbefc36
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateFormatUtil.html
@@ -0,0 +1,300 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateFormatUtil (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="TemplateFormatUtil (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9,"i2":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static 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/TemplateFormatUtil.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateHTMLOutputModel.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/TemplateFormatUtil.html" target="_top">Frames</a></li>
+<li><a href="TemplateFormatUtil.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>Constr&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>Constr&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 TemplateFormatUtil" class="title">Class TemplateFormatUtil</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateFormatUtil</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">TemplateFormatUtil</span>
+extends <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></pre>
+<div class="block">Utility classes for implementing <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a>-s.</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">
+<!-- ========== 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="t1" class="tableTab"><span><a href="javascript:show(1);">Static 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>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateFormatUtil.html#checkHasNoParameters-java.lang.String-">checkHasNoParameters</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)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateFormatUtil.html#getNonNullDate-freemarker.template.TemplateDateModel-">getNonNullDate</a></span>(<a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> from an <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, and throw
+ <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateFormatUtil.html#getNonNullNumber-freemarker.template.TemplateNumberModel-">getNonNullNumber</a></span>(<a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)</code>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a> from an <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a>, and throws
+ <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>.</div>
+</td>
+</tr>
+</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">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="checkHasNoParameters-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkHasNoParameters</h4>
+<pre>public static&nbsp;void&nbsp;checkHasNoParameters(<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)
+                                 throws <a href="../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core">InvalidFormatParametersException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getNonNullNumber-freemarker.template.TemplateNumberModel-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNonNullNumber</h4>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;getNonNullNumber(<a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a>&nbsp;numberModel)
+                               throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a>,
+                                      <a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a></pre>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang"><code>Number</code></a> from an <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a>, and throws
+ <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>. <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a>
+ that store <code>null</code> are in principle not allowed, and so are considered to be bugs in the
+ <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> or <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a> implementation.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+<dd><code><a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core">UnformattableValueException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getNonNullDate-freemarker.template.TemplateDateModel-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getNonNullDate</h4>
+<pre>public static&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&nbsp;getNonNullDate(<a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template">TemplateDateModel</a>&nbsp;dateModel)
+                           throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block">Utility method to extract the <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util"><code>Date</code></a> from an <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>, and throw
+ <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template"><code>TemplateModelException</code></a> with a standard error message if that's <code>null</code>. <a href="../../freemarker/template/TemplateDateModel.html" title="interface in freemarker.template"><code>TemplateDateModel</code></a>
+ that store <code>null</code> are in principle not allowed, and so are considered to be bugs in the
+ <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> or <a href="../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template"><code>TemplateNumberModel</code></a> implementation.</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</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/TemplateFormatUtil.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateHTMLOutputModel.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/TemplateFormatUtil.html" target="_top">Frames</a></li>
+<li><a href="TemplateFormatUtil.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>Constr&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>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/TemplateHTMLOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/TemplateHTMLOutputModel.html b/docs/api/freemarker/core/TemplateHTMLOutputModel.html
new file mode 100644
index 0000000..130e904
--- /dev/null
+++ b/docs/api/freemarker/core/TemplateHTMLOutputModel.html
@@ -0,0 +1,277 @@
+<!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:04 CEST 2016 -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>TemplateHTMLOutputModel (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="TemplateHTMLOutputModel (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/TemplateHTMLOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateFormatUtil.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/core/TemplateHTMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateHTMLOutputModel.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>Constr&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>Constr&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 TemplateHTMLOutputModel" class="title">Class TemplateHTMLOutputModel</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/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">freemarker.core.CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.TemplateHTMLOutputModel</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;, <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">TemplateHTMLOutputModel</span>
+extends <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</pre>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.freemarker.template.TemplateModel">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template">TemplateModel</a></h3>
+<code><a href="../../freemarker/template/TemplateModel.html#NOTHING">NOTHING</a></code></li>
+</ul>
+</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/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/TemplateHTMLOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</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">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a>&nbsp;getOutputFormat()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">TemplateMarkupOutputModel</a></code></span></div>
+<div class="block">Returns the singleton <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> object that implements the operations for the "markup output" value.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/TemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in interface&nbsp;<code><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</code></dd>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html#getOutputFormat--">getOutputFormat</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/TemplateHTMLOutputModel.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/TemplateFormatUtil.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/core/TemplateHTMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateHTMLOutputModel.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>Constr&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>Constr&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>


[38/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/Configurable.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/Configurable.html b/docs/api/freemarker/core/Configurable.html
index 3a8c14b..4376e07 100644
--- a/docs/api/freemarker/core/Configurable.html
+++ b/docs/api/freemarker/core/Configurable.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>Configurable (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Configurable (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,13 +13,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Configurable (FreeMarker 2.3.23 API)";
+            parent.document.title="Configurable (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":42,"i20":42,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":42,"i24":10,"i25":42,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10,"i82":10,"i83":42,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../freemarker/core/CommandLine.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/Configurable.SettingValueAssignmentException.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>, <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>, <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a></dd>
+<dd><a href="../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>, <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>, <a href="../../freemarker/template/Template.html" title="class in freemarker.template">Template</a>, <a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></dd>
 </dl>
 <hr>
 <br>
@@ -264,6 +264,42 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY">CUSTOM_DATE_FORMATS_KEY</a></span></code>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</a></span></code>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE</a></span></code>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY">CUSTOM_NUMBER_FORMATS_KEY</a></span></code>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</a></span></code>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</a></span></code>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#DATE_FORMAT_KEY">DATE_FORMAT_KEY</a></span></code>
 <div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
 </td>
@@ -638,64 +674,88 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </td>
 </tr>
 <tr id="i9" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getCustomDateFormat-java.lang.String-">getCustomDateFormat</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Gets the custom name format registered for the name.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getCustomDateFormats--">getCustomDateFormats</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-"><code>setCustomDateFormats(Map)</code></a>; do not modify the returned <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 id="i11" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getCustomNumberFormat-java.lang.String-">getCustomNumberFormat</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Gets the custom name format registered for the name.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getCustomNumberFormats--">getCustomNumberFormats</a></span>()</code>
+<div class="block">Getter pair of <a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>setCustomNumberFormats(Map)</code></a>;  do not modify the returned <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 id="i13" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getDateFormat--">getDateFormat</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setDateFormat-java.lang.String-"><code>setDateFormat(String)</code></a>.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getDateTimeFormat--">getDateTimeFormat</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>setDateTimeFormat(String)</code></a>.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getEnvironment--">getEnvironment</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getLocale--">getLocale</a></span>()</code>
 <div class="block">Returns the assumed locale when searching for template files with no
  explicit requested locale.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getLogTemplateExceptions--">getLogTemplateExceptions</a></span>()</code>
 <div class="block">See <a href="../../freemarker/core/Configurable.html#setLogTemplateExceptions-boolean-"><code>setLogTemplateExceptions(boolean)</code></a></div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core">TemplateClassResolver</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getNewBuiltinClassResolver--">getNewBuiltinClassResolver</a></span>()</code>
 <div class="block">Retrieves the <a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> used
  to resolve classes when "SomeClassName"?new is called in a template.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getNumberFormat--">getNumberFormat</a></span>()</code>
 <div class="block">Getter pair of <a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-"><code>setNumberFormat(String)</code></a>.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getObjectWrapper--">getObjectWrapper</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setObjectWrapper-freemarker.template.ObjectWrapper-"><code>setObjectWrapper(ObjectWrapper)</code></a>.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getOutputEncoding--">getOutputEncoding</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/core/Configurable.html" title="class in freemarker.core">Configurable</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getParent--">getParent</a></span>()</code>
 <div class="block">Returns the parent <a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><code>Configurable</code></a> object of this object.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getSetting-java.lang.String-">getSetting</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;key)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -705,7 +765,13 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i24" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getSettingNames-boolean-">getSettingNames</a></span>(boolean&nbsp;camelCase)</code>
+<div class="block">Returns the valid setting names that aren't <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>-only.</div>
+</td>
+</tr>
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getSettings--">getSettings</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -716,88 +782,216 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getShowErrorTips--">getShowErrorTips</a></span>()</code>
 <div class="block">See <a href="../../freemarker/core/Configurable.html#setShowErrorTips-boolean-"><code>setShowErrorTips(boolean)</code></a></div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code><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></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getSQLDateAndTimeTimeZone--">getSQLDateAndTimeTimeZone</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setSQLDateAndTimeTimeZone-java.util.TimeZone-"><code>setSQLDateAndTimeTimeZone(TimeZone)</code></a>.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code><a href="../../freemarker/template/TemplateExceptionHandler.html" title="interface in freemarker.template">TemplateExceptionHandler</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getTemplateExceptionHandler--">getTemplateExceptionHandler</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-"><code>setTemplateExceptionHandler(TemplateExceptionHandler)</code></a>.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getTimeFormat--">getTimeFormat</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setTimeFormat-java.lang.String-"><code>setTimeFormat(String)</code></a>.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code><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></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getTimeZone--">getTimeZone</a></span>()</code>
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setTimeZone-java.util.TimeZone-"><code>setTimeZone(TimeZone)</code></a>.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#getURLEscapingCharset--">getURLEscapingCharset</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i32" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#hasCustomFormats--">hasCustomFormats</a></span>()</code>
+<div class="block">Tells if this configurable object or its parent defines any custom formats.</div>
+</td>
+</tr>
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#invalidSettingValueException-java.lang.String-java.lang.String-">invalidSettingValueException</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;value)</code>&nbsp;</td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabled--">isAPIBuiltinEnabled</a></span>()</code>
 <div class="block">See <a href="../../freemarker/core/Configurable.html#setAPIBuiltinEnabled-boolean-"><code>setAPIBuiltinEnabled(boolean)</code></a></div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i35" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isAPIBuiltinEnabledSet--">isAPIBuiltinEnabledSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i36" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isArithmeticEngineSet--">isArithmeticEngineSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i37" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isAutoFlushSet--">isAutoFlushSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i38" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isBooleanFormatSet--">isBooleanFormatSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i39" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isClassicCompatible--">isClassicCompatible</a></span>()</code>
 <div class="block">Returns whether the engine runs in the "Classic Compatibile" mode.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i40" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isClassicCompatibleSet--">isClassicCompatibleSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i41" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isCustomDateFormatsSet--">isCustomDateFormatsSet</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i42" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isCustomNumberFormatsSet--">isCustomNumberFormatsSet</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i43" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isDateFormatSet--">isDateFormatSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i44" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isDateTimeFormatSet--">isDateTimeFormatSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i45" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isLocaleSet--">isLocaleSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i46" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isLogTemplateExceptionsSet--">isLogTemplateExceptionsSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i47" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isNewBuiltinClassResolverSet--">isNewBuiltinClassResolverSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i48" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isNumberFormatSet--">isNumberFormatSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i49" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isObjectWrapperSet--">isObjectWrapperSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i50" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isOutputEncodingSet--">isOutputEncodingSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i51" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isShowErrorTipsSet--">isShowErrorTipsSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i52" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isSQLDateAndTimeTimeZoneSet--">isSQLDateAndTimeTimeZoneSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i53" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isTemplateExceptionHandlerSet--">isTemplateExceptionHandlerSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i54" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isTimeFormatSet--">isTimeFormatSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i55" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isTimeZoneSet--">isTimeZoneSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i56" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#isURLEscapingCharsetSet--">isURLEscapingCharsetSet</a></span>()</code>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+</td>
+</tr>
+<tr id="i57" class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/util/HashMap.html?is-external=true" title="class or interface in java.util">HashMap</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#parseAsImportList-java.lang.String-">parseAsImportList</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;text)</code>&nbsp;</td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i58" class="altColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#parseAsList-java.lang.String-">parseAsList</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;text)</code>&nbsp;</td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i59" class="rowColor">
 <td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html?is-external=true" title="class or interface in java.util">ArrayList</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#parseAsSegmentedList-java.lang.String-">parseAsSegmentedList</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;text)</code>&nbsp;</td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i60" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#removeCustomAttribute-java.lang.String-">removeCustomAttribute</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 a named custom attribute for this configurable.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i61" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setAPIBuiltinEnabled-boolean-">setAPIBuiltinEnabled</a></span>(boolean&nbsp;value)</code>
 <div class="block">Specifies if <code>?api</code> can be used in templates.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i62" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-">setArithmeticEngine</a></span>(<a href="../../freemarker/core/ArithmeticEngine.html" title="class in freemarker.core">ArithmeticEngine</a>&nbsp;arithmeticEngine)</code>
 <div class="block">Sets the arithmetic engine used to perform arithmetic operations.</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i63" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setAutoFlush-boolean-">setAutoFlush</a></span>(boolean&nbsp;autoFlush)</code>
 <div class="block">Sets whether the output <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io"><code>Writer</code></a> is automatically flushed at
@@ -805,152 +999,168 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  overloads).</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i64" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setBooleanFormat-java.lang.String-">setBooleanFormat</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;booleanFormat)</code>
 <div class="block">The string value for the boolean <code>true</code> and <code>false</code> values, intended for human audience (not for a
  computer language), separated with comma.</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
+<tr id="i65" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setClassicCompatible-boolean-">setClassicCompatible</a></span>(boolean&nbsp;classicCompatibility)</code>
 <div class="block">Toggles the "Classic Compatible" mode.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<tr id="i66" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setClassicCompatibleAsInt-int-">setClassicCompatibleAsInt</a></span>(int&nbsp;classicCompatibility)</code>
 <div class="block">Same as <a href="../../freemarker/core/Configurable.html#setClassicCompatible-boolean-"><code>setClassicCompatible(boolean)</code></a>, but allows some extra values.</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
+<tr id="i67" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setCustomAttribute-java.lang.String-java.lang.Object-">setCustomAttribute</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/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value)</code>
 <div class="block">Sets a named custom attribute for this configurable.</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i68" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-">setCustomDateFormats</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a>&gt;&nbsp;customDateFormats)</code>
+<div class="block">Associates names with formatter factories, which then can be referred by the <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>date_format</code></a>, <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>time_format</code></a>, and <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>datetime_format</code></a> settings with values starting with <code>@<i>name</i></code>.</div>
+</td>
+</tr>
+<tr id="i69" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-">setCustomNumberFormats</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&gt;&nbsp;customNumberFormats)</code>
+<div class="block">Associates names with formatter factories, which then can be referred by the <a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-"><code>number_format</code></a> setting with values starting with <code>@<i>name</i></code>.</div>
+</td>
+</tr>
+<tr id="i70" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setDateFormat-java.lang.String-">setDateFormat</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;dateFormat)</code>
 <div class="block">Sets the format used to convert <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>-s to string-s that are date (no time part) values,
  also the format that <code>someString?date</code> will use to parse strings.</div>
 </td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i71" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-">setDateTimeFormat</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;dateTimeFormat)</code>
 <div class="block">Sets the format used to convert <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>-s to string-s that are date-time (timestamp) values,
  also the format that <code>someString?datetime</code> will use to parse strings.</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i72" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setLocale-java.util.Locale-">setLocale</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
 <div class="block">Sets the default locale used for number and date formatting (among others), also the locale used for searching
  localized template variations when no locale was explicitly requested.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i73" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setLogTemplateExceptions-boolean-">setLogTemplateExceptions</a></span>(boolean&nbsp;value)</code>
 <div class="block">Specifies if <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template"><code>TemplateException</code></a>-s thrown by template processing are logged by FreeMarker or not.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i74" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setNewBuiltinClassResolver-freemarker.core.TemplateClassResolver-">setNewBuiltinClassResolver</a></span>(<a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core">TemplateClassResolver</a>&nbsp;newBuiltinClassResolver)</code>
 <div class="block">Sets the <a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><code>TemplateClassResolver</code></a> that is used when the
  <code>new</code> built-in is called in a template.</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr id="i75" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-">setNumberFormat</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;numberFormat)</code>
 <div class="block">Sets the default number format used to convert numbers to strings.</div>
 </td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr id="i76" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setObjectWrapper-freemarker.template.ObjectWrapper-">setObjectWrapper</a></span>(<a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template">ObjectWrapper</a>&nbsp;objectWrapper)</code>
 <div class="block">Sets the object wrapper used to wrap objects to <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a>-s.</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i77" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setOutputEncoding-java.lang.String-">setOutputEncoding</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;outputEncoding)</code>
 <div class="block">Informs FreeMarker about the charset used for the output.</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i78" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setSetting-java.lang.String-java.lang.String-">setSetting</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;value)</code>
 <div class="block">Sets a FreeMarker setting by a name and string value.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i79" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setSettings-java.io.InputStream-">setSettings</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html?is-external=true" title="class or interface in java.io">InputStream</a>&nbsp;propsIn)</code>
 <div class="block">Reads a setting list (key and element pairs) from the input stream.</div>
 </td>
 </tr>
-<tr id="i51" class="rowColor">
+<tr id="i80" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setSettings-java.util.Properties-">setSettings</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;props)</code>
 <div class="block">Set the settings stored in a <code>Properties</code> object.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr id="i81" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setShowErrorTips-boolean-">setShowErrorTips</a></span>(boolean&nbsp;showTips)</code>
 <div class="block">Sets if tips should be shown in error messages of errors arising during template processing.</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr id="i82" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setSQLDateAndTimeTimeZone-java.util.TimeZone-">setSQLDateAndTimeTimeZone</a></span>(<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;tz)</code>
 <div class="block">Sets the time zone used when dealing with <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Date.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Date</code></a> and
  <a href="http://docs.oracle.com/javase/8/docs/api/java/sql/Time.html?is-external=true" title="class or interface in java.sql"><code>java.sql.Time</code></a> values.</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr id="i83" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setStrictBeanModels-boolean-">setStrictBeanModels</a></span>(boolean&nbsp;strict)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setStrictBeanModels-boolean-">setStrictBeanModels</a></span>(boolean&nbsp;strict)</code>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Set this on the <a href="../../freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> itself.</span></div>
+</div>
+</td>
 </tr>
-<tr id="i55" class="rowColor">
+<tr id="i84" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-">setTemplateExceptionHandler</a></span>(<a href="../../freemarker/template/TemplateExceptionHandler.html" title="interface in freemarker.template">TemplateExceptionHandler</a>&nbsp;templateExceptionHandler)</code>
 <div class="block">Sets the exception handler used to handle exceptions occurring inside templates.</div>
 </td>
 </tr>
-<tr id="i56" class="altColor">
+<tr id="i85" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setTimeFormat-java.lang.String-">setTimeFormat</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;timeFormat)</code>
 <div class="block">Sets the format used to convert <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>-s to string-s that are time (no date part) values,
  also the format that <code>someString?time</code> will use to parse strings.</div>
 </td>
 </tr>
-<tr id="i57" class="rowColor">
+<tr id="i86" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setTimeZone-java.util.TimeZone-">setTimeZone</a></span>(<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)</code>
 <div class="block">Sets the time zone to use when formatting date/time values.</div>
 </td>
 </tr>
-<tr id="i58" class="altColor">
+<tr id="i87" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#settingValueAssignmentException-java.lang.String-java.lang.String-java.lang.Throwable-">settingValueAssignmentException</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;value,
                                <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause)</code>&nbsp;</td>
 </tr>
-<tr id="i59" class="rowColor">
+<tr id="i88" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#setURLEscapingCharset-java.lang.String-">setURLEscapingCharset</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;urlEscapingCharset)</code>
 <div class="block">Sets the URL escaping charset.</div>
 </td>
 </tr>
-<tr id="i60" class="altColor">
+<tr id="i89" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template">TemplateException</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/Configurable.html#unknownSettingException-java.lang.String-">unknownSettingException</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">Creates the exception that should be thrown when a setting name isn't recognized.</div>
@@ -1062,6 +1272,48 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE</pre>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name. @since 2.3.23</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.Configurable.CUSTOM_NUMBER_FORMATS_KEY_SNAKE_CASE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE</pre>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name. @since 2.3.23</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.Configurable.CUSTOM_NUMBER_FORMATS_KEY_CAMEL_CASE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOM_NUMBER_FORMATS_KEY">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOM_NUMBER_FORMATS_KEY</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> CUSTOM_NUMBER_FORMATS_KEY</pre>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.Configurable.CUSTOM_NUMBER_FORMATS_KEY">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="TIME_FORMAT_KEY_SNAKE_CASE">
 <!--   -->
 </a>
@@ -1146,6 +1398,48 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE</pre>
+<div class="block">Legacy, snake case (<code>like_this</code>) variation of the setting name. @since 2.3.23</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.Configurable.CUSTOM_DATE_FORMATS_KEY_SNAKE_CASE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE</pre>
+<div class="block">Modern, camel case (<code>likeThis</code>) variation of the setting name. @since 2.3.23</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.Configurable.CUSTOM_DATE_FORMATS_KEY_CAMEL_CASE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CUSTOM_DATE_FORMATS_KEY">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CUSTOM_DATE_FORMATS_KEY</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> CUSTOM_DATE_FORMATS_KEY</pre>
+<div class="block">Alias to the <code>..._SNAKE_CASE</code> variation due to backward compatibility constraints.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#freemarker.core.Configurable.CUSTOM_DATE_FORMATS_KEY">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="DATETIME_FORMAT_KEY_SNAKE_CASE">
 <!--   -->
 </a>
@@ -1824,7 +2118,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>STRICT_BEAN_MODELS</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> STRICT_BEAN_MODELS</pre>
+<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 static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> STRICT_BEAN_MODELS</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../freemarker/core/Configurable.html#STRICT_BEAN_MODELS_KEY"><code>STRICT_BEAN_MODELS_KEY</code></a> instead.</span></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -1846,7 +2141,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>Configurable</h4>
-<pre>public&nbsp;Configurable()</pre>
+<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;Configurable()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This shouldn't even be public; don't use it.</span></div>
 <div class="block">Creates a top-level configurable, one that doesn't inherit from a parent, and thus stores the default values.</div>
 </li>
@@ -2020,6 +2316,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <pre>public&nbsp;int&nbsp;getClassicCompatibleAsInt()</pre>
 </li>
 </ul>
+<a name="isClassicCompatibleSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isClassicCompatibleSet</h4>
+<pre>public&nbsp;boolean&nbsp;isClassicCompatibleSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setLocale-java.util.Locale-">
 <!--   -->
 </a>
@@ -2035,14 +2345,29 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
-<a name="getTimeZone--">
+<a name="getLocale--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getTimeZone</h4>
-<pre>public&nbsp;<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;getTimeZone()</pre>
-<div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setTimeZone-java.util.TimeZone-"><code>setTimeZone(TimeZone)</code></a>.</div>
+<h4>getLocale</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;getLocale()</pre>
+<div class="block">Returns the assumed locale when searching for template files with no
+ explicit requested locale. Defaults to system locale.</div>
+</li>
+</ul>
+<a name="isLocaleSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLocaleSet</h4>
+<pre>public&nbsp;boolean&nbsp;isLocaleSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
 </li>
 </ul>
 <a name="setTimeZone-java.util.TimeZone-">
@@ -2065,6 +2390,30 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="getTimeZone--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTimeZone</h4>
+<pre>public&nbsp;<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;getTimeZone()</pre>
+<div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setTimeZone-java.util.TimeZone-"><code>setTimeZone(TimeZone)</code></a>.</div>
+</li>
+</ul>
+<a name="isTimeZoneSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isTimeZoneSet</h4>
+<pre>public&nbsp;boolean&nbsp;isTimeZoneSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setSQLDateAndTimeTimeZone-java.util.TimeZone-">
 <!--   -->
 </a>
@@ -2153,15 +2502,18 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
-<a name="getLocale--">
+<a name="isSQLDateAndTimeTimeZoneSet--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getLocale</h4>
-<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;getLocale()</pre>
-<div class="block">Returns the assumed locale when searching for template files with no
- explicit requested locale. Defaults to system locale.</div>
+<h4>isSQLDateAndTimeTimeZoneSet</h4>
+<pre>public&nbsp;boolean&nbsp;isSQLDateAndTimeTimeZoneSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
 </li>
 </ul>
 <a name="setNumberFormat-java.lang.String-">
@@ -2171,14 +2523,28 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <li class="blockList">
 <h4>setNumberFormat</h4>
 <pre>public&nbsp;void&nbsp;setNumberFormat(<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;numberFormat)</pre>
-<div class="block">Sets the default number format used to convert numbers to strings. Currently, this is either a
- <a href="http://docs.oracle.com/javase/8/docs/api/java/text/DecimalFormat.html?is-external=true" title="class or interface in java.text"><code>DecimalFormat</code></a> pattern (like <code>"0.##"</code>), or one of the following special values:
+<div class="block">Sets the default number format used to convert numbers to strings. Currently, this is one of these:
  <ul>
    <li><code>"number"</code>: The number format returned by <a href="http://docs.oracle.com/javase/8/docs/api/java/text/NumberFormat.html?is-external=true#getNumberInstance-java.util.Locale-" title="class or interface in java.text"><code>NumberFormat.getNumberInstance(Locale)</code></a></li>
    <li><code>"currency"</code>: The number format returned by <a href="http://docs.oracle.com/javase/8/docs/api/java/text/NumberFormat.html?is-external=true#getCurrencyInstance-java.util.Locale-" title="class or interface in java.text"><code>NumberFormat.getCurrencyInstance(Locale)</code></a></li>
    <li><code>"percent"</code>: The number format returned by <a href="http://docs.oracle.com/javase/8/docs/api/java/text/NumberFormat.html?is-external=true#getPercentInstance-java.util.Locale-" title="class or interface in java.text"><code>NumberFormat.getPercentInstance(Locale)</code></a></li>
    <li><code>"computer"</code>: The number format used by FTL's <code>c</code> built-in (like in <code>someNumber?c</code>).</li>
+   <li><a href="http://docs.oracle.com/javase/8/docs/api/java/text/DecimalFormat.html?is-external=true" title="class or interface in java.text"><code>DecimalFormat</code></a> pattern (like <code>"0.##"</code>). This syntax has a FreeMarker-specific
+       extension, so that you can specify options like the rounding mode and the symbols used in this string. For
+       example, <code>",000;; roundingMode=halfUp groupingSeparator=_"</code> will format numbers like <code>",000"</code>
+       would, but with half-up rounding mode, and <code>_</code> as the group separator. See more about "extended Java
+       decimal format" in the FreeMarker Manual.
+       </li>
+   <li>If the string starts with <code>@</code> character followed by a letter then it's interpreted as a custom number
+       format, but only if either <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a> is at least 2.3.24, or
+       there's any custom formats defined (even if custom date/time/dateTime format). The format of a such string
+       is <code>"@<i>name</i>"</code> or <code>"@<i>name</i> <i>parameters</i>"</code>, where
+       <code><i>name</i></code> is the key in the <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> set by <a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>setCustomNumberFormats(Map)</code></a>, and
+       <code><i>parameters</i></code> is parsed by the custom <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>.
+   </li>
  </ul>
+ 
+   
  <p>Defaults to <tt>"number"</tt>.</div>
 </li>
 </ul>
@@ -2192,6 +2558,96 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">Getter pair of <a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-"><code>setNumberFormat(String)</code></a>.</div>
 </li>
 </ul>
+<a name="isNumberFormatSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isNumberFormatSet</h4>
+<pre>public&nbsp;boolean&nbsp;isNumberFormatSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="getCustomNumberFormats--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCustomNumberFormats</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&gt;&nbsp;getCustomNumberFormats()</pre>
+<div class="block">Getter pair of <a href="../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>setCustomNumberFormats(Map)</code></a>;  do not modify the returned <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>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="setCustomNumberFormats-java.util.Map-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCustomNumberFormats</h4>
+<pre>public&nbsp;void&nbsp;setCustomNumberFormats(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&gt;&nbsp;customNumberFormats)</pre>
+<div class="block">Associates names with formatter factories, which then can be referred by the <a href="../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-"><code>number_format</code></a> setting with values starting with <code>@<i>name</i></code>. Beware, if you specify any custom
+ formats here, an initial <code>@</code> followed by a letter will have special meaning in number/date/time/datetime
+ format strings, even if <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>incompatible_improvements</code></a> is less
+ than 2.3.24 (starting with <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>incompatible_improvements</code></a> 2.3.24
+ <code>@</code> always has special meaning).</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>customNumberFormats</code> - Can't be <code>null</code>. The name must start with an UNICODE letter, and can only contain UNICODE
+            letters and digits (not <code>_</code>).</dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="isCustomNumberFormatsSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isCustomNumberFormatsSet</h4>
+<pre>public&nbsp;boolean&nbsp;isCustomNumberFormatsSet()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="getCustomNumberFormat-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCustomNumberFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&nbsp;getCustomNumberFormat(<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">Gets the custom name format registered for the name.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="hasCustomFormats--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>hasCustomFormats</h4>
+<pre>public&nbsp;boolean&nbsp;hasCustomFormats()</pre>
+<div class="block">Tells if this configurable object or its parent defines any custom formats.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setBooleanFormat-java.lang.String-">
 <!--   -->
 </a>
@@ -2221,6 +2677,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setBooleanFormat-java.lang.String-"><code>setBooleanFormat(String)</code></a>.</div>
 </li>
 </ul>
+<a name="isBooleanFormatSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isBooleanFormatSet</h4>
+<pre>public&nbsp;boolean&nbsp;isBooleanFormatSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setTimeFormat-java.lang.String-">
 <!--   -->
 </a>
@@ -2246,6 +2716,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setTimeFormat-java.lang.String-"><code>setTimeFormat(String)</code></a>.</div>
 </li>
 </ul>
+<a name="isTimeFormatSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isTimeFormatSet</h4>
+<pre>public&nbsp;boolean&nbsp;isTimeFormatSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setDateFormat-java.lang.String-">
 <!--   -->
 </a>
@@ -2258,7 +2742,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
  
  <p>For the possible values see <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>setDateTimeFormat(String)</code></a>.
    
- <p>Defaults to <code>""</code>, which means "use the FreeMarker default", which is currently <code>"code"</code>.</div>
+ <p>Defaults to <code>""</code>, which means "use the FreeMarker default", which is currently <code>"medium"</code>.</div>
 </li>
 </ul>
 <a name="getDateFormat--">
@@ -2271,6 +2755,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setDateFormat-java.lang.String-"><code>setDateFormat(String)</code></a>.</div>
 </li>
 </ul>
+<a name="isDateFormatSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isDateFormatSet</h4>
+<pre>public&nbsp;boolean&nbsp;isDateFormatSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setDateTimeFormat-java.lang.String-">
 <!--   -->
 </a>
@@ -2351,9 +2849,17 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
        For date-time values, you can specify the length of the date and time part independently, be separating
        them with <code>_</code>, like <code>"short_medium"</code>. (<code>"medium"</code> means
        <code>"medium_medium"</code> for date-time values.)
+       
+   <li><p>Anything that starts with <code>"@"</code> followed by a letter is interpreted as a custom
+       date/time/dateTime format, but only if either <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>Configuration.getIncompatibleImprovements()</code></a>
+       is at least 2.3.24, or there's any custom formats defined (even if custom number format). The format of
+       such string is <code>"@<i>name</i>"</code> or <code>"@<i>name</i> <i>parameters</i>"</code>, where
+       <code><i>name</i></code> is the key in the <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> set by <a href="../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-"><code>setCustomDateFormats(Map)</code></a>, and
+       <code><i>parameters</i></code> is parsed by the custom number format.
+       
  </ul> 
-   
- <p>Defaults to <code>""</code>, which means "use the FreeMarker default", which is currently <code>"code"</code>.</div>
+ 
+ <p>Defaults to <code>""</code>, which means "use the FreeMarker default", which is currently <code>"medium_medium"</code>.</div>
 </li>
 </ul>
 <a name="getDateTimeFormat--">
@@ -2366,6 +2872,82 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>setDateTimeFormat(String)</code></a>.</div>
 </li>
 </ul>
+<a name="isDateTimeFormatSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isDateTimeFormatSet</h4>
+<pre>public&nbsp;boolean&nbsp;isDateTimeFormatSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="getCustomDateFormats--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCustomDateFormats</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a>&gt;&nbsp;getCustomDateFormats()</pre>
+<div class="block">Getter pair of <a href="../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-"><code>setCustomDateFormats(Map)</code></a>; do not modify the returned <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>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="setCustomDateFormats-java.util.Map-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCustomDateFormats</h4>
+<pre>public&nbsp;void&nbsp;setCustomDateFormats(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a>&gt;&nbsp;customDateFormats)</pre>
+<div class="block">Associates names with formatter factories, which then can be referred by the <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>date_format</code></a>, <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>time_format</code></a>, and <a href="../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>datetime_format</code></a> settings with values starting with <code>@<i>name</i></code>. Beware, if you specify any custom
+ formats here, an initial <code>@</code> followed by a letter will have special meaning in number/date/time/datetime
+ format strings, even if <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>incompatible_improvements</code></a> is less
+ than 2.3.24 (starting with <a href="../../freemarker/template/Configuration.html#getIncompatibleImprovements--"><code>incompatible_improvements</code></a> 2.3.24
+ <code>@</code> always has special meaning).</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>customDateFormats</code> - Can't be <code>null</code>. The name must start with an UNICODE letter, and can only contain UNICODE
+            letters and digits.</dd>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="isCustomDateFormatsSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isCustomDateFormatsSet</h4>
+<pre>public&nbsp;boolean&nbsp;isCustomDateFormatsSet()</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
+<a name="getCustomDateFormat-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCustomDateFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a>&nbsp;getCustomDateFormat(<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">Gets the custom name format registered for the name.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-">
 <!--   -->
 </a>
@@ -2403,6 +2985,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setTemplateExceptionHandler-freemarker.template.TemplateExceptionHandler-"><code>setTemplateExceptionHandler(TemplateExceptionHandler)</code></a>.</div>
 </li>
 </ul>
+<a name="isTemplateExceptionHandlerSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isTemplateExceptionHandlerSet</h4>
+<pre>public&nbsp;boolean&nbsp;isTemplateExceptionHandlerSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setArithmeticEngine-freemarker.core.ArithmeticEngine-">
 <!--   -->
 </a>
@@ -2424,6 +3020,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setArithmeticEngine-freemarker.core.ArithmeticEngine-"><code>setArithmeticEngine(ArithmeticEngine)</code></a>.</div>
 </li>
 </ul>
+<a name="isArithmeticEngineSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isArithmeticEngineSet</h4>
+<pre>public&nbsp;boolean&nbsp;isArithmeticEngineSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setObjectWrapper-freemarker.template.ObjectWrapper-">
 <!--   -->
 </a>
@@ -2445,6 +3055,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <div class="block">The getter pair of <a href="../../freemarker/core/Configurable.html#setObjectWrapper-freemarker.template.ObjectWrapper-"><code>setObjectWrapper(ObjectWrapper)</code></a>.</div>
 </li>
 </ul>
+<a name="isObjectWrapperSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isObjectWrapperSet</h4>
+<pre>public&nbsp;boolean&nbsp;isObjectWrapperSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setOutputEncoding-java.lang.String-">
 <!--   -->
 </a>
@@ -2469,6 +3093,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getOutputEncoding()</pre>
 </li>
 </ul>
+<a name="isOutputEncodingSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOutputEncodingSet</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputEncodingSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setURLEscapingCharset-java.lang.String-">
 <!--   -->
 </a>
@@ -2491,6 +3129,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getURLEscapingCharset()</pre>
 </li>
 </ul>
+<a name="isURLEscapingCharsetSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isURLEscapingCharsetSet</h4>
+<pre>public&nbsp;boolean&nbsp;isURLEscapingCharsetSet()</pre>
+<div class="block">Tells if this setting is set directly in this object or its value is coming from the <a href="../../freemarker/core/Configurable.html#getParent--"><code>parent</code></a>.</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>2.3.24</dd>
+</dl>
+</li>
+</ul>
 <a name="setNewBuiltinClassResolver-freemarker.core.TemplateClassResolver-">
 <!--   -->
 </a>
@@ -2528,6 +3180,20 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </dl>
 </li>
 </ul>
+<a name="isNewBuiltinClassResolverSet--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isNewBuiltinClassResolverSet</h4>
+<pre>public&nbsp;boolean&nbsp;isNewBuiltinClassResolverSet()</pre>
+<div 

<TRUNCATED>


[22/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/TemplateDateFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateDateFormat.html b/docs/api/freemarker/core/class-use/TemplateDateFormat.html
new file mode 100644
index 0000000..8d86f67
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateDateFormat.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.core.TemplateDateFormat (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.core.TemplateDateFormat (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/core/TemplateDateFormat.html" title="class in freemarker.core">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/core/class-use/TemplateDateFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateDateFormat.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.core.TemplateDateFormat" class="title">Uses of Class<br>freemarker.core.TemplateDateFormat</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/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateDateFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateDateFormatFactory.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>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AliasTemplateDateFormatFactory.</span><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>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-int-java.lang.Class-">getTemplateDateFormat</a></span>(int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass)</code>
+<div class="block">Gets a <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> using the date/time/datetime format settings and the current locale and time
+ zone.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass)</code>
+<div class="block">Gets a <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> for the specified format string and the current locale and time zone.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-java.util.Locale-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass,
+                     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
+<div class="block">Like <a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-"><code>Environment.getTemplateDateFormat(String, int, Class)</code></a>, but allows you to use a different locale than the
+ current one.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-java.util.Locale-java.util.TimeZone-java.util.TimeZone-">getTemplateDateFormat</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;formatString,
+                     int&nbsp;dateType,
+                     <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;? extends <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Date.html?is-external=true" title="class or interface in java.util">Date</a>&gt;&nbsp;dateClass,
+                     <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,
+                     <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;sqlDateAndTimeTimeZone)</code>
+<div class="block">Like <a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.lang.Class-"><code>Environment.getTemplateDateFormat(String, int, Class)</code></a>, but allows you to use a different locale and time zone
+ than the current one.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core">TemplateDateFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateDateFormat-java.lang.String-int-java.util.Locale-java.util.TimeZone-boolean-">getTemplateDateFormat</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;formatString,
+                     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)</code>
+<div class="block">Gets a <a href="../../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a> for the specified parameters.</div>
+</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/core/TemplateDateFormat.html" title="class in freemarker.core">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/core/class-use/TemplateDateFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateDateFormat.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/core/class-use/TemplateDateFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateDateFormatFactory.html b/docs/api/freemarker/core/class-use/TemplateDateFormatFactory.html
new file mode 100644
index 0000000..5ed978f
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateDateFormatFactory.html
@@ -0,0 +1,215 @@
+<!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.core.TemplateDateFormatFactory (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.core.TemplateDateFormatFactory (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/core/TemplateDateFormatFactory.html" title="class in freemarker.core">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/core/class-use/TemplateDateFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateDateFormatFactory.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.core.TemplateDateFormatFactory" class="title">Uses of Class<br>freemarker.core.TemplateDateFormatFactory</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/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core">AliasTemplateDateFormatFactory</a></span></code>
+<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>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#getCustomDateFormat-java.lang.String-">getCustomDateFormat</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Gets the custom name format registered for the name.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return types with arguments of type <a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#getCustomDateFormats--">getCustomDateFormats</a></span>()</code>
+<div class="block">Getter pair of <a href="../../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-"><code>Configurable.setCustomDateFormats(Map)</code></a>; do not modify the returned <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>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with type arguments of type <a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#setCustomDateFormats-java.util.Map-">setCustomDateFormats</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core">TemplateDateFormatFactory</a>&gt;&nbsp;customDateFormats)</code>
+<div class="block">Associates names with formatter factories, which then can be referred by the <a href="../../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>date_format</code></a>, <a href="../../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>time_format</code></a>, and <a href="../../../freemarker/core/Configurable.html#setDateTimeFormat-java.lang.String-"><code>datetime_format</code></a> settings with values starting with <code>@<i>name</i></code>.</div>
+</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/core/TemplateDateFormatFactory.html" title="class in freemarker.core">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/core/class-use/TemplateDateFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateDateFormatFactory.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/core/class-use/TemplateFormatUtil.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateFormatUtil.html b/docs/api/freemarker/core/class-use/TemplateFormatUtil.html
new file mode 100644
index 0000000..4fe1eb3
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateFormatUtil.html
@@ -0,0 +1,125 @@
+<!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.core.TemplateFormatUtil (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.core.TemplateFormatUtil (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/core/TemplateFormatUtil.html" title="class in freemarker.core">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/core/class-use/TemplateFormatUtil.html" target="_top">Frames</a></li>
+<li><a href="TemplateFormatUtil.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.core.TemplateFormatUtil" class="title">Uses of Class<br>freemarker.core.TemplateFormatUtil</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.TemplateFormatUtil</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/core/TemplateFormatUtil.html" title="class in freemarker.core">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/core/class-use/TemplateFormatUtil.html" target="_top">Frames</a></li>
+<li><a href="TemplateFormatUtil.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/core/class-use/TemplateHTMLOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateHTMLOutputModel.html b/docs/api/freemarker/core/class-use/TemplateHTMLOutputModel.html
new file mode 100644
index 0000000..10da89f
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateHTMLOutputModel.html
@@ -0,0 +1,168 @@
+<!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.core.TemplateHTMLOutputModel (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.core.TemplateHTMLOutputModel (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/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateHTMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateHTMLOutputModel.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.core.TemplateHTMLOutputModel" class="title">Uses of Class<br>freemarker.core.TemplateHTMLOutputModel</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/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a href="../../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">HTMLOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/HTMLOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</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/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateHTMLOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateHTMLOutputModel.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/core/class-use/TemplateMarkupOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateMarkupOutputModel.html b/docs/api/freemarker/core/class-use/TemplateMarkupOutputModel.html
new file mode 100644
index 0000000..fac9076
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateMarkupOutputModel.html
@@ -0,0 +1,223 @@
+<!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 Interface freemarker.core.TemplateMarkupOutputModel (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 Interface freemarker.core.TemplateMarkupOutputModel (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/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">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/core/class-use/TemplateMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateMarkupOutputModel.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 Interface freemarker.core.TemplateMarkupOutputModel" class="title">Uses of Interface<br>freemarker.core.TemplateMarkupOutputModel</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/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with type parameters of type <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</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/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;MO extends <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</span></code>
+<div class="block">Superclass of <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>-s that represent a "markup" format, which is any format where certain character
+ sequences have special meaning and thus may need escaping.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>interface&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO extends <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</span></code>
+<div class="block">"markup output" template language data-type; stores markup (some kind of "rich text" / structured format, as opposed
+ to plain text) that meant to be printed as template output.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that implement <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</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/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO extends <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&lt;MO&gt;&gt;</span></code>
+<div class="block">Common superclass for implementing <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
+ <a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></span></code>
+<div class="block">Stores combined markup to be printed; used with <a href="../../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core">TemplateHTMLOutputModel</a></span></code>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></span></code>
+<div class="block">Stores RTF markup to be printed; used with <a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><code>RTFOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core">TemplateXHTMLOutputModel</a></span></code>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core">TemplateXMLOutputModel</a></span></code>
+<div class="block">Stores XML markup to be printed; used with <a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</div>
+</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/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">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/core/class-use/TemplateMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateMarkupOutputModel.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/core/class-use/TemplateNumberFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateNumberFormat.html b/docs/api/freemarker/core/class-use/TemplateNumberFormat.html
new file mode 100644
index 0000000..fd42a19
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateNumberFormat.html
@@ -0,0 +1,196 @@
+<!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.core.TemplateNumberFormat (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.core.TemplateNumberFormat (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/core/TemplateNumberFormat.html" title="class in freemarker.core">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/core/class-use/TemplateNumberFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateNumberFormat.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.core.TemplateNumberFormat" class="title">Uses of Class<br>freemarker.core.TemplateNumberFormat</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/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateNumberFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-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,
+   <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="../../../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>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">AliasTemplateNumberFormatFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/AliasTemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-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,
+   <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="../../../freemarker/core/Environment.html" title="class in freemarker.core">Environment</a>&nbsp;env)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateNumberFormat--">getTemplateNumberFormat</a></span>()</code>
+<div class="block">Returns the current number format (<a href="../../../freemarker/core/Configurable.html#getNumberFormat--"><code>Configurable.getNumberFormat()</code></a>) as <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateNumberFormat-java.lang.String-">getTemplateNumberFormat</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;formatString)</code>
+<div class="block">Returns the number format as <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a> for the given format string and the current locale.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Environment.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Environment.html#getTemplateNumberFormat-java.lang.String-java.util.Locale-">getTemplateNumberFormat</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;formatString,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Locale.html?is-external=true" title="class or interface in java.util">Locale</a>&nbsp;locale)</code>
+<div class="block">Returns the number format as <a href="../../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>, for the given format string and locale.</div>
+</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/core/TemplateNumberFormat.html" title="class in freemarker.core">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/core/class-use/TemplateNumberFormat.html" target="_top">Frames</a></li>
+<li><a href="TemplateNumberFormat.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/core/class-use/TemplateNumberFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateNumberFormatFactory.html b/docs/api/freemarker/core/class-use/TemplateNumberFormatFactory.html
new file mode 100644
index 0000000..b9c278c
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateNumberFormatFactory.html
@@ -0,0 +1,215 @@
+<!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.core.TemplateNumberFormatFactory (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.core.TemplateNumberFormatFactory (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/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">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/core/class-use/TemplateNumberFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateNumberFormatFactory.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.core.TemplateNumberFormatFactory" class="title">Uses of Class<br>freemarker.core.TemplateNumberFormatFactory</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/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core">AliasTemplateNumberFormatFactory</a></span></code>
+<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>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#getCustomNumberFormat-java.lang.String-">getCustomNumberFormat</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
+<div class="block">Gets the custom name format registered for the name.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return types with arguments of type <a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#getCustomNumberFormats--">getCustomNumberFormats</a></span>()</code>
+<div class="block">Getter pair of <a href="../../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-"><code>Configurable.setCustomNumberFormats(Map)</code></a>;  do not modify the returned <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>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with type arguments of type <a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Configurable.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/Configurable.html#setCustomNumberFormats-java.util.Map-">setCustomNumberFormats</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,? extends <a href="../../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</a>&gt;&nbsp;customNumberFormats)</code>
+<div class="block">Associates names with formatter factories, which then can be referred by the <a href="../../../freemarker/core/Configurable.html#setNumberFormat-java.lang.String-"><code>number_format</code></a> setting with values starting with <code>@<i>name</i></code>.</div>
+</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/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">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/core/class-use/TemplateNumberFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="TemplateNumberFormatFactory.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/core/class-use/TemplateRTFOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateRTFOutputModel.html b/docs/api/freemarker/core/class-use/TemplateRTFOutputModel.html
new file mode 100644
index 0000000..9fc576d
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateRTFOutputModel.html
@@ -0,0 +1,168 @@
+<!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.core.TemplateRTFOutputModel (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.core.TemplateRTFOutputModel (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/core/TemplateRTFOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateRTFOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateRTFOutputModel.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.core.TemplateRTFOutputModel" class="title">Uses of Class<br>freemarker.core.TemplateRTFOutputModel</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/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a href="../../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core">TemplateRTFOutputModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RTFOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/RTFOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</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/core/TemplateRTFOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateRTFOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateRTFOutputModel.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>


[23/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/OutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/OutputFormat.html b/docs/api/freemarker/core/class-use/OutputFormat.html
new file mode 100644
index 0000000..5ffecdb
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/OutputFormat.html
@@ -0,0 +1,359 @@
+<!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.core.OutputFormat (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.core.OutputFormat (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/core/OutputFormat.html" title="class in freemarker.core">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/core/class-use/OutputFormat.html" target="_top">Frames</a></li>
+<li><a href="OutputFormat.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.core.OutputFormat" class="title">Uses of Class<br>freemarker.core.OutputFormat</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/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
+<td class="colLast">
+<div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
+start with <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> (see also the
+<a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
+<caption><span>Subclasses of <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</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/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core">CombinedMarkupOutputFormat</a></span></code>
+<div class="block">Represents two markup formats nested into each other.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;MO extends <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core">CommonTemplateMarkupOutputModel</a>&gt;</span></code>
+<div class="block">Common superclass for implementing <a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="../../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
+ subclass.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></span></code>
+<div class="block">Represents the CSS output format (MIME type "text/css", name "CSS").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core">HTMLOutputFormat</a></span></code>
+<div class="block">Represents the HTML output format (MIME type "text/html", name "HTML").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core">JavaScriptOutputFormat</a></span></code>
+<div class="block">Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core">JSONOutputFormat</a></span></code>
+<div class="block">Represents the JSON output format (MIME type "application/json", name "JSON").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;MO extends <a href="../../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&gt;</span></code>
+<div class="block">Superclass of <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>-s that represent a "markup" format, which is any format where certain character
+ sequences have special meaning and thus may need escaping.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></span></code>
+<div class="block">Represents the plain text output format (MIME type "text/plain", name "plainText").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></span></code>
+<div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core">UndefinedOutputFormat</a></span></code>
+<div class="block">Represents the output format used when the template output format is undecided.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core">XHTMLOutputFormat</a></span></code>
+<div class="block">Represents the XML output format (MIME type "application/xhtml+xml", name "XHTML").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core">XMLOutputFormat</a></span></code>
+<div class="block">Represents the XML output format (MIME type "application/xml", name "XML").</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">The getter pair of <a href="../../../freemarker/core/TemplateConfiguration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>TemplateConfiguration.setOutputFormat(OutputFormat)</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ParserConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/ParserConfiguration.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">See <a href="../../../freemarker/core/Configurable.html#getOutputEncoding--"><code>Configurable.getOutputEncoding()</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with parameters of type <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#setOutputFormat-freemarker.core.OutputFormat-">setOutputFormat</a></span>(<a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&nbsp;outputFormat)</code>
+<div class="block">Sets the output format of the template; see <a href="../../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a> for more.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="freemarker.template">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that return <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Template.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Returns the output format (see <a href="../../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a>) used for this template.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#getOutputFormat--">getOutputFormat</a></span>()</code>
+<div class="block">Getter pair of <a href="../../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-"><code>Configuration.setOutputFormat(OutputFormat)</code></a></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#getOutputFormat-java.lang.String-">getOutputFormat</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">Returns the output format for a name.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that return types with arguments of type <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&gt;</code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#getRegisteredCustomOutputFormats--">getRegisteredCustomOutputFormats</a></span>()</code>
+<div class="block">Getter pair of <a href="../../../freemarker/template/Configuration.html#setRegisteredCustomOutputFormats-java.util.Collection-"><code>Configuration.setRegisteredCustomOutputFormats(Collection)</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> with parameters of type <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#setOutputFormat-freemarker.core.OutputFormat-">setOutputFormat</a></span>(<a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&nbsp;outputFormat)</code>
+<div class="block">Sets the default output format.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Method parameters in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> with type arguments of type <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">Configuration.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Configuration.html#setRegisteredCustomOutputFormats-java.util.Collection-">setRegisteredCustomOutputFormats</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;? extends <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a>&gt;&nbsp;registeredCustomOutputFormats)</code>
+<div class="block">Sets the custom output formats that can be referred by their unique name (<a href="../../../freemarker/core/OutputFormat.html#getName--"><code>getName()</code></a>) from
+ templates.</div>
+</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/core/OutputFormat.html" title="class in freemarker.core">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/core/class-use/OutputFormat.html" target="_top">Frames</a></li>
+<li><a href="OutputFormat.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/core/class-use/ParseException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/ParseException.html b/docs/api/freemarker/core/class-use/ParseException.html
index 06ce04a..847ff07 100644
--- a/docs/api/freemarker/core/class-use/ParseException.html
+++ b/docs/api/freemarker/core/class-use/ParseException.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.core.ParseException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.ParseException (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.core.ParseException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.ParseException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/ParserConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/ParserConfiguration.html b/docs/api/freemarker/core/class-use/ParserConfiguration.html
new file mode 100644
index 0000000..912ba0c
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/ParserConfiguration.html
@@ -0,0 +1,233 @@
+<!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 Interface freemarker.core.ParserConfiguration (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 Interface freemarker.core.ParserConfiguration (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/core/ParserConfiguration.html" title="interface in freemarker.core">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/core/class-use/ParserConfiguration.html" target="_top">Frames</a></li>
+<li><a href="ParserConfiguration.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 Interface freemarker.core.ParserConfiguration" class="title">Uses of Interface<br>freemarker.core.ParserConfiguration</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/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="#freemarker.template">freemarker.template</a></td>
+<td class="colLast">
+<div class="block"><b>The fundamental, most commonly used API-s of FreeMarker;</b>
+start with <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> (see also the
+<a href="http://freemarker.org/docs/pgui_quickstart.html" target="_blank">Getting Stared</a> in the Manual.)</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that implement <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</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/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></span></code>
+<div class="block">Used for customizing the configuration settings for individual <a href="../../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s (or rather groups of templates),
+ relatively to the common setting values coming from the <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="freemarker.template">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a> in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that implement <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</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/template/Configuration.html" title="class in freemarker.template">Configuration</a></span></code>
+<div class="block"><b>The main entry point into the FreeMarker API</b>; encapsulates the configuration settings of FreeMarker,
+ also serves as a central template-loading and caching service.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/template/package-summary.html">freemarker.template</a> that return <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">Template.</span><code><span class="memberNameLink"><a href="../../../freemarker/template/Template.html#getParserConfiguration--">getParserConfiguration</a></span>()</code>
+<div class="block">Returns the <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><code>ParserConfiguration</code></a> that was used for parsing this template.</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/template/package-summary.html">freemarker.template</a> with parameters of type <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</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/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-freemarker.core.ParserConfiguration-java.lang.String-">Template</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;reader,
+        <a href="../../../freemarker/template/Configuration.html" title="class in freemarker.template">Configuration</a>&nbsp;cfg,
+        <a href="../../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>&nbsp;customParserConfiguration,
+        <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;encoding)</code>
+<div class="block">Same as <a href="../../../freemarker/template/Template.html#Template-java.lang.String-java.lang.String-java.io.Reader-freemarker.template.Configuration-java.lang.String-"><code>Template.Template(String, String, Reader, Configuration, String)</code></a>, but also specifies a
+ <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</td>
+</tr>
+</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/core/ParserConfiguration.html" title="interface in freemarker.core">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/core/class-use/ParserConfiguration.html" target="_top">Frames</a></li>
+<li><a href="ParserConfiguration.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/core/class-use/ParsingNotSupportedException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/ParsingNotSupportedException.html b/docs/api/freemarker/core/class-use/ParsingNotSupportedException.html
new file mode 100644
index 0000000..c6e9208
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/ParsingNotSupportedException.html
@@ -0,0 +1,125 @@
+<!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.core.ParsingNotSupportedException (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.core.ParsingNotSupportedException (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/core/ParsingNotSupportedException.html" title="class in freemarker.core">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/core/class-use/ParsingNotSupportedException.html" target="_top">Frames</a></li>
+<li><a href="ParsingNotSupportedException.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.core.ParsingNotSupportedException" class="title">Uses of Class<br>freemarker.core.ParsingNotSupportedException</h2>
+</div>
+<div class="classUseContainer">No usage of freemarker.core.ParsingNotSupportedException</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/core/ParsingNotSupportedException.html" title="class in freemarker.core">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/core/class-use/ParsingNotSupportedException.html" target="_top">Frames</a></li>
+<li><a href="ParsingNotSupportedException.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/core/class-use/PlainTextOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/PlainTextOutputFormat.html b/docs/api/freemarker/core/class-use/PlainTextOutputFormat.html
new file mode 100644
index 0000000..716a146
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/PlainTextOutputFormat.html
@@ -0,0 +1,167 @@
+<!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.core.PlainTextOutputFormat (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.core.PlainTextOutputFormat (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/core/PlainTextOutputFormat.html" title="class in freemarker.core">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/core/class-use/PlainTextOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="PlainTextOutputFormat.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.core.PlainTextOutputFormat" class="title">Uses of Class<br>freemarker.core.PlainTextOutputFormat</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/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core">PlainTextOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">PlainTextOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/PlainTextOutputFormat.html#INSTANCE">INSTANCE</a></span></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/core/PlainTextOutputFormat.html" title="class in freemarker.core">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/core/class-use/PlainTextOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="PlainTextOutputFormat.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/core/class-use/RTFOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/RTFOutputFormat.html b/docs/api/freemarker/core/class-use/RTFOutputFormat.html
new file mode 100644
index 0000000..69cc318
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/RTFOutputFormat.html
@@ -0,0 +1,182 @@
+<!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.core.RTFOutputFormat (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.core.RTFOutputFormat (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/core/RTFOutputFormat.html" title="class in freemarker.core">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/core/class-use/RTFOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="RTFOutputFormat.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.core.RTFOutputFormat" class="title">Uses of Class<br>freemarker.core.RTFOutputFormat</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/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> declared as <a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">RTFOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/RTFOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core">RTFOutputFormat</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateRTFOutputModel.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateRTFOutputModel.html#getOutputFormat--">getOutputFormat</a></span>()</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/core/RTFOutputFormat.html" title="class in freemarker.core">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/core/class-use/RTFOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="RTFOutputFormat.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/core/class-use/StopException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/StopException.html b/docs/api/freemarker/core/class-use/StopException.html
index e497199..b5f36a3 100644
--- a/docs/api/freemarker/core/class-use/StopException.html
+++ b/docs/api/freemarker/core/class-use/StopException.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.core.StopException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.core.StopException (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.core.StopException (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.core.StopException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/TemplateClassResolver.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateClassResolver.html b/docs/api/freemarker/core/class-use/TemplateClassResolver.html
index 0a7b636..515d0a2 100644
--- a/docs/api/freemarker/core/class-use/TemplateClassResolver.html
+++ b/docs/api/freemarker/core/class-use/TemplateClassResolver.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 Interface freemarker.core.TemplateClassResolver (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.core.TemplateClassResolver (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.core.TemplateClassResolver (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.core.TemplateClassResolver (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/class-use/TemplateCombinedMarkupOutputModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateCombinedMarkupOutputModel.html b/docs/api/freemarker/core/class-use/TemplateCombinedMarkupOutputModel.html
new file mode 100644
index 0000000..c032357
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateCombinedMarkupOutputModel.html
@@ -0,0 +1,168 @@
+<!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.core.TemplateCombinedMarkupOutputModel (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.core.TemplateCombinedMarkupOutputModel (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/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateCombinedMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateCombinedMarkupOutputModel.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.core.TemplateCombinedMarkupOutputModel" class="title">Uses of Class<br>freemarker.core.TemplateCombinedMarkupOutputModel</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/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</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.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> that return <a href="../../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a href="../../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CombinedMarkupOutputFormat.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CombinedMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</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/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">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/core/class-use/TemplateCombinedMarkupOutputModel.html" target="_top">Frames</a></li>
+<li><a href="TemplateCombinedMarkupOutputModel.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/core/class-use/TemplateConfiguration.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/class-use/TemplateConfiguration.html b/docs/api/freemarker/core/class-use/TemplateConfiguration.html
new file mode 100644
index 0000000..907a660
--- /dev/null
+++ b/docs/api/freemarker/core/class-use/TemplateConfiguration.html
@@ -0,0 +1,237 @@
+<!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.core.TemplateConfiguration (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.core.TemplateConfiguration (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/core/TemplateConfiguration.html" title="class in freemarker.core">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/core/class-use/TemplateConfiguration.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfiguration.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.core.TemplateConfiguration" class="title">Uses of Class<br>freemarker.core.TemplateConfiguration</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/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</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>
+<tr class="rowColor">
+<td class="colFirst"><a href="#freemarker.core">freemarker.core</a></td>
+<td class="colLast">
+<div class="block">The seldom used or advanced parts of the fundamental FreeMarker API, compared to <a href="../../../freemarker/template/package-summary.html"><code>freemarker.template</code></a>.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="freemarker.cache">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a> in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/cache/package-summary.html">freemarker.cache</a> that return <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/TemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>
+<div class="block">Returns (maybe creates) the <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> for the given template source.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">MergingTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/MergingTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">FirstMatchTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/FirstMatchTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></code></td>
+<td class="colLast"><span class="typeNameLabel">ConditionalTemplateConfigurationFactory.</span><code><span class="memberNameLink"><a href="../../../freemarker/cache/ConditionalTemplateConfigurationFactory.html#get-java.lang.String-java.lang.Object-">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;sourceName,
+   <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</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/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</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/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>
+</tbody>
+</table>
+</li>
+<li class="blockList"><a name="freemarker.core">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a> in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../freemarker/core/package-summary.html">freemarker.core</a> with parameters of type <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><span class="typeNameLabel">CustomAttribute.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CustomAttribute.html#get-freemarker.core.TemplateConfiguration-">get</a></span>(<a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;templateConfiguration)</code>
+<div class="block">Same as <a href="../../../freemarker/core/CustomAttribute.html#get-freemarker.template.Template-"><code>CustomAttribute.get(Template)</code></a>, but applies to a <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">TemplateConfiguration.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/TemplateConfiguration.html#merge-freemarker.core.TemplateConfiguration-">merge</a></span>(<a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;tc)</code>
+<div class="block">Set all settings in this <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a> that were set in the parameter
+ <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>, possibly overwriting the earlier value in this object.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">CustomAttribute.</span><code><span class="memberNameLink"><a href="../../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.core.TemplateConfiguration-">set</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;value,
+   <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core">TemplateConfiguration</a>&nbsp;templateConfiguration)</code>
+<div class="block">Same as <a href="../../../freemarker/core/CustomAttribute.html#set-java.lang.Object-freemarker.template.Template-"><code>CustomAttribute.set(Object, Template)</code></a>, but applicable to a <a href="../../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><code>TemplateConfiguration</code></a>.</div>
+</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/core/TemplateConfiguration.html" title="class in freemarker.core">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/core/class-use/TemplateConfiguration.html" target="_top">Frames</a></li>
+<li><a href="TemplateConfiguration.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>


[15/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/class-use/HttpSessionHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/class-use/HttpSessionHashModel.html b/docs/api/freemarker/ext/servlet/class-use/HttpSessionHashModel.html
index 165bb35..e029cdd 100644
--- a/docs/api/freemarker/ext/servlet/class-use/HttpSessionHashModel.html
+++ b/docs/api/freemarker/ext/servlet/class-use/HttpSessionHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.servlet.HttpSessionHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.servlet.HttpSessionHashModel (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.ext.servlet.HttpSessionHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.servlet.HttpSessionHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/class-use/IncludePage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/class-use/IncludePage.html b/docs/api/freemarker/ext/servlet/class-use/IncludePage.html
index f1b97ec..efd61e8 100644
--- a/docs/api/freemarker/ext/servlet/class-use/IncludePage.html
+++ b/docs/api/freemarker/ext/servlet/class-use/IncludePage.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.servlet.IncludePage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.servlet.IncludePage (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.ext.servlet.IncludePage (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.servlet.IncludePage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/class-use/ServletContextHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/class-use/ServletContextHashModel.html b/docs/api/freemarker/ext/servlet/class-use/ServletContextHashModel.html
index a918baf..950185e 100644
--- a/docs/api/freemarker/ext/servlet/class-use/ServletContextHashModel.html
+++ b/docs/api/freemarker/ext/servlet/class-use/ServletContextHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.servlet.ServletContextHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.servlet.ServletContextHashModel (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.ext.servlet.ServletContextHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.servlet.ServletContextHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/package-frame.html b/docs/api/freemarker/ext/servlet/package-frame.html
index e1d2623..29c86ce 100644
--- a/docs/api/freemarker/ext/servlet/package-frame.html
+++ b/docs/api/freemarker/ext/servlet/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.ext.servlet (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.servlet (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/package-summary.html b/docs/api/freemarker/ext/servlet/package-summary.html
index 2655e16..e509f49 100644
--- a/docs/api/freemarker/ext/servlet/package-summary.html
+++ b/docs/api/freemarker/ext/servlet/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.ext.servlet (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.servlet (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.ext.servlet (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.servlet (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/package-tree.html b/docs/api/freemarker/ext/servlet/package-tree.html
index e496c3e..86af5d1 100644
--- a/docs/api/freemarker/ext/servlet/package-tree.html
+++ b/docs/api/freemarker/ext/servlet/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.ext.servlet Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.servlet 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.ext.servlet Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.servlet Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/servlet/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/servlet/package-use.html b/docs/api/freemarker/ext/servlet/package-use.html
index 1b0aadc..4d23680 100644
--- a/docs/api/freemarker/ext/servlet/package-use.html
+++ b/docs/api/freemarker/ext/servlet/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.ext.servlet (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.servlet (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.ext.servlet (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.servlet (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/IdentityHashMap.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/IdentityHashMap.html b/docs/api/freemarker/ext/util/IdentityHashMap.html
index ec3f3b4..d4662b2 100644
--- a/docs/api/freemarker/ext/util/IdentityHashMap.html
+++ b/docs/api/freemarker/ext/util/IdentityHashMap.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>IdentityHashMap (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>IdentityHashMap (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="IdentityHashMap (FreeMarker 2.3.23 API)";
+            parent.document.title="IdentityHashMap (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/ModelCache.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/ModelCache.html b/docs/api/freemarker/ext/util/ModelCache.html
index e83ccfb..12ceba3 100644
--- a/docs/api/freemarker/ext/util/ModelCache.html
+++ b/docs/api/freemarker/ext/util/ModelCache.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>ModelCache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ModelCache (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="ModelCache (FreeMarker 2.3.23 API)";
+            parent.document.title="ModelCache (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/ModelFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/ModelFactory.html b/docs/api/freemarker/ext/util/ModelFactory.html
index ee3506f..78a36b9 100644
--- a/docs/api/freemarker/ext/util/ModelFactory.html
+++ b/docs/api/freemarker/ext/util/ModelFactory.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>ModelFactory (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ModelFactory (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="ModelFactory (FreeMarker 2.3.23 API)";
+            parent.document.title="ModelFactory (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/WrapperTemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/WrapperTemplateModel.html b/docs/api/freemarker/ext/util/WrapperTemplateModel.html
index db57d96..488192a 100644
--- a/docs/api/freemarker/ext/util/WrapperTemplateModel.html
+++ b/docs/api/freemarker/ext/util/WrapperTemplateModel.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>WrapperTemplateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>WrapperTemplateModel (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="WrapperTemplateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="WrapperTemplateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/class-use/IdentityHashMap.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/class-use/IdentityHashMap.html b/docs/api/freemarker/ext/util/class-use/IdentityHashMap.html
index d2f2d01..67c23ae 100644
--- a/docs/api/freemarker/ext/util/class-use/IdentityHashMap.html
+++ b/docs/api/freemarker/ext/util/class-use/IdentityHashMap.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.util.IdentityHashMap (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.util.IdentityHashMap (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.ext.util.IdentityHashMap (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.util.IdentityHashMap (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/class-use/ModelCache.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/class-use/ModelCache.html b/docs/api/freemarker/ext/util/class-use/ModelCache.html
index f473d5e..8c7d7fb 100644
--- a/docs/api/freemarker/ext/util/class-use/ModelCache.html
+++ b/docs/api/freemarker/ext/util/class-use/ModelCache.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.util.ModelCache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.util.ModelCache (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.ext.util.ModelCache (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.util.ModelCache (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/class-use/WrapperTemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/class-use/WrapperTemplateModel.html b/docs/api/freemarker/ext/util/class-use/WrapperTemplateModel.html
index 914b2e9..46deb3a 100644
--- a/docs/api/freemarker/ext/util/class-use/WrapperTemplateModel.html
+++ b/docs/api/freemarker/ext/util/class-use/WrapperTemplateModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface freemarker.ext.util.WrapperTemplateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Interface freemarker.ext.util.WrapperTemplateModel (FreeMarker 2.3.24-incubating API)</title>
+<meta name="date" content="2016-03-28">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface freemarker.ext.util.WrapperTemplateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Interface freemarker.ext.util.WrapperTemplateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -231,7 +231,7 @@ start with <a href="../../../../freemarker/template/Configuration.html" title="c
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></span></code>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/package-frame.html b/docs/api/freemarker/ext/util/package-frame.html
index 9bb4acd..9e9e261 100644
--- a/docs/api/freemarker/ext/util/package-frame.html
+++ b/docs/api/freemarker/ext/util/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.ext.util (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.util (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/package-summary.html b/docs/api/freemarker/ext/util/package-summary.html
index 5a030a0..7090dbc 100644
--- a/docs/api/freemarker/ext/util/package-summary.html
+++ b/docs/api/freemarker/ext/util/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.ext.util (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.util (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.ext.util (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.util (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/package-tree.html b/docs/api/freemarker/ext/util/package-tree.html
index 82866ca..0cec9bf 100644
--- a/docs/api/freemarker/ext/util/package-tree.html
+++ b/docs/api/freemarker/ext/util/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.ext.util Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.util 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.ext.util Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.util Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/util/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/util/package-use.html b/docs/api/freemarker/ext/util/package-use.html
index df6a3cc..7fc76fe 100644
--- a/docs/api/freemarker/ext/util/package-use.html
+++ b/docs/api/freemarker/ext/util/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.ext.util (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.util (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.ext.util (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.util (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/xml/NodeListModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/xml/NodeListModel.html b/docs/api/freemarker/ext/xml/NodeListModel.html
index c46fbc1..a94a676 100644
--- a/docs/api/freemarker/ext/xml/NodeListModel.html
+++ b/docs/api/freemarker/ext/xml/NodeListModel.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>NodeListModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NodeListModel (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="NodeListModel (FreeMarker 2.3.23 API)";
+            parent.document.title="NodeListModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -117,7 +117,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Use <a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom"><code>NodeModel</code></a> instead.</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">NodeListModel</span>
+<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 class <span class="typeNameLabel">NodeListModel</span>
 extends <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>
 implements <a href="../../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template">TemplateMethodModel</a>, <a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a>, <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, <a href="../../../freemarker/template/TemplateNodeModel.html" title="interface in freemarker.template">TemplateNodeModel</a></pre>
 <div class="block"><p>A data model adapter for three widespread XML document object model

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/xml/class-use/NodeListModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/xml/class-use/NodeListModel.html b/docs/api/freemarker/ext/xml/class-use/NodeListModel.html
index ef109e3..399bd3c 100644
--- a/docs/api/freemarker/ext/xml/class-use/NodeListModel.html
+++ b/docs/api/freemarker/ext/xml/class-use/NodeListModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.xml.NodeListModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.xml.NodeListModel (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.ext.xml.NodeListModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.xml.NodeListModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/xml/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/xml/package-frame.html b/docs/api/freemarker/ext/xml/package-frame.html
index 1cc5656..4e89b85 100644
--- a/docs/api/freemarker/ext/xml/package-frame.html
+++ b/docs/api/freemarker/ext/xml/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.ext.xml (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.xml (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/xml/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/xml/package-summary.html b/docs/api/freemarker/ext/xml/package-summary.html
index 6c4ab1e..9005fe7 100644
--- a/docs/api/freemarker/ext/xml/package-summary.html
+++ b/docs/api/freemarker/ext/xml/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.ext.xml (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.xml (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.ext.xml (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.xml (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/xml/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/xml/package-tree.html b/docs/api/freemarker/ext/xml/package-tree.html
index 449c45b..d77c3a5 100644
--- a/docs/api/freemarker/ext/xml/package-tree.html
+++ b/docs/api/freemarker/ext/xml/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.ext.xml Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.xml 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.ext.xml Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.xml Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/xml/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/xml/package-use.html b/docs/api/freemarker/ext/xml/package-use.html
index c135139..4783845 100644
--- a/docs/api/freemarker/ext/xml/package-use.html
+++ b/docs/api/freemarker/ext/xml/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.ext.xml (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.xml (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.ext.xml (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.xml (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/log/Logger.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/log/Logger.html b/docs/api/freemarker/log/Logger.html
index a497570..029e8c9 100644
--- a/docs/api/freemarker/log/Logger.html
+++ b/docs/api/freemarker/log/Logger.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>Logger (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Logger (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="Logger (FreeMarker 2.3.23 API)";
+            parent.document.title="Logger (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -531,7 +531,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>LIBRARY_AVALON</h4>
-<pre>public static final&nbsp;int LIBRARY_AVALON</pre>
+<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 static final&nbsp;int LIBRARY_AVALON</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Avalon LogKit support will be removed sometimes in the future.</span></div>
 <div class="block">Enum value used for <a href="../../freemarker/log/Logger.html#selectLoggerLibrary-int-"><code>selectLoggerLibrary(int)</code></a>; indicates that Avalon LogKit should be used.</div>
 <dl>
@@ -546,7 +547,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>LIBRARY_NAME_AVALON</h4>
-<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> LIBRARY_NAME_AVALON</pre>
+<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 static final&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> LIBRARY_NAME_AVALON</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Avalon LogKit support will be removed sometimes in the future.</span></div>
 <div class="block"><a href="../../freemarker/log/Logger.html#SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY">"org.freemarker.loggerLibrary"</a> property value; indicates that Avalon LogKit should be used. @since
  2.3.22</div>
@@ -672,8 +674,9 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>selectLoggerLibrary</h4>
-<pre>public static&nbsp;void&nbsp;selectLoggerLibrary(int&nbsp;libraryEnum)
-                                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassNotFoundException.html?is-external=true" title="class or interface in java.lang">ClassNotFoundException</a></pre>
+<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 static&nbsp;void&nbsp;selectLoggerLibrary(int&nbsp;libraryEnum)
+                                             throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassNotFoundException.html?is-external=true" title="class or interface in java.lang">ClassNotFoundException</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This method isn't reliable, unless you can somehow ensure that you access the FreeMarker classes
              first; use the <a href="../../freemarker/log/Logger.html#SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY">"org.freemarker.loggerLibrary"</a> Java system property instead, like
              <code>java ... -Dorg.freemarker.loggerLibrary=slf4j</code>. See
@@ -697,7 +700,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>setCategoryPrefix</h4>
-<pre>public static&nbsp;void&nbsp;setCategoryPrefix(<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;prefix)</pre>
+<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 static&nbsp;void&nbsp;setCategoryPrefix(<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;prefix)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This wasn't reliable, unless you can somehow ensure that you access the FreeMarker classes first. As
              it's not known to be useful for users, consider it removed.</span></div>
 <div class="block">Sets a category prefix. This prefix is prepended to any logger category name. This makes it possible to have

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/log/class-use/Logger.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/log/class-use/Logger.html b/docs/api/freemarker/log/class-use/Logger.html
index a376655..38ccc31 100644
--- a/docs/api/freemarker/log/class-use/Logger.html
+++ b/docs/api/freemarker/log/class-use/Logger.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.log.Logger (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.log.Logger (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.log.Logger (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.log.Logger (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/log/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/log/package-frame.html b/docs/api/freemarker/log/package-frame.html
index 969a339..2d5d9dd 100644
--- a/docs/api/freemarker/log/package-frame.html
+++ b/docs/api/freemarker/log/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.log (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.log (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/log/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/log/package-summary.html b/docs/api/freemarker/log/package-summary.html
index 7954ede..fffe60e 100644
--- a/docs/api/freemarker/log/package-summary.html
+++ b/docs/api/freemarker/log/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.log (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.log (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.log (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.log (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/log/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/log/package-tree.html b/docs/api/freemarker/log/package-tree.html
index d808c29..a9c8e2e 100644
--- a/docs/api/freemarker/log/package-tree.html
+++ b/docs/api/freemarker/log/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: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>freemarker.log Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.log 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.log Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.log Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/log/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/log/package-use.html b/docs/api/freemarker/log/package-use.html
index b2aeb09..7b41e17 100644
--- a/docs/api/freemarker/log/package-use.html
+++ b/docs/api/freemarker/log/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.log (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.log (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.log (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.log (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/template/AdapterTemplateModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/template/AdapterTemplateModel.html b/docs/api/freemarker/template/AdapterTemplateModel.html
index 66aee6b..68fdbe9 100644
--- a/docs/api/freemarker/template/AdapterTemplateModel.html
+++ b/docs/api/freemarker/template/AdapterTemplateModel.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>AdapterTemplateModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>AdapterTemplateModel (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="AdapterTemplateModel (FreeMarker 2.3.23 API)";
+            parent.document.title="AdapterTemplateModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {


[02/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/app_versions.html
----------------------------------------------------------------------
diff --git a/docs/app_versions.html b/docs/app_versions.html
index 0e29b92..801f80c 100644
--- a/docs/app_versions.html
+++ b/docs/app_versions.html
@@ -1,16 +1,17 @@
 <!doctype html>
+<!-- Generated by FreeMarker/Docgen from DocBook -->
 <html lang="en" class="page-type-appendix">
 <head prefix="og: http://ogp.me/ns#">
 <meta charset="utf-8">
-<title>Version history - FreeMarker Manual</title>
+<title>Version history - Apache FreeMarker Manual</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="FreeMarker Manual">
+<meta property="og:site_name" content="Apache FreeMarker Manual">
 <meta property="og:title" content="Version history">
 <meta property="og:locale" content="en_US">
 <meta property="og:url" content="http://freemarker.org/docs/app_versions.html">
-<link rel="canoical" href="http://freemarker.org/docs/app_versions.html">
+<link rel="canonical" href="http://freemarker.org/docs/app_versions.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
 <link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css">
@@ -24,32 +25,28 @@ ga('send', 'pageview');
 </script>
 </head>
 <body itemscope itemtype="https://schema.org/Code">
-    <meta itemprop="version" content="2.3.23">
     <meta itemprop="url" content="http://freemarker.org/docs/">
-    <meta itemprop="name" content="FreeMarker Manual">
+    <meta itemprop="name" content="Apache FreeMarker Manual">
 
   <!--[if lte IE 9]>
   <div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
   <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_versions.html"><span itemprop="name">Version history</span></a></li></ul><div class="bookmarks" title="Bookmarks"><sp
 an class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
+</a><ul class="tabs"><li><a href="http://freemarker.org/">Home</a></li><li class="current"><a href="index.html">Manual</a></li><li><a class="external" href="api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="http://freemarker.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://sourceforge.net/p/freemarker/bugs/new/" title="Report a Bug"><span>Report a Bug</span></a></li><li><a class="tab icon-download" href="http://freemarker.org/freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></div></div><div class="header-bottom-bg"><div class="site-width search-row"><a href="index.html" class="navigation-header">Manual</a><div class="navigation-header"></div><form method="get" class="search-form" action="search-results.html"><fieldset><legend class="sr-only">Search form</legend><label for="search-field" class="sr-only">Search query</label><input id="search-f
 ield" name="q" type="search" class="search-input" placeholder="Search" spellcheck="false" autocorrect="off" autocomplete="off"><button type="submit" class="search-btn"><span class="sr-only">Search</span></button></fieldset></form></div><div class="site-width breadcrumb-row"><ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="index.html"><span itemprop="name">Apache FreeMarker Manual</span></a></li><li class="step-1" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app.html"><span itemprop="name">Appendixes</span></a></li><li class="step-2" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a class="label" itemprop="item" href="app_versions.html"><span itemprop="name">Version history</span></a></li></ul><div class="bookmarks" title="Bookmar
 ks"><span class="sr-only">Bookmarks:</span><ul class="bookmark-list"><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions</a></li><li><a href="ref_builtins_alphaidx.html">?builtins</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_specvar.html">.spec_vars</a></li><li><a href="app_faq.html">FAQ</a></li></ul></div></div></div>    <div class="main-content site-width">
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
-      <script>var breadcrumb = ["FreeMarker Manual","Appendixes","Version history"];</script>
+      <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Version history"];</script>
       <script src="toc.js"></script>
       <script src="docgen-resources/main.min.js"></script>
   </div>
-<div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="app_faq.html"><span>Previous</span></a><a class="paging-arrow next" href="versions_2_3_23.html"><span>Next</span></a></div><div class="title-wrapper">
+<div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="app_faq.html"><span>Previous</span></a><a class="paging-arrow next" href="versions_2_3_24.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="app_versions" itemprop="headline">Version history</h1>
 </div></div><div class="page-menu">
 <div class="page-menu-title">Section Contents</div>
-<ul><li><a class="page-menu-link" href="versions_2_3_23.html" data-menu-target="versions_2_3_23">2.3.23</a></li><li><a class="page-menu-link" href="versions_2_3_22.html" data-menu-target="versions_2_3_22">2.3.22</a></li><li><a class="page-menu-link" href="versions_2_3_21.html" data-menu-target="versions_2_3_21">2.3.21</a></li><li><a class="page-menu-link" href="versions_2_3_20.html" data-menu-target="versions_2_3_20">2.3.20</a></li><li><a class="page-menu-link" href="versions_2_3_19.html" data-menu-target="versions_2_3_19">2.3.19</a></li><li><a class="page-menu-link" href="versions_2_3_18.html" data-menu-target="versions_2_3_18">2.3.18</a></li><li><a class="page-menu-link" href="versions_2_3_17.html" data-menu-target="versions_2_3_17">2.3.17</a></li><li><a class="page-menu-link" href="versions_2_3_16.html" data-menu-target="versions_2_3_16">2.3.16</a></li><li><a class="page-menu-link" href="versions_2_3_15.html" data-menu-target="versions_2_3_15">2.3.15</a></li><li><a class="page-me
 nu-link" href="versions_2_3_14.html" data-menu-target="versions_2_3_14">2.3.14</a></li><li><a class="page-menu-link" href="versions_2_3_13.html" data-menu-target="versions_2_3_13">2.3.13</a></li><li><a class="page-menu-link" href="versions_2_3_12.html" data-menu-target="versions_2_3_12">2.3.12</a></li><li><a class="page-menu-link" href="versions_2_3_11.html" data-menu-target="versions_2_3_11">2.3.11</a></li><li><a class="page-menu-link" href="versions_2_3_10.html" data-menu-target="versions_2_3_10">2.3.10</a></li><li><a class="page-menu-link" href="versions_2_3_9.html" data-menu-target="versions_2_3_9">2.3.9</a></li><li><a class="page-menu-link" href="versions_2_3_8.html" data-menu-target="versions_2_3_8">2.3.8</a></li><li><a class="page-menu-link" href="versions_2_3_7.html" data-menu-target="versions_2_3_7">2.3.7</a></li><li><a class="page-menu-link" href="versions_2_3_7rc1.html" data-menu-target="versions_2_3_7rc1">2.3.7 RC1</a></li><li><a class="page-menu-link" href="versions_2_3
 _6.html" data-menu-target="versions_2_3_6">2.3.6</a></li><li><a class="page-menu-link" href="versions_2_3_5.html" data-menu-target="versions_2_3_5">2.3.5</a></li><li><a class="page-menu-link" href="versions_2_3_4.html" data-menu-target="versions_2_3_4">2.3.4</a></li><li><a class="page-menu-link" href="versions_2_3_3.html" data-menu-target="versions_2_3_3">2.3.3</a></li><li><a class="page-menu-link" href="versions_2_3_2.html" data-menu-target="versions_2_3_2">2.3.2</a></li><li><a class="page-menu-link" href="versions_2_3_1.html" data-menu-target="versions_2_3_1">2.3.1</a></li><li><a class="page-menu-link" href="versions_2_3.html" data-menu-target="versions_2_3">2.3</a></li><li><a class="page-menu-link" href="versions_2_2_8.html" data-menu-target="versions_2_2_8">2.2.8</a></li><li><a class="page-menu-link" href="versions_2_2_7.html" data-menu-target="versions_2_2_7">2.2.7</a></li><li><a class="page-menu-link" href="versions_2_2_6.html" data-menu-target="versions_2_2_6">2.2.6</a></li><
 li><a class="page-menu-link" href="versions_2_2_5.html" data-menu-target="versions_2_2_5">2.2.5</a></li><li><a class="page-menu-link" href="versions_2_2_4.html" data-menu-target="versions_2_2_4">2.2.4</a></li><li><a class="page-menu-link" href="versions_2_2_3.html" data-menu-target="versions_2_2_3">2.2.3</a></li><li><a class="page-menu-link" href="versions_2_2_2.html" data-menu-target="versions_2_2_2">2.2.2</a></li><li><a class="page-menu-link" href="versions_2_2_1.html" data-menu-target="versions_2_2_1">2.2.1</a></li><li><a class="page-menu-link" href="versions_2_2.html" data-menu-target="versions_2_2">2.2</a></li><li><a class="page-menu-link" href="versions_2_1_5.html" data-menu-target="versions_2_1_5">2.1.5</a></li><li><a class="page-menu-link" href="versions_2_1_4.html" data-menu-target="versions_2_1_4">2.1.4</a></li><li><a class="page-menu-link" href="versions_2_1_3.html" data-menu-target="versions_2_1_3">2.1.3</a></li><li><a class="page-menu-link" href="versions_2_1_2.html" da
 ta-menu-target="versions_2_1_2">2.1.2</a></li><li><a class="page-menu-link" href="versions_2_1_1.html" data-menu-target="versions_2_1_1">2.1.1</a></li><li><a class="page-menu-link" href="versions_2_1.html" data-menu-target="versions_2_1">2.1</a></li><li><a class="page-menu-link" href="versions_2_01.html" data-menu-target="versions_2_01">2.01</a></li><li><a class="page-menu-link" href="versions_2_0.html" data-menu-target="versions_2_0">2.0</a></li><li><a class="page-menu-link" href="versions_2_0RC3.html" data-menu-target="versions_2_0RC3">2.0 RC3</a></li><li><a class="page-menu-link" href="versions_2_0RC2.html" data-menu-target="versions_2_0RC2">2.0 RC2</a></li><li><a class="page-menu-link" href="versions_2_0RC1.html" data-menu-target="versions_2_0RC1">2.0 RC1</a></li></ul> </div><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="app_faq.html"><span>Previous</span></a><a class="paging-arrow next" href="versions_2_3_23.html"><span>Next
 </span></a></div></div></div></div>      </div>
+<ul><li><a class="page-menu-link" href="versions_2_3_24.html" data-menu-target="versions_2_3_24">2.3.24 (incubating)</a></li><li><a class="page-menu-link" href="versions_2_3_23.html" data-menu-target="versions_2_3_23">2.3.23</a></li><li><a class="page-menu-link" href="versions_2_3_22.html" data-menu-target="versions_2_3_22">2.3.22</a></li><li><a class="page-menu-link" href="versions_2_3_21.html" data-menu-target="versions_2_3_21">2.3.21</a></li><li><a class="page-menu-link" href="versions_2_3_20.html" data-menu-target="versions_2_3_20">2.3.20</a></li><li><a class="page-menu-link" href="versions_2_3_19.html" data-menu-target="versions_2_3_19">2.3.19</a></li><li><a class="page-menu-link" href="versions_2_3_18.html" data-menu-target="versions_2_3_18">2.3.18</a></li><li><a class="page-menu-link" href="versions_2_3_17.html" data-menu-target="versions_2_3_17">2.3.17</a></li><li><a class="page-menu-link" href="versions_2_3_16.html" data-menu-target="versions_2_3_16">2.3.16</a></li><li><a c
 lass="page-menu-link" href="versions_2_3_15.html" data-menu-target="versions_2_3_15">2.3.15</a></li><li><a class="page-menu-link" href="versions_2_3_14.html" data-menu-target="versions_2_3_14">2.3.14</a></li><li><a class="page-menu-link" href="versions_2_3_13.html" data-menu-target="versions_2_3_13">2.3.13</a></li><li><a class="page-menu-link" href="versions_2_3_12.html" data-menu-target="versions_2_3_12">2.3.12</a></li><li><a class="page-menu-link" href="versions_2_3_11.html" data-menu-target="versions_2_3_11">2.3.11</a></li><li><a class="page-menu-link" href="versions_2_3_10.html" data-menu-target="versions_2_3_10">2.3.10</a></li><li><a class="page-menu-link" href="versions_2_3_9.html" data-menu-target="versions_2_3_9">2.3.9</a></li><li><a class="page-menu-link" href="versions_2_3_8.html" data-menu-target="versions_2_3_8">2.3.8</a></li><li><a class="page-menu-link" href="versions_2_3_7.html" data-menu-target="versions_2_3_7">2.3.7</a></li><li><a class="page-menu-link" href="versio
 ns_2_3_7rc1.html" data-menu-target="versions_2_3_7rc1">2.3.7 RC1</a></li><li><a class="page-menu-link" href="versions_2_3_6.html" data-menu-target="versions_2_3_6">2.3.6</a></li><li><a class="page-menu-link" href="versions_2_3_5.html" data-menu-target="versions_2_3_5">2.3.5</a></li><li><a class="page-menu-link" href="versions_2_3_4.html" data-menu-target="versions_2_3_4">2.3.4</a></li><li><a class="page-menu-link" href="versions_2_3_3.html" data-menu-target="versions_2_3_3">2.3.3</a></li><li><a class="page-menu-link" href="versions_2_3_2.html" data-menu-target="versions_2_3_2">2.3.2</a></li><li><a class="page-menu-link" href="versions_2_3_1.html" data-menu-target="versions_2_3_1">2.3.1</a></li><li><a class="page-menu-link" href="versions_2_3.html" data-menu-target="versions_2_3">2.3</a></li><li><a class="page-menu-link" href="versions_2_2_8.html" data-menu-target="versions_2_2_8">2.2.8</a></li><li><a class="page-menu-link" href="versions_2_2_7.html" data-menu-target="versions_2_2_7"
 >2.2.7</a></li><li><a class="page-menu-link" href="versions_2_2_6.html" data-menu-target="versions_2_2_6">2.2.6</a></li><li><a class="page-menu-link" href="versions_2_2_5.html" data-menu-target="versions_2_2_5">2.2.5</a></li><li><a class="page-menu-link" href="versions_2_2_4.html" data-menu-target="versions_2_2_4">2.2.4</a></li><li><a class="page-menu-link" href="versions_2_2_3.html" data-menu-target="versions_2_2_3">2.2.3</a></li><li><a class="page-menu-link" href="versions_2_2_2.html" data-menu-target="versions_2_2_2">2.2.2</a></li><li><a class="page-menu-link" href="versions_2_2_1.html" data-menu-target="versions_2_2_1">2.2.1</a></li><li><a class="page-menu-link" href="versions_2_2.html" data-menu-target="versions_2_2">2.2</a></li><li><a class="page-menu-link" href="versions_2_1_5.html" data-menu-target="versions_2_1_5">2.1.5</a></li><li><a class="page-menu-link" href="versions_2_1_4.html" data-menu-target="versions_2_1_4">2.1.4</a></li><li><a class="page-menu-link" href="version
 s_2_1_3.html" data-menu-target="versions_2_1_3">2.1.3</a></li><li><a class="page-menu-link" href="versions_2_1_2.html" data-menu-target="versions_2_1_2">2.1.2</a></li><li><a class="page-menu-link" href="versions_2_1_1.html" data-menu-target="versions_2_1_1">2.1.1</a></li><li><a class="page-menu-link" href="versions_2_1.html" data-menu-target="versions_2_1">2.1</a></li><li><a class="page-menu-link" href="versions_2_01.html" data-menu-target="versions_2_01">2.01</a></li><li><a class="page-menu-link" href="versions_2_0.html" data-menu-target="versions_2_0">2.0</a></li><li><a class="page-menu-link" href="versions_2_0RC3.html" data-menu-target="versions_2_0RC3">2.0 RC3</a></li><li><a class="page-menu-link" href="versions_2_0RC2.html" data-menu-target="versions_2_0RC2">2.0 RC2</a></li><li><a class="page-menu-link" href="versions_2_0RC1.html" data-menu-target="versions_2_0RC1">2.0 RC1</a></li></ul> </div><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow p
 revious" href="app_faq.html"><span>Previous</span></a><a class="paging-arrow next" href="versions_2_3_24.html"><span>Next</span></a></div></div></div></div>      </div>
     </div>
-<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/index.html">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><
 li><a href="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generat
 ed for: Freemarker 2.3.23</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2015-07-21T19:53:44Z" title="Tuesday, July 21, 2015 7:53:44 PM GMT">2015-07-21 19:53:44 GMT</time></span></p> <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2015
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The FreeMarker Project</a>. All rights reserved. </p>
+<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="http://freemarker.org/">What is FreeMarker?</a></li><li><a href="http://freemarker.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="http://freemarker.org/history.html">About us</a></li><li><a itemprop="license" href="app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">Try template online</a></li><li><a href="dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="ref_directive_alphaidx.html">#directives</a></li><li><a href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href
 ="https://github.com/freemarker/freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://sourceforge.net/p/freemarker/bugs/new/">Report a bug</a></li><li><a href="http://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="http://freemarker.org/mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/freemarker/freemarker">Github</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"><p><span class="generated-for-product">Generated for: Fr
 eemarker 2.3.24</span><span class="last-updated"> Last generated:
+<time itemprop="dateModified" datetime="2016-03-28T15:17:13Z" title="Monday, March 28, 2016 3:17:13 PM GMT">2016-03-28 15:17:13 GMT</time></span></p> <p class="copyright">
+© <span itemprop="copyrightYear">1999</span>–2016
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. All rights reserved. </p>
 </div></div></div></body>
 </html>
-
-
-


[17/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/Transform.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/Transform.html b/docs/api/freemarker/ext/dom/Transform.html
index 33eeb71..f41a46b 100644
--- a/docs/api/freemarker/ext/dom/Transform.html
+++ b/docs/api/freemarker/ext/dom/Transform.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Transform (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Transform (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="Transform (FreeMarker 2.3.23 API)";
+            parent.document.title="Transform (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -113,7 +113,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">Transform</span>
+<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 class <span class="typeNameLabel">Transform</span>
 extends <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></pre>
 <div class="block">A class that contains a main() method for command-line invocation of a FreeMarker XML transformation.</div>
 </li>
@@ -170,7 +171,8 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;main(<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;args)</pre>
+<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 static&nbsp;void&nbsp;main(<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;args)</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/XPathSupport.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/XPathSupport.html b/docs/api/freemarker/ext/dom/XPathSupport.html
index 123e4f8..ece7681 100644
--- a/docs/api/freemarker/ext/dom/XPathSupport.html
+++ b/docs/api/freemarker/ext/dom/XPathSupport.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>XPathSupport (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>XPathSupport (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="XPathSupport (FreeMarker 2.3.23 API)";
+            parent.document.title="XPathSupport (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/class-use/NodeModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/class-use/NodeModel.html b/docs/api/freemarker/ext/dom/class-use/NodeModel.html
index 08e0d2a..f43a5a8 100644
--- a/docs/api/freemarker/ext/dom/class-use/NodeModel.html
+++ b/docs/api/freemarker/ext/dom/class-use/NodeModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.dom.NodeModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.dom.NodeModel (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.ext.dom.NodeModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.dom.NodeModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/class-use/Transform.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/class-use/Transform.html b/docs/api/freemarker/ext/dom/class-use/Transform.html
index e7a6286..8df1eb3 100644
--- a/docs/api/freemarker/ext/dom/class-use/Transform.html
+++ b/docs/api/freemarker/ext/dom/class-use/Transform.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.dom.Transform (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.dom.Transform (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.ext.dom.Transform (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.dom.Transform (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/package-frame.html b/docs/api/freemarker/ext/dom/package-frame.html
index aa2e15e..065aed6 100644
--- a/docs/api/freemarker/ext/dom/package-frame.html
+++ b/docs/api/freemarker/ext/dom/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.ext.dom (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.dom (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/package-summary.html b/docs/api/freemarker/ext/dom/package-summary.html
index 1b76ec3..8bb96bf 100644
--- a/docs/api/freemarker/ext/dom/package-summary.html
+++ b/docs/api/freemarker/ext/dom/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.ext.dom (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.dom (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.ext.dom (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.dom (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -106,7 +106,7 @@ see <a href="http://freemarker.org/docs/xgui.html" target="_blank">in the Manual
 <tr class="altColor">
 <td class="colFirst"><a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom">NodeModel</a></td>
 <td class="colLast">
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 <tr class="rowColor">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/package-tree.html b/docs/api/freemarker/ext/dom/package-tree.html
index c6dab5d..69f2e63 100644
--- a/docs/api/freemarker/ext/dom/package-tree.html
+++ b/docs/api/freemarker/ext/dom/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.ext.dom Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.dom 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.ext.dom Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.dom Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/dom/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/dom/package-use.html b/docs/api/freemarker/ext/dom/package-use.html
index ab597ad..77e28b6 100644
--- a/docs/api/freemarker/ext/dom/package-use.html
+++ b/docs/api/freemarker/ext/dom/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.ext.dom (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.dom (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.ext.dom (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.dom (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -104,7 +104,7 @@ see <a href="http://freemarker.org/docs/xgui.html" target="_blank">in the Manual
 <tbody>
 <tr class="altColor">
 <td class="colOne"><a href="../../../freemarker/ext/dom/class-use/NodeModel.html#freemarker.ext.dom">NodeModel</a>
-<div class="block">A base class for wrapping a W3C DOM Node as a FreeMarker template model.</div>
+<div class="block">A base class for wrapping a single W3C DOM Node as a FreeMarker template model.</div>
 </td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jdom/NodeListModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jdom/NodeListModel.html b/docs/api/freemarker/ext/jdom/NodeListModel.html
index 14949db..14c6e7e 100644
--- a/docs/api/freemarker/ext/jdom/NodeListModel.html
+++ b/docs/api/freemarker/ext/jdom/NodeListModel.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>NodeListModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>NodeListModel (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="NodeListModel (FreeMarker 2.3.23 API)";
+            parent.document.title="NodeListModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -117,7 +117,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment">Use <a href="../../../freemarker/ext/dom/NodeModel.html" title="class in freemarker.ext.dom"><code>NodeModel</code></a> instead.</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">NodeListModel</span>
+<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 class <span class="typeNameLabel">NodeListModel</span>
 extends <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>
 implements <a href="../../../freemarker/template/TemplateHashModel.html" title="interface in freemarker.template">TemplateHashModel</a>, <a href="../../../freemarker/template/TemplateMethodModel.html" title="interface in freemarker.template">TemplateMethodModel</a>, <a href="../../../freemarker/template/TemplateCollectionModel.html" title="interface in freemarker.template">TemplateCollectionModel</a>, <a href="../../../freemarker/template/TemplateSequenceModel.html" title="interface in freemarker.template">TemplateSequenceModel</a>, <a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a></pre>
 <div class="block">Provides a template for wrapping JDOM objects. It is capable of storing not only
@@ -672,8 +673,9 @@ implements <a href="../../../freemarker/template/TemplateHashModel.html" title="
 <ul class="blockListLast">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;main(<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;args)
-                 throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<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 static&nbsp;void&nbsp;main(<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;args)
+                              throws <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 <div class="block">Loads a template from a file passed as the first argument, loads an XML
  document from the standard input, passes it to the template as variable

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jdom/class-use/NodeListModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jdom/class-use/NodeListModel.html b/docs/api/freemarker/ext/jdom/class-use/NodeListModel.html
index 5cafa7f..c894449 100644
--- a/docs/api/freemarker/ext/jdom/class-use/NodeListModel.html
+++ b/docs/api/freemarker/ext/jdom/class-use/NodeListModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jdom.NodeListModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jdom.NodeListModel (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.ext.jdom.NodeListModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jdom.NodeListModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jdom/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jdom/package-frame.html b/docs/api/freemarker/ext/jdom/package-frame.html
index ce4c7fb..b71b7ef 100644
--- a/docs/api/freemarker/ext/jdom/package-frame.html
+++ b/docs/api/freemarker/ext/jdom/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.ext.jdom (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jdom (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jdom/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jdom/package-summary.html b/docs/api/freemarker/ext/jdom/package-summary.html
index 6a56dca..af87552 100644
--- a/docs/api/freemarker/ext/jdom/package-summary.html
+++ b/docs/api/freemarker/ext/jdom/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.ext.jdom (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jdom (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.ext.jdom (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.jdom (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jdom/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jdom/package-tree.html b/docs/api/freemarker/ext/jdom/package-tree.html
index 74bd600..1c96ed1 100644
--- a/docs/api/freemarker/ext/jdom/package-tree.html
+++ b/docs/api/freemarker/ext/jdom/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.ext.jdom Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jdom 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.ext.jdom Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.jdom Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jdom/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jdom/package-use.html b/docs/api/freemarker/ext/jdom/package-use.html
index f4f0d34..d3ff9c9 100644
--- a/docs/api/freemarker/ext/jdom/package-use.html
+++ b/docs/api/freemarker/ext/jdom/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.ext.jdom (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.jdom (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.ext.jdom (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.jdom (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/EventForwarding.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/EventForwarding.html b/docs/api/freemarker/ext/jsp/EventForwarding.html
index 058a2c0..bb50fa4 100644
--- a/docs/api/freemarker/ext/jsp/EventForwarding.html
+++ b/docs/api/freemarker/ext/jsp/EventForwarding.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EventForwarding (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>EventForwarding (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="EventForwarding (FreeMarker 2.3.23 API)";
+            parent.document.title="EventForwarding (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/FreemarkerTag.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/FreemarkerTag.html b/docs/api/freemarker/ext/jsp/FreemarkerTag.html
index 249d178..658b5d6 100644
--- a/docs/api/freemarker/ext/jsp/FreemarkerTag.html
+++ b/docs/api/freemarker/ext/jsp/FreemarkerTag.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:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>FreemarkerTag (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>FreemarkerTag (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="FreemarkerTag (FreeMarker 2.3.23 API)";
+            parent.document.title="FreemarkerTag (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/TaglibFactory.ClasspathMetaInfTldSource.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/TaglibFactory.ClasspathMetaInfTldSource.html b/docs/api/freemarker/ext/jsp/TaglibFactory.ClasspathMetaInfTldSource.html
index f3c2c11..8aad47e 100644
--- a/docs/api/freemarker/ext/jsp/TaglibFactory.ClasspathMetaInfTldSource.html
+++ b/docs/api/freemarker/ext/jsp/TaglibFactory.ClasspathMetaInfTldSource.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>TaglibFactory.ClasspathMetaInfTldSource (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TaglibFactory.ClasspathMetaInfTldSource (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="TaglibFactory.ClasspathMetaInfTldSource (FreeMarker 2.3.23 API)";
+            parent.document.title="TaglibFactory.ClasspathMetaInfTldSource (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/TaglibFactory.ClearMetaInfTldSource.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/TaglibFactory.ClearMetaInfTldSource.html b/docs/api/freemarker/ext/jsp/TaglibFactory.ClearMetaInfTldSource.html
index 235e5b4..5e09d86 100644
--- a/docs/api/freemarker/ext/jsp/TaglibFactory.ClearMetaInfTldSource.html
+++ b/docs/api/freemarker/ext/jsp/TaglibFactory.ClearMetaInfTldSource.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>TaglibFactory.ClearMetaInfTldSource (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TaglibFactory.ClearMetaInfTldSource (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="TaglibFactory.ClearMetaInfTldSource (FreeMarker 2.3.23 API)";
+            parent.document.title="TaglibFactory.ClearMetaInfTldSource (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/TaglibFactory.MetaInfTldSource.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/TaglibFactory.MetaInfTldSource.html b/docs/api/freemarker/ext/jsp/TaglibFactory.MetaInfTldSource.html
index e6051a3..170d99e 100644
--- a/docs/api/freemarker/ext/jsp/TaglibFactory.MetaInfTldSource.html
+++ b/docs/api/freemarker/ext/jsp/TaglibFactory.MetaInfTldSource.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>TaglibFactory.MetaInfTldSource (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TaglibFactory.MetaInfTldSource (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="TaglibFactory.MetaInfTldSource (FreeMarker 2.3.23 API)";
+            parent.document.title="TaglibFactory.MetaInfTldSource (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html b/docs/api/freemarker/ext/jsp/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html
index 2a247dc..8b78952 100644
--- a/docs/api/freemarker/ext/jsp/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html
+++ b/docs/api/freemarker/ext/jsp/TaglibFactory.WebInfPerLibJarMetaInfTldSource.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>TaglibFactory.WebInfPerLibJarMetaInfTldSource (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TaglibFactory.WebInfPerLibJarMetaInfTldSource (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="TaglibFactory.WebInfPerLibJarMetaInfTldSource (FreeMarker 2.3.23 API)";
+            parent.document.title="TaglibFactory.WebInfPerLibJarMetaInfTldSource (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/TaglibFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/TaglibFactory.html b/docs/api/freemarker/ext/jsp/TaglibFactory.html
index d241d77..782ddec 100644
--- a/docs/api/freemarker/ext/jsp/TaglibFactory.html
+++ b/docs/api/freemarker/ext/jsp/TaglibFactory.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>TaglibFactory (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>TaglibFactory (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="TaglibFactory (FreeMarker 2.3.23 API)";
+            parent.document.title="TaglibFactory (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/class-use/EventForwarding.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/class-use/EventForwarding.html b/docs/api/freemarker/ext/jsp/class-use/EventForwarding.html
index a5c4639..5056847 100644
--- a/docs/api/freemarker/ext/jsp/class-use/EventForwarding.html
+++ b/docs/api/freemarker/ext/jsp/class-use/EventForwarding.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jsp.EventForwarding (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jsp.EventForwarding (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.ext.jsp.EventForwarding (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jsp.EventForwarding (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/class-use/FreemarkerTag.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/class-use/FreemarkerTag.html b/docs/api/freemarker/ext/jsp/class-use/FreemarkerTag.html
index c43ad57..448a3f8 100644
--- a/docs/api/freemarker/ext/jsp/class-use/FreemarkerTag.html
+++ b/docs/api/freemarker/ext/jsp/class-use/FreemarkerTag.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jsp.FreemarkerTag (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jsp.FreemarkerTag (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.ext.jsp.FreemarkerTag (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jsp.FreemarkerTag (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClasspathMetaInfTldSource.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClasspathMetaInfTldSource.html b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClasspathMetaInfTldSource.html
index dd0b594..86d764c 100644
--- a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClasspathMetaInfTldSource.html
+++ b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClasspathMetaInfTldSource.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jsp.TaglibFactory.ClasspathMetaInfTldSource (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jsp.TaglibFactory.ClasspathMetaInfTldSource (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.ext.jsp.TaglibFactory.ClasspathMetaInfTldSource (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jsp.TaglibFactory.ClasspathMetaInfTldSource (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClearMetaInfTldSource.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClearMetaInfTldSource.html b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClearMetaInfTldSource.html
index b8622e7..0f25090 100644
--- a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClearMetaInfTldSource.html
+++ b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.ClearMetaInfTldSource.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jsp.TaglibFactory.ClearMetaInfTldSource (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jsp.TaglibFactory.ClearMetaInfTldSource (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.ext.jsp.TaglibFactory.ClearMetaInfTldSource (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jsp.TaglibFactory.ClearMetaInfTldSource (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.MetaInfTldSource.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.MetaInfTldSource.html b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.MetaInfTldSource.html
index 2f5aa06..828dd39 100644
--- a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.MetaInfTldSource.html
+++ b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.MetaInfTldSource.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jsp.TaglibFactory.MetaInfTldSource (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jsp.TaglibFactory.MetaInfTldSource (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.ext.jsp.TaglibFactory.MetaInfTldSource (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jsp.TaglibFactory.MetaInfTldSource (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html
index 9d75329..a878246 100644
--- a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html
+++ b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.WebInfPerLibJarMetaInfTldSource.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jsp.TaglibFactory.WebInfPerLibJarMetaInfTldSource (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jsp.TaglibFactory.WebInfPerLibJarMetaInfTldSource (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.ext.jsp.TaglibFactory.WebInfPerLibJarMetaInfTldSource (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jsp.TaglibFactory.WebInfPerLibJarMetaInfTldSource (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.html b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.html
index 9ca6f88..464bfce 100644
--- a/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.html
+++ b/docs/api/freemarker/ext/jsp/class-use/TaglibFactory.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jsp.TaglibFactory (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jsp.TaglibFactory (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.ext.jsp.TaglibFactory (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jsp.TaglibFactory (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/package-frame.html b/docs/api/freemarker/ext/jsp/package-frame.html
index 72ab965..85cd5ad 100644
--- a/docs/api/freemarker/ext/jsp/package-frame.html
+++ b/docs/api/freemarker/ext/jsp/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.ext.jsp (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jsp (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/package-summary.html b/docs/api/freemarker/ext/jsp/package-summary.html
index f2583af..6c1b17c 100644
--- a/docs/api/freemarker/ext/jsp/package-summary.html
+++ b/docs/api/freemarker/ext/jsp/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.ext.jsp (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jsp (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.ext.jsp (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.jsp (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/package-tree.html b/docs/api/freemarker/ext/jsp/package-tree.html
index 1a7f86f..d077229 100644
--- a/docs/api/freemarker/ext/jsp/package-tree.html
+++ b/docs/api/freemarker/ext/jsp/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.ext.jsp Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jsp 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.ext.jsp Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.jsp Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jsp/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jsp/package-use.html b/docs/api/freemarker/ext/jsp/package-use.html
index 95dfdf4..f5285ec 100644
--- a/docs/api/freemarker/ext/jsp/package-use.html
+++ b/docs/api/freemarker/ext/jsp/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.ext.jsp (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.jsp (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.ext.jsp (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.jsp (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/JythonHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/JythonHashModel.html b/docs/api/freemarker/ext/jython/JythonHashModel.html
index da234c7..ced25a0 100644
--- a/docs/api/freemarker/ext/jython/JythonHashModel.html
+++ b/docs/api/freemarker/ext/jython/JythonHashModel.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>JythonHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>JythonHashModel (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="JythonHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="JythonHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/JythonModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/JythonModel.html b/docs/api/freemarker/ext/jython/JythonModel.html
index 2e17833..537efdd 100644
--- a/docs/api/freemarker/ext/jython/JythonModel.html
+++ b/docs/api/freemarker/ext/jython/JythonModel.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>JythonModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>JythonModel (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="JythonModel (FreeMarker 2.3.23 API)";
+            parent.document.title="JythonModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/JythonNumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/JythonNumberModel.html b/docs/api/freemarker/ext/jython/JythonNumberModel.html
index 668f559..e25d14b 100644
--- a/docs/api/freemarker/ext/jython/JythonNumberModel.html
+++ b/docs/api/freemarker/ext/jython/JythonNumberModel.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>JythonNumberModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>JythonNumberModel (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="JythonNumberModel (FreeMarker 2.3.23 API)";
+            parent.document.title="JythonNumberModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/JythonSequenceModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/JythonSequenceModel.html b/docs/api/freemarker/ext/jython/JythonSequenceModel.html
index 1f5f299..ab573cf 100644
--- a/docs/api/freemarker/ext/jython/JythonSequenceModel.html
+++ b/docs/api/freemarker/ext/jython/JythonSequenceModel.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>JythonSequenceModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>JythonSequenceModel (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="JythonSequenceModel (FreeMarker 2.3.23 API)";
+            parent.document.title="JythonSequenceModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/JythonVersionAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/JythonVersionAdapter.html b/docs/api/freemarker/ext/jython/JythonVersionAdapter.html
index 48c0b3a..6a7a81b 100644
--- a/docs/api/freemarker/ext/jython/JythonVersionAdapter.html
+++ b/docs/api/freemarker/ext/jython/JythonVersionAdapter.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>JythonVersionAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>JythonVersionAdapter (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="JythonVersionAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="JythonVersionAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/JythonWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/JythonWrapper.html b/docs/api/freemarker/ext/jython/JythonWrapper.html
index db52d42..0cfd0c5 100644
--- a/docs/api/freemarker/ext/jython/JythonWrapper.html
+++ b/docs/api/freemarker/ext/jython/JythonWrapper.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>JythonWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>JythonWrapper (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="JythonWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="JythonWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/class-use/JythonHashModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/class-use/JythonHashModel.html b/docs/api/freemarker/ext/jython/class-use/JythonHashModel.html
index 01fb6df..df122bd 100644
--- a/docs/api/freemarker/ext/jython/class-use/JythonHashModel.html
+++ b/docs/api/freemarker/ext/jython/class-use/JythonHashModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jython.JythonHashModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jython.JythonHashModel (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.ext.jython.JythonHashModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jython.JythonHashModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/class-use/JythonModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/class-use/JythonModel.html b/docs/api/freemarker/ext/jython/class-use/JythonModel.html
index 6b2dbc1..a0c3630 100644
--- a/docs/api/freemarker/ext/jython/class-use/JythonModel.html
+++ b/docs/api/freemarker/ext/jython/class-use/JythonModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jython.JythonModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jython.JythonModel (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.ext.jython.JythonModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jython.JythonModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/class-use/JythonNumberModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/class-use/JythonNumberModel.html b/docs/api/freemarker/ext/jython/class-use/JythonNumberModel.html
index a2bc471..6766ede 100644
--- a/docs/api/freemarker/ext/jython/class-use/JythonNumberModel.html
+++ b/docs/api/freemarker/ext/jython/class-use/JythonNumberModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jython.JythonNumberModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jython.JythonNumberModel (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.ext.jython.JythonNumberModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jython.JythonNumberModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/class-use/JythonSequenceModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/class-use/JythonSequenceModel.html b/docs/api/freemarker/ext/jython/class-use/JythonSequenceModel.html
index 7d37ae9..5c8e915 100644
--- a/docs/api/freemarker/ext/jython/class-use/JythonSequenceModel.html
+++ b/docs/api/freemarker/ext/jython/class-use/JythonSequenceModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jython.JythonSequenceModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jython.JythonSequenceModel (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.ext.jython.JythonSequenceModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jython.JythonSequenceModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/class-use/JythonVersionAdapter.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/class-use/JythonVersionAdapter.html b/docs/api/freemarker/ext/jython/class-use/JythonVersionAdapter.html
index 85e54b2..2dd5455 100644
--- a/docs/api/freemarker/ext/jython/class-use/JythonVersionAdapter.html
+++ b/docs/api/freemarker/ext/jython/class-use/JythonVersionAdapter.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jython.JythonVersionAdapter (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jython.JythonVersionAdapter (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.ext.jython.JythonVersionAdapter (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jython.JythonVersionAdapter (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/class-use/JythonWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/class-use/JythonWrapper.html b/docs/api/freemarker/ext/jython/class-use/JythonWrapper.html
index c2958bc..d0c24d8 100644
--- a/docs/api/freemarker/ext/jython/class-use/JythonWrapper.html
+++ b/docs/api/freemarker/ext/jython/class-use/JythonWrapper.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.jython.JythonWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.jython.JythonWrapper (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.ext.jython.JythonWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.jython.JythonWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/package-frame.html b/docs/api/freemarker/ext/jython/package-frame.html
index 0053e24..5f493be 100644
--- a/docs/api/freemarker/ext/jython/package-frame.html
+++ b/docs/api/freemarker/ext/jython/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.ext.jython (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jython (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/package-summary.html b/docs/api/freemarker/ext/jython/package-summary.html
index d283615..245f343 100644
--- a/docs/api/freemarker/ext/jython/package-summary.html
+++ b/docs/api/freemarker/ext/jython/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.ext.jython (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jython (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.ext.jython (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.jython (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/package-tree.html b/docs/api/freemarker/ext/jython/package-tree.html
index 817c7e4..d791a9f 100644
--- a/docs/api/freemarker/ext/jython/package-tree.html
+++ b/docs/api/freemarker/ext/jython/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.ext.jython Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.jython 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.ext.jython Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.jython Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/jython/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/jython/package-use.html b/docs/api/freemarker/ext/jython/package-use.html
index 0a74bd5..3a40d4a 100644
--- a/docs/api/freemarker/ext/jython/package-use.html
+++ b/docs/api/freemarker/ext/jython/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.ext.jython (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.jython (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.ext.jython (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.jython (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/RhinoFunctionModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/RhinoFunctionModel.html b/docs/api/freemarker/ext/rhino/RhinoFunctionModel.html
index 2245b1d..cfc94c9 100644
--- a/docs/api/freemarker/ext/rhino/RhinoFunctionModel.html
+++ b/docs/api/freemarker/ext/rhino/RhinoFunctionModel.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>RhinoFunctionModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>RhinoFunctionModel (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="RhinoFunctionModel (FreeMarker 2.3.23 API)";
+            parent.document.title="RhinoFunctionModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/RhinoScriptableModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/RhinoScriptableModel.html b/docs/api/freemarker/ext/rhino/RhinoScriptableModel.html
index 17f5948..c05de61 100644
--- a/docs/api/freemarker/ext/rhino/RhinoScriptableModel.html
+++ b/docs/api/freemarker/ext/rhino/RhinoScriptableModel.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>RhinoScriptableModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>RhinoScriptableModel (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="RhinoScriptableModel (FreeMarker 2.3.23 API)";
+            parent.document.title="RhinoScriptableModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -417,7 +417,7 @@ implements <a href="../../../freemarker/template/TemplateHashModelEx.html" title
 <h4>getAsNumber</h4>
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Number.html?is-external=true" title="class or interface in java.lang">Number</a>&nbsp;getAsNumber()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../freemarker/template/TemplateNumberModel.html#getAsNumber--">TemplateNumberModel</a></code></span></div>
-<div class="block">Returns the numeric value. The return value must not be null.</div>
+<div class="block">Returns the numeric value. The return value must not be <code>null</code>.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../freemarker/template/TemplateNumberModel.html#getAsNumber--">getAsNumber</a></code>&nbsp;in interface&nbsp;<code><a href="../../../freemarker/template/TemplateNumberModel.html" title="interface in freemarker.template">TemplateNumberModel</a></code></dd>
@@ -434,8 +434,12 @@ implements <a href="../../../freemarker/template/TemplateHashModelEx.html" title
 <h4>getAsString</h4>
 <pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getAsString()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../freemarker/template/TemplateScalarModel.html#getAsString--">TemplateScalarModel</a></code></span></div>
-<div class="block">Returns the string representation of this model. Don't return <code>null</code>, as that will cause exception.
- (In classic-compatible mode the engine will convert <code>null</code> into empty string, though.)</div>
+<div class="block">Returns the string representation of this model. Don't return <code>null</code>, as that will cause exception. (In
+ classic-compatible mode the engine will convert <code>null</code> into empty string, though.)
+ 
+ <p>
+ Objects of this type should be immutable, that is, calling <a href="../../../freemarker/template/TemplateScalarModel.html#getAsString--"><code>TemplateScalarModel.getAsString()</code></a> should always return the same
+ value as for the first time.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../freemarker/template/TemplateScalarModel.html#getAsString--">getAsString</a></code>&nbsp;in interface&nbsp;<code><a href="../../../freemarker/template/TemplateScalarModel.html" title="interface in freemarker.template">TemplateScalarModel</a></code></dd>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/RhinoWrapper.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/RhinoWrapper.html b/docs/api/freemarker/ext/rhino/RhinoWrapper.html
index d01f13c..ff62db5 100644
--- a/docs/api/freemarker/ext/rhino/RhinoWrapper.html
+++ b/docs/api/freemarker/ext/rhino/RhinoWrapper.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>RhinoWrapper (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>RhinoWrapper (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="RhinoWrapper (FreeMarker 2.3.23 API)";
+            parent.document.title="RhinoWrapper (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/rhino/class-use/RhinoFunctionModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/rhino/class-use/RhinoFunctionModel.html b/docs/api/freemarker/ext/rhino/class-use/RhinoFunctionModel.html
index 37f3e28..c4b5951 100644
--- a/docs/api/freemarker/ext/rhino/class-use/RhinoFunctionModel.html
+++ b/docs/api/freemarker/ext/rhino/class-use/RhinoFunctionModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.rhino.RhinoFunctionModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.rhino.RhinoFunctionModel (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.ext.rhino.RhinoFunctionModel (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.rhino.RhinoFunctionModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {



[19/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/package-tree.html b/docs/api/freemarker/core/package-tree.html
index fc13c06..cb79818 100644
--- a/docs/api/freemarker/core/package-tree.html
+++ b/docs/api/freemarker/core/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.core Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.core 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.core Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.core Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -89,6 +89,15 @@
 </ul>
 </li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/CommandLine.html" title="class in freemarker.core"><span class="typeNameLink">CommandLine</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">CommonTemplateMarkupOutputModel</span></a>&lt;MO&gt; (implements freemarker.core.<a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core">TemplateMarkupOutputModel</a>&lt;MO&gt;)
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateCombinedMarkupOutputModel</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateHTMLOutputModel</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateRTFOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateRTFOutputModel</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateXHTMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateXHTMLOutputModel</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateXMLOutputModel.html" title="class in freemarker.core"><span class="typeNameLink">TemplateXMLOutputModel</span></a></li>
+</ul>
+</li>
 <li type="circle">java.awt.<a href="http://docs.oracle.com/javase/8/docs/api/java/awt/Component.html?is-external=true" title="class or interface in java.awt"><span class="typeNameLink">Component</span></a> (implements java.awt.image.<a href="http://docs.oracle.com/javase/8/docs/api/java/awt/image/ImageObserver.html?is-external=true" title="class or interface in java.awt.image">ImageObserver</a>, java.awt.<a href="http://docs.oracle.com/javase/8/docs/api/java/awt/MenuContainer.html?is-external=true" title="class or interface in java.awt">MenuContainer</a>, 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.awt.<a href="http://docs.oracle.com/javase/8/docs/api/java/awt/Container.html?is-external=true" title="class or interface in java.awt"><span class="typeNameLink">Container</span></a>
@@ -109,10 +118,54 @@
 <li type="circle">freemarker.core.<a href="../../freemarker/core/Configurable.html" title="class in freemarker.core"><span class="typeNameLink">Configurable</span></a>
 <ul>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><span class="typeNameLink">Environment</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateConfiguration.html" title="class in freemarker.core"><span class="typeNameLink">TemplateConfiguration</span></a> (implements freemarker.core.<a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core">ParserConfiguration</a>)</li>
 </ul>
 </li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/CustomAttribute.html" title="class in freemarker.core"><span class="typeNameLink">CustomAttribute</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/OptInTemplateClassResolver.html" title="class in freemarker.core"><span class="typeNameLink">OptInTemplateClassResolver</span></a> (implements freemarker.core.<a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core">TemplateClassResolver</a>)</li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">OutputFormat</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CSSOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/JavaScriptOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">JavaScriptOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/JSONOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">JSONOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">MarkupOutputFormat</span></a>&lt;MO&gt;
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CommonMarkupOutputFormat</span></a>&lt;MO&gt;
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">CombinedMarkupOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">HTMLOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">RTFOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/XHTMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">XHTMLOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">XMLOutputFormat</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/PlainTextOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">PlainTextOutputFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">UndefinedOutputFormat</span></a></li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateFormatUtil.html" title="class in freemarker.core"><span class="typeNameLink">TemplateFormatUtil</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><span class="typeNameLink">TemplateValueFormat</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><span class="typeNameLink">TemplateDateFormat</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><span class="typeNameLink">TemplateNumberFormat</span></a></li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateValueFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">TemplateValueFormatFactory</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">TemplateDateFormatFactory</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">AliasTemplateDateFormatFactory</span></a></li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">TemplateNumberFormatFactory</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/AliasTemplateNumberFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">AliasTemplateNumberFormatFactory</span></a></li>
+</ul>
+</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>
@@ -144,16 +197,37 @@
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonDateException.html" title="class in freemarker.core"><span class="typeNameLink">NonDateException</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonExtendedHashException.html" title="class in freemarker.core"><span class="typeNameLink">NonExtendedHashException</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonHashException.html" title="class in freemarker.core"><span class="typeNameLink">NonHashException</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/NonMarkupOutputException.html" title="class in freemarker.core"><span class="typeNameLink">NonMarkupOutputException</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonMethodException.html" title="class in freemarker.core"><span class="typeNameLink">NonMethodException</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonNodeException.html" title="class in freemarker.core"><span class="typeNameLink">NonNodeException</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonNumericalException.html" title="class in freemarker.core"><span class="typeNameLink">NonNumericalException</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonSequenceException.html" title="class in freemarker.core"><span class="typeNameLink">NonSequenceException</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonSequenceOrCollectionException.html" title="class in freemarker.core"><span class="typeNameLink">NonSequenceOrCollectionException</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/NonStringException.html" title="class in freemarker.core"><span class="typeNameLink">NonStringException</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/NonStringOrTemplateOutputException.html" title="class in freemarker.core"><span class="typeNameLink">NonStringOrTemplateOutputException</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateValueFormatException.html" title="class in freemarker.core"><span class="typeNameLink">TemplateValueFormatException</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/InvalidFormatStringException.html" title="class in freemarker.core"><span class="typeNameLink">InvalidFormatStringException</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/InvalidFormatParametersException.html" title="class in freemarker.core"><span class="typeNameLink">InvalidFormatParametersException</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/UndefinedCustomFormatException.html" title="class in freemarker.core"><span class="typeNameLink">UndefinedCustomFormatException</span></a></li>
 </ul>
 </li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/ParsingNotSupportedException.html" title="class in freemarker.core"><span class="typeNameLink">ParsingNotSupportedException</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/UnformattableValueException.html" title="class in freemarker.core"><span class="typeNameLink">UnformattableValueException</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/UnknownDateTypeFormattingUnsupportedException.html" title="class in freemarker.core"><span class="typeNameLink">UnknownDateTypeFormattingUnsupportedException</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/UnknownDateTypeParsingUnsupportedException.html" title="class in freemarker.core"><span class="typeNameLink">UnknownDateTypeParsingUnsupportedException</span></a></li>
 </ul>
 </li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/UnparsableValueException.html" title="class in freemarker.core"><span class="typeNameLink">UnparsableValueException</span></a></li>
+</ul>
+</li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/UnregisteredOutputFormatException.html" title="class in freemarker.core"><span class="typeNameLink">UnregisteredOutputFormatException</span></a></li>
 </ul>
 </li>
 </ul>
@@ -173,7 +247,13 @@
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/DirectiveCallPlace.html" title="interface in freemarker.core"><span class="typeNameLink">DirectiveCallPlace</span></a></li>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/ParserConfiguration.html" title="interface in freemarker.core"><span class="typeNameLink">ParserConfiguration</span></a></li>
 <li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateClassResolver.html" title="interface in freemarker.core"><span class="typeNameLink">TemplateClassResolver</span></a></li>
+<li type="circle">freemarker.template.<a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><span class="typeNameLink">TemplateModel</span></a>
+<ul>
+<li type="circle">freemarker.core.<a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><span class="typeNameLink">TemplateMarkupOutputModel</span></a>&lt;MO&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/package-use.html b/docs/api/freemarker/core/package-use.html
index 73edc5b..1a87f6e 100644
--- a/docs/api/freemarker/core/package-use.html
+++ b/docs/api/freemarker/core/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.core (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.core (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.core (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.core (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -134,6 +134,12 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 <div class="block">Object that represents the runtime environment during template processing.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateConfiguration.html#freemarker.cache">TemplateConfiguration</a>
+<div class="block">Used for customizing the configuration settings for individual <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s (or rather groups of templates),
+ relatively to the common setting values coming from the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -168,11 +174,33 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/CombinedMarkupOutputFormat.html#freemarker.core">CombinedMarkupOutputFormat</a>
+<div class="block">Represents two markup formats nested into each other.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/CommonMarkupOutputFormat.html#freemarker.core">CommonMarkupOutputFormat</a>
+<div class="block">Common superclass for implementing <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core"><code>MarkupOutputFormat</code></a>-s that use a <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a>
+ subclass.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/CommonTemplateMarkupOutputModel.html#freemarker.core">CommonTemplateMarkupOutputModel</a>
+<div class="block">Common superclass for implementing <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s that belong to a
+ <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core"><code>CommonMarkupOutputFormat</code></a> subclass format.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/core/class-use/Configurable.html#freemarker.core">Configurable</a>
 <div class="block">This is a common superclass of <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>,
  <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>, and <a href="../../freemarker/core/Environment.html" title="class in freemarker.core"><code>Environment</code></a> classes.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/CSSOutputFormat.html#freemarker.core">CSSOutputFormat</a>
+<div class="block">Represents the CSS output format (MIME type "text/css", name "CSS").</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/core/class-use/DirectiveCallPlace.html#freemarker.core">DirectiveCallPlace</a>
 <div class="block">Gives information about the place where a directive is called from, also lets you attach a custom data object to that
@@ -188,10 +216,63 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 <td class="colOne"><a href="../../freemarker/core/class-use/Environment.Namespace.html#freemarker.core">Environment.Namespace</a>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/HTMLOutputFormat.html#freemarker.core">HTMLOutputFormat</a>
+<div class="block">Represents the HTML output format (MIME type "text/html", name "HTML").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/InvalidFormatParametersException.html#freemarker.core">InvalidFormatParametersException</a>
+<div class="block">Used when creating <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the parameters
+ part of the format string (like some kind of pattern) is malformed.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/InvalidFormatStringException.html#freemarker.core">InvalidFormatStringException</a>
+<div class="block">Used when creating <a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>-s and <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>-s to indicate that the format
+ string (like the value of the <code>dateFormat</code> setting) is malformed.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/JavaScriptOutputFormat.html#freemarker.core">JavaScriptOutputFormat</a>
+<div class="block">Represents the JavaScript output format (MIME type "application/javascript", name "JavaScript").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/JSONOutputFormat.html#freemarker.core">JSONOutputFormat</a>
+<div class="block">Represents the JSON output format (MIME type "application/json", name "JSON").</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/MarkupOutputFormat.html#freemarker.core">MarkupOutputFormat</a>
+<div class="block">Superclass of <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>-s that represent a "markup" format, which is any format where certain character
+ sequences have special meaning and thus may need escaping.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/OutputFormat.html#freemarker.core">OutputFormat</a>
+<div class="block">Represents an output format.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/core/class-use/ParseException.html#freemarker.core">ParseException</a>
 <div class="block">Parsing-time exception in a template (as opposed to a runtime exception, a <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template"><code>TemplateException</code></a>).</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/ParserConfiguration.html#freemarker.core">ParserConfiguration</a>
+<div class="block"><b>Don't implement this interface yourself</b>; use the existing implementation(s).</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/PlainTextOutputFormat.html#freemarker.core">PlainTextOutputFormat</a>
+<div class="block">Represents the plain text output format (MIME type "text/plain", name "plainText").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/RTFOutputFormat.html#freemarker.core">RTFOutputFormat</a>
+<div class="block">Represents the Rich Text Format output format (MIME type "application/rtf", name "RTF").</div>
+</td>
+</tr>
 <tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/core/class-use/TemplateClassResolver.html#freemarker.core">TemplateClassResolver</a>
 <div class="block">Used by built-ins and other template language features that get a class
@@ -199,10 +280,104 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateCombinedMarkupOutputModel.html#freemarker.core">TemplateCombinedMarkupOutputModel</a>
+<div class="block">Stores combined markup to be printed; used with <a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><code>CombinedMarkupOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateConfiguration.html#freemarker.core">TemplateConfiguration</a>
+<div class="block">Used for customizing the configuration settings for individual <a href="../../freemarker/template/Template.html" title="class in freemarker.template"><code>Template</code></a>-s (or rather groups of templates),
+ relatively to the common setting values coming from the <a href="../../freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateDateFormat.html#freemarker.core">TemplateDateFormat</a>
+<div class="block">Represents a date/time/dateTime format; used in templates for formatting and parsing with that format.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateDateFormatFactory.html#freemarker.core">TemplateDateFormatFactory</a>
+<div class="block">Factory for a certain kind of date/time/dateTime formatting (<a href="../../freemarker/core/TemplateDateFormat.html" title="class in freemarker.core"><code>TemplateDateFormat</code></a>).</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateHTMLOutputModel.html#freemarker.core">TemplateHTMLOutputModel</a>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateMarkupOutputModel.html#freemarker.core">TemplateMarkupOutputModel</a>
+<div class="block">"markup output" template language data-type; stores markup (some kind of "rich text" / structured format, as opposed
+ to plain text) that meant to be printed as template output.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateNumberFormat.html#freemarker.core">TemplateNumberFormat</a>
+<div class="block">Represents a number format; used in templates for formatting and parsing with that format.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateNumberFormatFactory.html#freemarker.core">TemplateNumberFormatFactory</a>
+<div class="block">Factory for a certain kind of number formatting (<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>).</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateRTFOutputModel.html#freemarker.core">TemplateRTFOutputModel</a>
+<div class="block">Stores RTF markup to be printed; used with <a href="../../freemarker/core/RTFOutputFormat.html" title="class in freemarker.core"><code>RTFOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateValueFormat.html#freemarker.core">TemplateValueFormat</a>
+<div class="block">Superclass of all value format objects; objects that convert values to strings, or parse strings.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateValueFormatException.html#freemarker.core">TemplateValueFormatException</a>
+<div class="block">Error while getting, creating or applying <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a>-s (including its subclasses, like
+ <a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core"><code>TemplateNumberFormat</code></a>).</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateValueFormatFactory.html#freemarker.core">TemplateValueFormatFactory</a>
+<div class="block">Superclass of all format factories.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateXHTMLOutputModel.html#freemarker.core">TemplateXHTMLOutputModel</a>
+<div class="block">Stores HTML markup to be printed; used with <a href="../../freemarker/core/HTMLOutputFormat.html" title="class in freemarker.core"><code>HTMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/TemplateXMLOutputModel.html#freemarker.core">TemplateXMLOutputModel</a>
+<div class="block">Stores XML markup to be printed; used with <a href="../../freemarker/core/XMLOutputFormat.html" title="class in freemarker.core"><code>XMLOutputFormat</code></a>.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/UndefinedOutputFormat.html#freemarker.core">UndefinedOutputFormat</a>
+<div class="block">Represents the output format used when the template output format is undecided.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/core/class-use/UnexpectedTypeException.html#freemarker.core">UnexpectedTypeException</a>
 <div class="block">The type of a value differs from what was expected.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/UnformattableValueException.html#freemarker.core">UnformattableValueException</a>
+<div class="block">Thrown when a <a href="../../freemarker/template/TemplateModel.html" title="interface in freemarker.template"><code>TemplateModel</code></a> can't be formatted because of the value/properties of it are outside of that the
+ <a href="../../freemarker/core/TemplateValueFormat.html" title="class in freemarker.core"><code>TemplateValueFormat</code></a> supports.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/XHTMLOutputFormat.html#freemarker.core">XHTMLOutputFormat</a>
+<div class="block">Represents the XML output format (MIME type "application/xhtml+xml", name "XHTML").</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/XMLOutputFormat.html#freemarker.core">XMLOutputFormat</a>
+<div class="block">Represents the XML output format (MIME type "application/xml", name "XML").</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -244,10 +419,23 @@ start with <a href="../../freemarker/template/Configuration.html" title="class i
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/OutputFormat.html#freemarker.template">OutputFormat</a>
+<div class="block">Represents an output format.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="../../freemarker/core/class-use/ParseException.html#freemarker.template">ParseException</a>
 <div class="block">Parsing-time exception in a template (as opposed to a runtime exception, a <a href="../../freemarker/template/TemplateException.html" title="class in freemarker.template"><code>TemplateException</code></a>).</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/ParserConfiguration.html#freemarker.template">ParserConfiguration</a>
+<div class="block"><b>Don't implement this interface yourself</b>; use the existing implementation(s).</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="../../freemarker/core/class-use/UnregisteredOutputFormatException.html#freemarker.template">UnregisteredOutputFormatException</a>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/Breakpoint.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/Breakpoint.html b/docs/api/freemarker/debug/Breakpoint.html
index 64e2b7e..0d9b008 100644
--- a/docs/api/freemarker/debug/Breakpoint.html
+++ b/docs/api/freemarker/debug/Breakpoint.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Breakpoint (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Breakpoint (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="Breakpoint (FreeMarker 2.3.23 API)";
+            parent.document.title="Breakpoint (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/DebugModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/DebugModel.html b/docs/api/freemarker/debug/DebugModel.html
index 0ff3027..9410f75 100644
--- a/docs/api/freemarker/debug/DebugModel.html
+++ b/docs/api/freemarker/debug/DebugModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DebugModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DebugModel (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="DebugModel (FreeMarker 2.3.23 API)";
+            parent.document.title="DebugModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/DebuggedEnvironment.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/DebuggedEnvironment.html b/docs/api/freemarker/debug/DebuggedEnvironment.html
index d9f64e9..4f6a34a 100644
--- a/docs/api/freemarker/debug/DebuggedEnvironment.html
+++ b/docs/api/freemarker/debug/DebuggedEnvironment.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DebuggedEnvironment (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DebuggedEnvironment (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="DebuggedEnvironment (FreeMarker 2.3.23 API)";
+            parent.document.title="DebuggedEnvironment (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/Debugger.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/Debugger.html b/docs/api/freemarker/debug/Debugger.html
index 67309cc..960a064 100644
--- a/docs/api/freemarker/debug/Debugger.html
+++ b/docs/api/freemarker/debug/Debugger.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Debugger (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Debugger (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="Debugger (FreeMarker 2.3.23 API)";
+            parent.document.title="Debugger (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/DebuggerClient.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/DebuggerClient.html b/docs/api/freemarker/debug/DebuggerClient.html
index 5d379aa..6db94fa 100644
--- a/docs/api/freemarker/debug/DebuggerClient.html
+++ b/docs/api/freemarker/debug/DebuggerClient.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DebuggerClient (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DebuggerClient (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="DebuggerClient (FreeMarker 2.3.23 API)";
+            parent.document.title="DebuggerClient (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/DebuggerListener.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/DebuggerListener.html b/docs/api/freemarker/debug/DebuggerListener.html
index 0a9266d..290662d 100644
--- a/docs/api/freemarker/debug/DebuggerListener.html
+++ b/docs/api/freemarker/debug/DebuggerListener.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DebuggerListener (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>DebuggerListener (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="DebuggerListener (FreeMarker 2.3.23 API)";
+            parent.document.title="DebuggerListener (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/EnvironmentSuspendedEvent.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/EnvironmentSuspendedEvent.html b/docs/api/freemarker/debug/EnvironmentSuspendedEvent.html
index 351708f..f9495ec 100644
--- a/docs/api/freemarker/debug/EnvironmentSuspendedEvent.html
+++ b/docs/api/freemarker/debug/EnvironmentSuspendedEvent.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>EnvironmentSuspendedEvent (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>EnvironmentSuspendedEvent (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="EnvironmentSuspendedEvent (FreeMarker 2.3.23 API)";
+            parent.document.title="EnvironmentSuspendedEvent (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/class-use/Breakpoint.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/class-use/Breakpoint.html b/docs/api/freemarker/debug/class-use/Breakpoint.html
index f2c77af..e63bfa7 100644
--- a/docs/api/freemarker/debug/class-use/Breakpoint.html
+++ b/docs/api/freemarker/debug/class-use/Breakpoint.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.debug.Breakpoint (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.debug.Breakpoint (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.debug.Breakpoint (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.debug.Breakpoint (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/class-use/DebuggerClient.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/class-use/DebuggerClient.html b/docs/api/freemarker/debug/class-use/DebuggerClient.html
index 2e36bc6..b4bab69 100644
--- a/docs/api/freemarker/debug/class-use/DebuggerClient.html
+++ b/docs/api/freemarker/debug/class-use/DebuggerClient.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.debug.DebuggerClient (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.debug.DebuggerClient (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.debug.DebuggerClient (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.debug.DebuggerClient (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/class-use/EnvironmentSuspendedEvent.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/class-use/EnvironmentSuspendedEvent.html b/docs/api/freemarker/debug/class-use/EnvironmentSuspendedEvent.html
index d1f0e8d..ee02bf3 100644
--- a/docs/api/freemarker/debug/class-use/EnvironmentSuspendedEvent.html
+++ b/docs/api/freemarker/debug/class-use/EnvironmentSuspendedEvent.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.debug.EnvironmentSuspendedEvent (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.debug.EnvironmentSuspendedEvent (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.debug.EnvironmentSuspendedEvent (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.debug.EnvironmentSuspendedEvent (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/package-frame.html b/docs/api/freemarker/debug/package-frame.html
index e3c2239..5c8130c 100644
--- a/docs/api/freemarker/debug/package-frame.html
+++ b/docs/api/freemarker/debug/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.debug (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.debug (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/package-summary.html b/docs/api/freemarker/debug/package-summary.html
index 848b7d0..f6a2230 100644
--- a/docs/api/freemarker/debug/package-summary.html
+++ b/docs/api/freemarker/debug/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.debug (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.debug (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.debug (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.debug (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/package-tree.html b/docs/api/freemarker/debug/package-tree.html
index d3a9687..07ad9ef 100644
--- a/docs/api/freemarker/debug/package-tree.html
+++ b/docs/api/freemarker/debug/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.debug Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.debug 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.debug Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.debug Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/debug/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/debug/package-use.html b/docs/api/freemarker/debug/package-use.html
index 3536e1b..fdf4a04 100644
--- a/docs/api/freemarker/debug/package-use.html
+++ b/docs/api/freemarker/debug/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.debug (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.debug (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.debug (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.debug (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/FreemarkerXmlTask.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/FreemarkerXmlTask.html b/docs/api/freemarker/ext/ant/FreemarkerXmlTask.html
index 1d35ffa..a338904 100644
--- a/docs/api/freemarker/ext/ant/FreemarkerXmlTask.html
+++ b/docs/api/freemarker/ext/ant/FreemarkerXmlTask.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>FreemarkerXmlTask (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>FreemarkerXmlTask (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="FreemarkerXmlTask (FreeMarker 2.3.23 API)";
+            parent.document.title="FreemarkerXmlTask (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -132,7 +132,8 @@ var activeTableTab = "activeTableTab";
 <div class="block"><span class="deprecationComment"><a href="http://fmpp.sourceforge.net">FMPP</a> is a more complete solution.</span></div>
 </div>
 <br>
-<pre>public class <span class="typeNameLabel">FreemarkerXmlTask</span>
+<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 class <span class="typeNameLabel">FreemarkerXmlTask</span>
 extends org.apache.tools.ant.taskdefs.MatchingTask</pre>
 <div class="block"><p>This is an <a href="http://jakarta.apache.org/ant/" target="_top">Ant</a> task for transforming
  XML documents using FreeMarker templates. It uses the adapter class

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/JythonAntTask.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/JythonAntTask.html b/docs/api/freemarker/ext/ant/JythonAntTask.html
index 7e6d4f0..49f7090 100644
--- a/docs/api/freemarker/ext/ant/JythonAntTask.html
+++ b/docs/api/freemarker/ext/ant/JythonAntTask.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JythonAntTask (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>JythonAntTask (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="JythonAntTask (FreeMarker 2.3.23 API)";
+            parent.document.title="JythonAntTask (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/UnlinkedJythonOperationsImpl.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/UnlinkedJythonOperationsImpl.html b/docs/api/freemarker/ext/ant/UnlinkedJythonOperationsImpl.html
index 6319a3a..a906ac7 100644
--- a/docs/api/freemarker/ext/ant/UnlinkedJythonOperationsImpl.html
+++ b/docs/api/freemarker/ext/ant/UnlinkedJythonOperationsImpl.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>UnlinkedJythonOperationsImpl (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>UnlinkedJythonOperationsImpl (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="UnlinkedJythonOperationsImpl (FreeMarker 2.3.23 API)";
+            parent.document.title="UnlinkedJythonOperationsImpl (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/class-use/FreemarkerXmlTask.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/class-use/FreemarkerXmlTask.html b/docs/api/freemarker/ext/ant/class-use/FreemarkerXmlTask.html
index 9e7565e..8c34ca0 100644
--- a/docs/api/freemarker/ext/ant/class-use/FreemarkerXmlTask.html
+++ b/docs/api/freemarker/ext/ant/class-use/FreemarkerXmlTask.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.ant.FreemarkerXmlTask (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.ant.FreemarkerXmlTask (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.ext.ant.FreemarkerXmlTask (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.ant.FreemarkerXmlTask (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/class-use/JythonAntTask.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/class-use/JythonAntTask.html b/docs/api/freemarker/ext/ant/class-use/JythonAntTask.html
index 0d6a92b..4e992ca 100644
--- a/docs/api/freemarker/ext/ant/class-use/JythonAntTask.html
+++ b/docs/api/freemarker/ext/ant/class-use/JythonAntTask.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.ant.JythonAntTask (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.ant.JythonAntTask (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.ext.ant.JythonAntTask (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.ant.JythonAntTask (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/class-use/UnlinkedJythonOperationsImpl.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/class-use/UnlinkedJythonOperationsImpl.html b/docs/api/freemarker/ext/ant/class-use/UnlinkedJythonOperationsImpl.html
index 4af1e0a..ca2c0b3 100644
--- a/docs/api/freemarker/ext/ant/class-use/UnlinkedJythonOperationsImpl.html
+++ b/docs/api/freemarker/ext/ant/class-use/UnlinkedJythonOperationsImpl.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:58 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:06 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class freemarker.ext.ant.UnlinkedJythonOperationsImpl (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Class freemarker.ext.ant.UnlinkedJythonOperationsImpl (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.ext.ant.UnlinkedJythonOperationsImpl (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Class freemarker.ext.ant.UnlinkedJythonOperationsImpl (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/package-frame.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/package-frame.html b/docs/api/freemarker/ext/ant/package-frame.html
index 374be4c..898f1de 100644
--- a/docs/api/freemarker/ext/ant/package-frame.html
+++ b/docs/api/freemarker/ext/ant/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.ext.ant (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.ant (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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/package-summary.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/package-summary.html b/docs/api/freemarker/ext/ant/package-summary.html
index 8230644..65df1ec 100644
--- a/docs/api/freemarker/ext/ant/package-summary.html
+++ b/docs/api/freemarker/ext/ant/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.ext.ant (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.ant (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.ext.ant (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.ant (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/package-tree.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/package-tree.html b/docs/api/freemarker/ext/ant/package-tree.html
index 13cdb9a..dde34dc 100644
--- a/docs/api/freemarker/ext/ant/package-tree.html
+++ b/docs/api/freemarker/ext/ant/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.ext.ant Class Hierarchy (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>freemarker.ext.ant 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.ext.ant Class Hierarchy (FreeMarker 2.3.23 API)";
+            parent.document.title="freemarker.ext.ant Class Hierarchy (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/ant/package-use.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/ant/package-use.html b/docs/api/freemarker/ext/ant/package-use.html
index c1dbb8f..b643c14 100644
--- a/docs/api/freemarker/ext/ant/package-use.html
+++ b/docs/api/freemarker/ext/ant/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.ext.ant (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Uses of Package freemarker.ext.ant (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.ext.ant (FreeMarker 2.3.23 API)";
+            parent.document.title="Uses of Package freemarker.ext.ant (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/ArrayModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/ArrayModel.html b/docs/api/freemarker/ext/beans/ArrayModel.html
index 37d1f1b..0b33c51 100644
--- a/docs/api/freemarker/ext/beans/ArrayModel.html
+++ b/docs/api/freemarker/ext/beans/ArrayModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ArrayModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ArrayModel (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="ArrayModel (FreeMarker 2.3.23 API)";
+            parent.document.title="ArrayModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/BeanModel.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/BeanModel.html b/docs/api/freemarker/ext/beans/BeanModel.html
index aebc614..9c6cae7 100644
--- a/docs/api/freemarker/ext/beans/BeanModel.html
+++ b/docs/api/freemarker/ext/beans/BeanModel.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BeanModel (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BeanModel (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="BeanModel (FreeMarker 2.3.23 API)";
+            parent.document.title="BeanModel (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/BeansModelCache.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/BeansModelCache.html b/docs/api/freemarker/ext/beans/BeansModelCache.html
index 7160ae4..a6f6630 100644
--- a/docs/api/freemarker/ext/beans/BeansModelCache.html
+++ b/docs/api/freemarker/ext/beans/BeansModelCache.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BeansModelCache (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BeansModelCache (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="BeansModelCache (FreeMarker 2.3.23 API)";
+            parent.document.title="BeansModelCache (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecision.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecision.html b/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecision.html
index 6c9f31e..304aa5b 100644
--- a/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecision.html
+++ b/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecision.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BeansWrapper.MethodAppearanceDecision (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BeansWrapper.MethodAppearanceDecision (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="BeansWrapper.MethodAppearanceDecision (FreeMarker 2.3.23 API)";
+            parent.document.title="BeansWrapper.MethodAppearanceDecision (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecisionInput.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecisionInput.html b/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecisionInput.html
index af6bc2b..92ba657 100644
--- a/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecisionInput.html
+++ b/docs/api/freemarker/ext/beans/BeansWrapper.MethodAppearanceDecisionInput.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Mar 28 17:23:04 CEST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>BeansWrapper.MethodAppearanceDecisionInput (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BeansWrapper.MethodAppearanceDecisionInput (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="BeansWrapper.MethodAppearanceDecisionInput (FreeMarker 2.3.23 API)";
+            parent.document.title="BeansWrapper.MethodAppearanceDecisionInput (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {


[40/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/AliasTemplateNumberFormatFactory.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/AliasTemplateNumberFormatFactory.html b/docs/api/freemarker/core/AliasTemplateNumberFormatFactory.html
new file mode 100644
index 0000000..9167626
--- /dev/null
+++ b/docs/api/freemarker/core/AliasTemplateNumberFormatFactory.html
@@ -0,0 +1,349 @@
+<!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>AliasTemplateNumberFormatFactory (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="AliasTemplateNumberFormatFactory (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/AliasTemplateNumberFormatFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/ArithmeticEngine.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/AliasTemplateNumberFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="AliasTemplateNumberFormatFactory.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 AliasTemplateNumberFormatFactory" class="title">Class AliasTemplateNumberFormatFactory</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/TemplateNumberFormatFactory.html" title="class in freemarker.core">freemarker.core.TemplateNumberFormatFactory</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.AliasTemplateNumberFormatFactory</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">AliasTemplateNumberFormatFactory</span>
+extends <a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</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/AliasTemplateNumberFormatFactory.html#AliasTemplateNumberFormatFactory-java.lang.String-">AliasTemplateNumberFormatFactory</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/AliasTemplateNumberFormatFactory.html#AliasTemplateNumberFormatFactory-java.lang.String-java.util.Map-">AliasTemplateNumberFormatFactory</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/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/AliasTemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-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,
+   <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="../../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="AliasTemplateNumberFormatFactory-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>AliasTemplateNumberFormatFactory</h4>
+<pre>public&nbsp;AliasTemplateNumberFormatFactory(<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="AliasTemplateNumberFormatFactory-java.lang.String-java.util.Map-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AliasTemplateNumberFormatFactory</h4>
+<pre>public&nbsp;AliasTemplateNumberFormatFactory(<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-java.util.Locale-freemarker.core.Environment-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>get</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/TemplateNumberFormat.html" title="class in freemarker.core">TemplateNumberFormat</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,
+                                <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="../../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/TemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-freemarker.core.Environment-">TemplateNumberFormatFactory</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/TemplateNumberFormatFactory.html#get-java.lang.String-java.util.Locale-freemarker.core.Environment-">get</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/TemplateNumberFormatFactory.html" title="class in freemarker.core">TemplateNumberFormatFactory</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#getNumberFormat--"><code>numberFormat</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/TemplateNumberFormatFactory.html" title="class in freemarker.core"><code>TemplateNumberFormatFactory</code></a> implementation. Not <code>null</code>, often an empty string.</dd>
+<dd><code>locale</code> - The locale to format for. Not <code>null</code>. The resulting format must 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>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 the <code>params</code> is malformed.</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/AliasTemplateNumberFormatFactory.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/AliasTemplateDateFormatFactory.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/ArithmeticEngine.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/AliasTemplateNumberFormatFactory.html" target="_top">Frames</a></li>
+<li><a href="AliasTemplateNumberFormatFactory.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html b/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html
index 99a831c..9663d75 100644
--- a/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html
+++ b/docs/api/freemarker/core/ArithmeticEngine.BigDecimalEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>ArithmeticEngine.BigDecimalEngine (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ArithmeticEngine.BigDecimalEngine (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="ArithmeticEngine.BigDecimalEngine (FreeMarker 2.3.23 API)";
+            parent.document.title="ArithmeticEngine.BigDecimalEngine (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html b/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html
index 8bdb1c3..99f9e37 100644
--- a/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html
+++ b/docs/api/freemarker/core/ArithmeticEngine.ConservativeEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>ArithmeticEngine.ConservativeEngine (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ArithmeticEngine.ConservativeEngine (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="ArithmeticEngine.ConservativeEngine (FreeMarker 2.3.23 API)";
+            parent.document.title="ArithmeticEngine.ConservativeEngine (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/ArithmeticEngine.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/ArithmeticEngine.html b/docs/api/freemarker/core/ArithmeticEngine.html
index a620b90..1d6b5f3 100644
--- a/docs/api/freemarker/core/ArithmeticEngine.html
+++ b/docs/api/freemarker/core/ArithmeticEngine.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>ArithmeticEngine (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ArithmeticEngine (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="ArithmeticEngine (FreeMarker 2.3.23 API)";
+            parent.document.title="ArithmeticEngine (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </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">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/ArithmeticEngine.BigDecimalEngine.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -534,7 +534,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?
 </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">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/core/ArithmeticEngine.BigDecimalEngine.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/BugException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/BugException.html b/docs/api/freemarker/core/BugException.html
index f86017b..ac71049 100644
--- a/docs/api/freemarker/core/BugException.html
+++ b/docs/api/freemarker/core/BugException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>BugException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>BugException (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="BugException (FreeMarker 2.3.23 API)";
+            parent.document.title="BugException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/CSSOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CSSOutputFormat.html b/docs/api/freemarker/core/CSSOutputFormat.html
new file mode 100644
index 0000000..1490cc9
--- /dev/null
+++ b/docs/api/freemarker/core/CSSOutputFormat.html
@@ -0,0 +1,356 @@
+<!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>CSSOutputFormat (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="CSSOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":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/CSSOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/Configurable.UnknownSettingException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CustomAttribute.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/CSSOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CSSOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&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 CSSOutputFormat" class="title">Class CSSOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.CSSOutputFormat</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">CSSOutputFormat</span>
+extends <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></pre>
+<div class="block">Represents the CSS output format (MIME type "text/css", name "CSS"). This format doesn't support escaping.</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">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CSSOutputFormat.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</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="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CSSOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CSSOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CSSOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></span>()</code>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../freemarker/core/CSSOutputFormat.html" title="class in freemarker.core">CSSOutputFormat</a> INSTANCE</pre>
+<div class="block">The only instance (singleton) of this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a>.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isOutputFormatMixingAllowed--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isOutputFormatMixingAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputFormatMixingAllowed()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
+ if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
+ application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
+ inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
+ inserted value is made by escaping plain text and the target format is non-escaping, in which case format
+ conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
+ will be demand for that.)
+ 
+ <p>
+ <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CSSOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/Configurable.UnknownSettingException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CustomAttribute.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/CSSOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CSSOutputFormat.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html b/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
index baef6c2..aac9928 100644
--- a/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
+++ b/docs/api/freemarker/core/CallPlaceCustomDataInitializationException.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_20) on Sun Jul 05 16:46:56 CEST 2015 -->
+<!-- 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>CallPlaceCustomDataInitializationException (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>CallPlaceCustomDataInitializationException (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="CallPlaceCustomDataInitializationException (FreeMarker 2.3.23 API)";
+            parent.document.title="CallPlaceCustomDataInitializationException (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -45,7 +45,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/BugException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/CommandLine.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/core/CallPlaceCustomDataInitializationException.html" target="_top">Frames</a></li>
@@ -224,7 +224,7 @@ extends <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.ht
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/core/BugException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/core/CommandLine.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CombinedMarkupOutputFormat.html" title="class in freemarker.core"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/core/CallPlaceCustomDataInitializationException.html" target="_top">Frames</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/core/CombinedMarkupOutputFormat.html b/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
new file mode 100644
index 0000000..e6286e4
--- /dev/null
+++ b/docs/api/freemarker/core/CombinedMarkupOutputFormat.html
@@ -0,0 +1,552 @@
+<!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>CombinedMarkupOutputFormat (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="CombinedMarkupOutputFormat (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+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/CombinedMarkupOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CommandLine.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/CombinedMarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CombinedMarkupOutputFormat.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 CombinedMarkupOutputFormat" class="title">Class CombinedMarkupOutputFormat</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/OutputFormat.html" title="class in freemarker.core">freemarker.core.OutputFormat</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.MarkupOutputFormat</a>&lt;MO&gt;</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">freemarker.core.CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>freemarker.core.CombinedMarkupOutputFormat</li>
+</ul>
+</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">CombinedMarkupOutputFormat</span>
+extends <a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</pre>
+<div class="block">Represents two markup formats nested into each other. For example, markdown nested into HTML.</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/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat</a></span>(<a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
+                          <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</code>
+<div class="block">Same as <a href="../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-"><code>CombinedMarkupOutputFormat(String, MarkupOutputFormat, MarkupOutputFormat)</code></a> with <code>null</code> as
+ the <code>name</code> parameter.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">CombinedMarkupOutputFormat</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="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
+                          <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</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="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</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;plainTextContent)</code>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#getInnerOutputFormat--">getInnerOutputFormat</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#getMimeType--">getMimeType</a></span>()</code>
+<div class="block">Returns the MIME type of the output format.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#getName--">getName</a></span>()</code>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#getOuterOutputFormat--">getOuterOutputFormat</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a></span>()</code>
+<div class="block">Tells if by default auto-escaping should be on for this format.</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/core/CombinedMarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</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;builtInName)</code>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></span>()</code>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>protected <a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</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;plainTextContent,
+                            <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;markupContent)</code>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/core/CombinedMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</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;textToEsc,
+      <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)</code>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.CommonMarkupOutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a></h3>
+<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#concat-MO-MO-">concat</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromMarkup-java.lang.String-">fromMarkup</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-">fromPlainTextByEscaping</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getMarkupString-MO-">getMarkupString</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#getSourcePlainText-MO-">getSourcePlainText</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#isEmpty-MO-">isEmpty</a>, <a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-MO-java.io.Writer-">output</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.freemarker.core.OutputFormat">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;freemarker.core.<a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></h3>
+<code><a href="../../freemarker/core/OutputFormat.html#toString--">toString</a>, <a href="../../freemarker/core/OutputFormat.html#toStringExtraProperties--">toStringExtraProperties</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
+<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--" title="class or interface in java.lang">notify</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang
 /Object.html?is-external=true#notifyAll--" title="class or interface in java.lang">notifyAll</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait--" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-" title="class or interface in java.lang">wait</a>, <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#wait-long-int-" title="class or interface in java.lang">wait</a></code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="CombinedMarkupOutputFormat-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CombinedMarkupOutputFormat</h4>
+<pre>public&nbsp;CombinedMarkupOutputFormat(<a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
+                                  <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</pre>
+<div class="block">Same as <a href="../../freemarker/core/CombinedMarkupOutputFormat.html#CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-"><code>CombinedMarkupOutputFormat(String, MarkupOutputFormat, MarkupOutputFormat)</code></a> with <code>null</code> as
+ the <code>name</code> parameter.</div>
+</li>
+</ul>
+<a name="CombinedMarkupOutputFormat-java.lang.String-freemarker.core.MarkupOutputFormat-freemarker.core.MarkupOutputFormat-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CombinedMarkupOutputFormat</h4>
+<pre>public&nbsp;CombinedMarkupOutputFormat(<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="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;outer,
+                                  <a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;inner)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - Maybe <code>null</code>, in which case it defaults to
+            <code>outer.getName() + "{" + inner.getName() + "}"</code>.</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="getName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getName--">OutputFormat</a></code></span></div>
+<div class="block">The short name used to refer to this format (like in the <code>#ftl</code> header).</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getName--">getName</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getMimeType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMimeType</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getMimeType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">OutputFormat</a></code></span></div>
+<div class="block">Returns the MIME type of the output format. This might comes handy when generating a HTTP response. <code>null</code>
+ if this output format doesn't clearly corresponds to a specific MIME type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/OutputFormat.html#getMimeType--">getMimeType</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core">OutputFormat</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="output-java.lang.String-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>output</h4>
+<pre>public&nbsp;void&nbsp;output(<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;textToEsc,
+                   <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Writer.html?is-external=true" title="class or interface in java.io">Writer</a>&nbsp;out)
+            throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
+                   <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Equivalent to calling <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#output-MO-java.io.Writer-"><code>MarkupOutputFormat.output(TemplateMarkupOutputModel, Writer)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#output-java.lang.String-java.io.Writer-">output</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="escapePlainText-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>escapePlainText</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;escapePlainText(<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;plainTextContent)
+                       throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Should give the same result as <a href="../../freemarker/core/MarkupOutputFormat.html#fromPlainTextByEscaping-java.lang.String-"><code>MarkupOutputFormat.fromPlainTextByEscaping(String)</code></a> and then
+ <a href="../../freemarker/core/MarkupOutputFormat.html#getMarkupString-MO-"><code>MarkupOutputFormat.getMarkupString(TemplateMarkupOutputModel)</code></a>, but the implementation may uses a more efficient solution.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#escapePlainText-java.lang.String-">escapePlainText</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isLegacyBuiltInBypassed-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isLegacyBuiltInBypassed</h4>
+<pre>public&nbsp;boolean&nbsp;isLegacyBuiltInBypassed(<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;builtInName)
+                                throws <a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">MarkupOutputFormat</a></code></span></div>
+<div class="block">Tells if a string built-in that can't handle a <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> left hand operand can bypass
+ this object as is. A typical such case would be when a <a href="../../freemarker/core/TemplateHTMLOutputModel.html" title="class in freemarker.core"><code>TemplateHTMLOutputModel</code></a> of "HTML" format bypasses
+ <code>?html</code>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/MarkupOutputFormat.html#isLegacyBuiltInBypassed-java.lang.String-">isLegacyBuiltInBypassed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../freemarker/template/TemplateModelException.html" title="class in freemarker.template">TemplateModelException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isAutoEscapedByDefault--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isAutoEscapedByDefault</h4>
+<pre>public&nbsp;boolean&nbsp;isAutoEscapedByDefault()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/MarkupOutputFormat.html#isAutoEscapedByDefault--">MarkupOutputFormat</a></code></span></div>
+<div class="block">Tells if by default auto-escaping should be on for this format. It should be <code>true</code> if you need to escape
+ on most of the places where you insert values.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#isAutoEscapedByDefault--">isAutoEscapedByDefault</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../freemarker/template/Configuration.html#setAutoEscapingPolicy-int-"><code>Configuration.setAutoEscapingPolicy(int)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="isOutputFormatMixingAllowed--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isOutputFormatMixingAllowed</h4>
+<pre>public&nbsp;boolean&nbsp;isOutputFormatMixingAllowed()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/OutputFormat.html#isOutputFormatMixingAllowed--">OutputFormat</a></code></span></div>
+<div class="block">Tells if this output format allows inserting <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a>-s of another output formats into
+ it. If <code>true</code>, the foreign <a href="../../freemarker/core/TemplateMarkupOutputModel.html" title="interface in freemarker.core"><code>TemplateMarkupOutputModel</code></a> will be inserted into the output as is (like
+ if the surrounding output format was the same). This is usually a bad idea allow, as such an event could indicate
+ application bugs. If this method returns <code>false</code> (recommended), then FreeMarker will try to assimilate the
+ inserted value by converting its format to this format, which will currently (2.3.24) cause exception, unless the
+ inserted value is made by escaping plain text and the target format is non-escaping, in which case format
+ conversion is trivially possible. (It's not impossible that conversions will be extended beyond this, if there
+ will be demand for that.)
+ 
+ <p>
+ <code>true</code> value is used by <a href="../../freemarker/core/UndefinedOutputFormat.html" title="class in freemarker.core"><code>UndefinedOutputFormat</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#isOutputFormatMixingAllowed--">isOutputFormatMixingAllowed</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+<a name="getOuterOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOuterOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;getOuterOutputFormat()</pre>
+</li>
+</ul>
+<a name="getInnerOutputFormat--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getInnerOutputFormat</h4>
+<pre>public&nbsp;<a href="../../freemarker/core/MarkupOutputFormat.html" title="class in freemarker.core">MarkupOutputFormat</a>&nbsp;getInnerOutputFormat()</pre>
+</li>
+</ul>
+<a name="newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>newTemplateMarkupOutputModel</h4>
+<pre>protected&nbsp;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&nbsp;newTemplateMarkupOutputModel(<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;plainTextContent,
+                                                                         <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;markupContent)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">CommonMarkupOutputFormat</a></code></span></div>
+<div class="block">Creates a new <a href="../../freemarker/core/CommonTemplateMarkupOutputModel.html" title="class in freemarker.core"><code>CommonTemplateMarkupOutputModel</code></a> that's bound to this <a href="../../freemarker/core/OutputFormat.html" title="class in freemarker.core"><code>OutputFormat</code></a> instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/core/CommonMarkupOutputFormat.html#newTemplateMarkupOutputModel-java.lang.String-java.lang.String-">newTemplateMarkupOutputModel</a></code>&nbsp;in class&nbsp;<code><a href="../../freemarker/core/CommonMarkupOutputFormat.html" title="class in freemarker.core">CommonMarkupOutputFormat</a>&lt;<a href="../../freemarker/core/TemplateCombinedMarkupOutputModel.html" title="class in freemarker.core">TemplateCombinedMarkupOutputModel</a>&gt;</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/CombinedMarkupOutputFormat.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/core/CallPlaceCustomDataInitializationException.html" title="class in freemarker.core"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/core/CommandLine.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/CombinedMarkupOutputFormat.html" target="_top">Frames</a></li>
+<li><a href="CombinedMarkupOutputFormat.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>


[47/51] [partial] incubator-freemarker-site git commit: Updated site for 2.3.24.

Posted by dd...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/deprecated-list.html
----------------------------------------------------------------------
diff --git a/docs/api/deprecated-list.html b/docs/api/deprecated-list.html
index 51a821b..66556cc 100644
--- a/docs/api/deprecated-list.html
+++ b/docs/api/deprecated-list.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>Deprecated List (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>Deprecated List (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="Deprecated List (FreeMarker 2.3.23 API)";
+            parent.document.title="Deprecated List (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -418,27 +418,32 @@
 </td>
 </tr>
 <tr class="altColor">
+<td class="colOne"><a href="freemarker/template/utility/StringUtil.html#isXMLID-java.lang.String-">freemarker.template.utility.StringUtil.isXMLID(String)</a>
+<div class="block"><span class="deprecationComment">Don't use this outside FreeMarker; it's name if misleading, and it doesn't follow the XML specs.</span></div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><a href="freemarker/ext/dom/Transform.html#main-java.lang.String:A-">freemarker.ext.dom.Transform.main(String[])</a>
 <div class="block"><span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="freemarker/ext/jdom/NodeListModel.html#main-java.lang.String:A-">freemarker.ext.jdom.NodeListModel.main(String[])</a>
 <div class="block"><span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="freemarker/template/utility/ToCanonical.html#main-java.lang.String:A-">freemarker.template.utility.ToCanonical.main(String[])</a>
 <div class="block"><span class="deprecationComment">Will be removed (main method in a library, often classified as CWE-489 "Leftover Debug Code").</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="freemarker/template/utility/DeepUnwrap.html#premissiveUnwrap-freemarker.template.TemplateModel-">freemarker.template.utility.DeepUnwrap.premissiveUnwrap(TemplateModel)</a>
 <div class="block"><span class="deprecationComment">the name of this method is mistyped. Use 
  <a href="freemarker/template/utility/DeepUnwrap.html#permissiveUnwrap-freemarker.template.TemplateModel-"><code>DeepUnwrap.permissiveUnwrap(TemplateModel)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="freemarker/log/Logger.html#selectLoggerLibrary-int-">freemarker.log.Logger.selectLoggerLibrary(int)</a>
 <div class="block"><span class="deprecationComment">This method isn't reliable, unless you can somehow ensure that you access the FreeMarker classes
              first; use the <a href="freemarker/log/Logger.html#SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY">"org.freemarker.loggerLibrary"</a> Java system property instead, like
@@ -446,46 +451,51 @@
              <a href="freemarker/log/Logger.html#SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY"><code>Logger.SYSTEM_PROPERTY_NAME_LOGGER_LIBRARY</code></a> for more.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="freemarker/log/Logger.html#setCategoryPrefix-java.lang.String-">freemarker.log.Logger.setCategoryPrefix(String)</a>
 <div class="block"><span class="deprecationComment">This wasn't reliable, unless you can somehow ensure that you access the FreeMarker classes first. As
              it's not known to be useful for users, consider it removed.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="freemarker/cache/TemplateCache.html#setConfiguration-freemarker.template.Configuration-">freemarker.cache.TemplateCache.setConfiguration(Configuration)</a>
 <div class="block"><span class="deprecationComment">Use the <a href="freemarker/cache/TemplateCache.html#TemplateCache-freemarker.cache.TemplateLoader-freemarker.cache.CacheStorage-freemarker.template.Configuration-"><code>TemplateCache.TemplateCache(TemplateLoader, CacheStorage, Configuration)</code></a> constructor.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="freemarker/template/Configuration.html#setDefaultConfiguration-freemarker.template.Configuration-">freemarker.template.Configuration.setDefaultConfiguration(Configuration)</a>
 <div class="block"><span class="deprecationComment">Using the "default" <a href="freemarker/template/Configuration.html" title="class in freemarker.template"><code>Configuration</code></a> instance can
  easily lead to erroneous, unpredictable behaviour.
  See more <a href="freemarker/template/Configuration.html#getDefaultConfiguration--"><code>here...</code></a>.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="freemarker/template/WrappingTemplateModel.html#setDefaultObjectWrapper-freemarker.template.ObjectWrapper-">freemarker.template.WrappingTemplateModel.setDefaultObjectWrapper(ObjectWrapper)</a>
 <div class="block"><span class="deprecationComment">This method has VM-wide effect, which makes it unsuitable for application where multiple components
       might use FreeMarker internally.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="freemarker/template/Template.html#setEncoding-java.lang.String-">freemarker.template.Template.setEncoding(String)</a>
 <div class="block"><span class="deprecationComment">Should only be used internally, and might will be removed later.</span></div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colOne"><a href="freemarker/template/Configuration.html#setIncompatibleEnhancements-java.lang.String-">freemarker.template.Configuration.setIncompatibleEnhancements(String)</a>
 <div class="block"><span class="deprecationComment">Use <a href="freemarker/template/Configuration.html#Configuration-freemarker.template.Version-"><code>Configuration.Configuration(Version)</code></a>, or
     as last chance, <a href="freemarker/template/Configuration.html#setIncompatibleImprovements-freemarker.template.Version-"><code>Configuration.setIncompatibleImprovements(Version)</code></a> instead.</span></div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colOne"><a href="freemarker/ext/beans/BeansWrapper.html#setNullModel-freemarker.template.TemplateModel-">freemarker.ext.beans.BeansWrapper.setNullModel(TemplateModel)</a>
 <div class="block"><span class="deprecationComment">Changing the <code>null</code> model can cause a lot of confusion; don't do it.</span></div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="freemarker/core/Configurable.html#setStrictBeanModels-boolean-">freemarker.core.Configurable.setStrictBeanModels(boolean)</a>
+<div class="block"><span class="deprecationComment">Set this on the <a href="freemarker/template/ObjectWrapper.html" title="interface in freemarker.template"><code>ObjectWrapper</code></a> itself.</span></div>
+</td>
+</tr>
 <tr class="altColor">
 <td class="colOne"><a href="freemarker/template/Configuration.html#setStrictSyntaxMode-boolean-">freemarker.template.Configuration.setStrictSyntaxMode(boolean)</a>
 <div class="block"><span class="deprecationComment">Only <code>true</code> (the default) value will be supported sometimes in the future.</span></div>
@@ -502,6 +512,11 @@
 <div class="block"><span class="deprecationComment">No replacement exists; not a reliable way of getting back the original list elemnts.</span></div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><a href="freemarker/core/Environment.html#visit-freemarker.core.TemplateElement-freemarker.template.TemplateDirectiveModel-java.util.Map-java.util.List-">freemarker.core.Environment.visit(TemplateElement, TemplateDirectiveModel, Map, List)</a>
+<div class="block"><span class="deprecationComment">Should be internal API</span></div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/AndMatcher.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/AndMatcher.html b/docs/api/freemarker/cache/AndMatcher.html
new file mode 100644
index 0000000..fe1bf4e
--- /dev/null
+++ b/docs/api/freemarker/cache/AndMatcher.html
@@ -0,0 +1,289 @@
+<!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>AndMatcher (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="AndMatcher (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/AndMatcher.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/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/AndMatcher.html" target="_top">Frames</a></li>
+<li><a href="AndMatcher.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.cache</div>
+<h2 title="Class AndMatcher" class="title">Class AndMatcher</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/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">freemarker.cache.TemplateSourceMatcher</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.AndMatcher</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">AndMatcher</span>
+extends <a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a></pre>
+<div class="block">Logical "and" operation among the given matchers.</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/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>
+</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>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/AndMatcher.html#matches-java.lang.String-java.lang.Object-">matches</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;sourceName,
+       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>&nbsp;</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="AndMatcher-freemarker.cache.TemplateSourceMatcher...-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AndMatcher</h4>
+<pre>public&nbsp;AndMatcher(<a href="../../freemarker/cache/TemplateSourceMatcher.html" title="class in freemarker.cache">TemplateSourceMatcher</a>...&nbsp;matchers)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="matches-java.lang.String-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>matches</h4>
+<pre>public&nbsp;boolean&nbsp;matches(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;sourceName,
+                       <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)
+                throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</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/AndMatcher.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/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/AndMatcher.html" target="_top">Frames</a></li>
+<li><a href="AndMatcher.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/ByteArrayTemplateLoader.html b/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
new file mode 100644
index 0000000..8dd318b
--- /dev/null
+++ b/docs/api/freemarker/cache/ByteArrayTemplateLoader.html
@@ -0,0 +1,505 @@
+<!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>ByteArrayTemplateLoader (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="ByteArrayTemplateLoader (FreeMarker 2.3.24-incubating API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":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/ByteArrayTemplateLoader.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/AndMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/ByteArrayTemplateLoader.html" target="_top">Frames</a></li>
+<li><a href="ByteArrayTemplateLoader.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.cache</div>
+<h2 title="Class ByteArrayTemplateLoader" class="title">Class ByteArrayTemplateLoader</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">java.lang.Object</a></li>
+<li>
+<ul class="inheritance">
+<li>freemarker.cache.ByteArrayTemplateLoader</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">ByteArrayTemplateLoader</span>
+extends <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>
+implements <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache">TemplateLoader</a></pre>
+<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. This is similar to
+ <a href="../../freemarker/cache/StringTemplateLoader.html" title="class in freemarker.cache"><code>StringTemplateLoader</code></a>, but uses <code>byte[]</code> instead of <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>; see more details there.</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/cache/ByteArrayTemplateLoader.html#ByteArrayTemplateLoader--">ByteArrayTemplateLoader</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ByteArrayTemplateLoader.html#closeTemplateSource-java.lang.Object-">closeTemplateSource</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>
+<div class="block">Closes the template source, releasing any resources held that are only required for reading the template and/or
+ its metadata.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ByteArrayTemplateLoader.html#findTemplateSource-java.lang.String-">findTemplateSource</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">Finds the template in the backing storage and returns an object that identifies the storage location where the
+ template can be loaded from.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ByteArrayTemplateLoader.html#getLastModified-java.lang.Object-">getLastModified</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</code>
+<div class="block">Returns the time of last modification of the specified template source.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../freemarker/cache/ByteArrayTemplateLoader.html#getReader-java.lang.Object-java.lang.String-">getReader</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;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;encoding)</code>
+<div class="block">Returns the character stream of a template represented by the specified template source.</div>
+</td>
+</tr>
+<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>
+</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,
+           long&nbsp;lastModified)</code>
+<div class="block">Puts a template into the loader.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<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>
+</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#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="ByteArrayTemplateLoader--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ByteArrayTemplateLoader</h4>
+<pre>public&nbsp;ByteArrayTemplateLoader()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="putTemplate-java.lang.String-byte:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<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>
+</li>
+</ul>
+<a name="putTemplate-java.lang.String-byte:A-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<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,
+                        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>
+<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>
+</dl>
+</li>
+</ul>
+<a name="closeTemplateSource-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>closeTemplateSource</h4>
+<pre>public&nbsp;void&nbsp;closeTemplateSource(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/cache/TemplateLoader.html#closeTemplateSource-java.lang.Object-">TemplateLoader</a></code></span></div>
+<div class="block">Closes the template source, releasing any resources held that are only required for reading the template and/or
+ its metadata. This is the last method that is called by the <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> for a template source, except
+ that <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"><code>Object.equals(Object)</code></a> is might called later too. <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> ensures that this method will
+ be called on every object that is returned from <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateLoader.html#closeTemplateSource-java.lang.Object-">closeTemplateSource</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>templateSource</code> - the template source that should be closed.</dd>
+</dl>
+</li>
+</ul>
+<a name="findTemplateSource-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findTemplateSource</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;findTemplateSource(<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"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-">TemplateLoader</a></code></span></div>
+<div class="block">Finds the template in the backing storage and returns an object that identifies the storage location where the
+ template can be loaded from. See the return value for more information.</div>
+<dl>
+<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
+            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
+            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
+            with a slash, nor will they contain a path component consisting of either a single or a double dot --
+            these are all resolved by the template cache before passing the name to the loader. As a side effect,
+            paths that trivially reach outside template root directory, such as <tt>../my.ftl</tt>, will be
+            rejected by the template cache, so they never reach the template loader. Note again, that if the path
+            uses backslash as path separator instead of slash as (the template loader should not accept that), the
+            normalization will not properly happen, as FreeMarker (the cache) recognizes only the slashes as
+            separators.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>An object representing the template source, which can be supplied in subsequent calls to
+         <a href="../../freemarker/cache/TemplateLoader.html#getLastModified-java.lang.Object-"><code>TemplateLoader.getLastModified(Object)</code></a> and <a href="../../freemarker/cache/TemplateLoader.html#getReader-java.lang.Object-java.lang.String-"><code>TemplateLoader.getReader(Object, String)</code></a>, when those are called on the
+         same <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>. <code>null</code> must be returned if the source for the template doesn't exist;
+         don't throw exception then! The exact type of this object is up to the <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a>
+         implementation. As this object is possibly used as hash key in caches, and is surly compared with another
+         template source for equality, <b>it must have a proper <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"><code>Object.equals(Object)</code></a> and
+         <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"><code>Object.hashCode()</code></a>) implementation</b>. Especially, template sources that refer to the same
+         physical source must be equivalent, otherwise template caching can become inefficient. This is only
+         expected from <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"><code>Object.equals(Object)</code></a> when the compared template sources came from the same
+         <a href="../../freemarker/cache/TemplateLoader.html" title="interface in freemarker.cache"><code>TemplateLoader</code></a> instance. Also, it must not influence the equality if the source is open or
+         closed (<a href="../../freemarker/cache/TemplateLoader.html#closeTemplateSource-java.lang.Object-"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+</dl>
+</li>
+</ul>
+<a name="getLastModified-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLastModified</h4>
+<pre>public&nbsp;long&nbsp;getLastModified(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;templateSource)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/cache/TemplateLoader.html#getLastModified-java.lang.Object-">TemplateLoader</a></code></span></div>
+<div class="block">Returns the time of last modification of the specified template source. This method is called after
+ <code>findTemplateSource()</code>.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateLoader.html#getLastModified-java.lang.Object-">getLastModified</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>templateSource</code> - an object representing a template source, obtained through a prior call to
+            <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+            <a href="../../freemarker/cache/TemplateLoader.html#closeTemplateSource-java.lang.Object-"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the time of last modification of the specified template source, or -1 if the time is not known.</dd>
+</dl>
+</li>
+</ul>
+<a name="getReader-java.lang.Object-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getReader</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io">Reader</a>&nbsp;getReader(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;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;encoding)
+                 throws <a href="http://docs.oracle.com/javase/8/docs/api/java/io/UnsupportedEncodingException.html?is-external=true" title="class or interface in java.io">UnsupportedEncodingException</a></pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../freemarker/cache/TemplateLoader.html#getReader-java.lang.Object-java.lang.String-">TemplateLoader</a></code></span></div>
+<div class="block">Returns the character stream of a template represented by the specified template source. This method is possibly
+ called for multiple times for the same template source object, and it must always return a <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a> that
+ reads the template from its beginning. Before this method is called for the second time (or later), its caller
+ must close the previously returned <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a>, and it must not use it anymore. That is, this method is not
+ required to support multiple concurrent readers for the same source <code>templateSource</code> object.
+ 
+ <p>
+ Typically, this method is called if the template is missing from the cache, or if after calling
+ <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a> and <a href="../../freemarker/cache/TemplateLoader.html#getLastModified-java.lang.Object-"><code>TemplateLoader.getLastModified(Object)</code></a> it was determined that the cached copy
+ of the template is stale. Then, if it turns out that the <code>encoding</code> parameter used doesn't match the actual
+ template content (based on the <code>#ftl encoding=...</code> header), this method will be called for a second time
+ with the correct <code>encoding</code> parameter value.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../freemarker/cache/TemplateLoader.html#getReader-java.lang.Object-java.lang.String-">getReader</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>templateSource</code> - an object representing a template source, obtained through a prior call to
+            <a href="../../freemarker/cache/TemplateLoader.html#findTemplateSource-java.lang.String-"><code>TemplateLoader.findTemplateSource(String)</code></a>. This must be an object on which
+            <a href="../../freemarker/cache/TemplateLoader.html#closeTemplateSource-java.lang.Object-"><code>TemplateLoader.closeTemplateSource(Object)</code></a> wasn't applied yet.</dd>
+<dd><code>encoding</code> - the character encoding used to translate source bytes to characters. Some loaders may not have access
+            to the byte representation of the template stream, and instead directly obtain a character stream.
+            These loaders should ignore the encoding parameter.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a> representing the template character stream. It's the responsibility of the caller (which
+         is <a href="../../freemarker/cache/TemplateCache.html" title="class in freemarker.cache"><code>TemplateCache</code></a> usually) to <code>close()</code> it. The <a href="http://docs.oracle.com/javase/8/docs/api/java/io/Reader.html?is-external=true" title="class or interface in java.io"><code>Reader</code></a> is not required to work after
+         the <code>templateSource</code> was closed (<a href="../../freemarker/cache/TemplateLoader.html#closeTemplateSource-java.lang.Object-"><code>TemplateLoader.closeTemplateSource(Object)</code></a>).</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="http://docs.oracle.com/javase/8/docs/api/java/io/UnsupportedEncodingException.html?is-external=true" title="class or interface in java.io">UnsupportedEncodingException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;toString()</pre>
+<div class="block">Show class name and some details that are useful in template-not-found errors.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><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></code>&nbsp;in class&nbsp;<code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></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/ByteArrayTemplateLoader.html">Use</a></li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../freemarker/cache/AndMatcher.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/CacheStorage.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?freemarker/cache/ByteArrayTemplateLoader.html" target="_top">Frames</a></li>
+<li><a href="ByteArrayTemplateLoader.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>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/CacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/CacheStorage.html b/docs/api/freemarker/cache/CacheStorage.html
index c4de26c..93b545b 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>CacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>CacheStorage (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="CacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="CacheStorage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -236,7 +236,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../freemarker/cache/ByteArrayTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../freemarker/cache/CacheStorageWithGetSize.html" title="interface in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/CacheStorageWithGetSize.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/CacheStorageWithGetSize.html b/docs/api/freemarker/cache/CacheStorageWithGetSize.html
index 7264156..fc1de15 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>CacheStorageWithGetSize (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>CacheStorageWithGetSize (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="CacheStorageWithGetSize (FreeMarker 2.3.23 API)";
+            parent.document.title="CacheStorageWithGetSize (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/ClassTemplateLoader.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/ClassTemplateLoader.html b/docs/api/freemarker/cache/ClassTemplateLoader.html
index 61af4f6..a5bfb37 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>ClassTemplateLoader (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ClassTemplateLoader (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="ClassTemplateLoader (FreeMarker 2.3.23 API)";
+            parent.document.title="ClassTemplateLoader (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -255,7 +255,8 @@ extends <a href="../../freemarker/cache/URLTemplateLoader.html" title="class in
 <ul class="blockList">
 <li class="blockList">
 <h4>ClassTemplateLoader</h4>
-<pre>public&nbsp;ClassTemplateLoader()</pre>
+<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()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">It's a confusing constructor, and seldom useful; 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 its own class to load the
@@ -275,7 +276,8 @@ extends <a href="../../freemarker/cache/URLTemplateLoader.html" title="class in
 <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>
+<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>
 <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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/6c6020ec/docs/api/freemarker/cache/ConcurrentCacheStorage.html
----------------------------------------------------------------------
diff --git a/docs/api/freemarker/cache/ConcurrentCacheStorage.html b/docs/api/freemarker/cache/ConcurrentCacheStorage.html
index f51b357..7472bfd 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_20) on Sun Jul 05 16:46:55 CEST 2015 -->
+<!-- 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>ConcurrentCacheStorage (FreeMarker 2.3.23 API)</title>
-<meta name="date" content="2015-07-05">
+<title>ConcurrentCacheStorage (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="ConcurrentCacheStorage (FreeMarker 2.3.23 API)";
+            parent.document.title="ConcurrentCacheStorage (FreeMarker 2.3.24-incubating API)";
         }
     }
     catch(err) {
@@ -51,7 +51,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/ConcurrentCacheStorage.html" target="_top">Frames</a></li>
@@ -206,7 +206,7 @@ extends <a href="../../freemarker/cache/CacheStorage.html" title="interface in f
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../freemarker/cache/ClassTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../freemarker/cache/FileTemplateLoader.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../freemarker/cache/ConditionalTemplateConfigurationFactory.html" title="class in freemarker.cache"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?freemarker/cache/ConcurrentCacheStorage.html" target="_top">Frames</a></li>