You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/01/25 23:23:35 UTC

[19/19] incubator-freemarker-site git commit: Updated Manual with the improvements from the 2.3.26 branch.

Updated Manual with the improvements from the 2.3.26 branch.


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/975692b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/975692b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/975692b4

Branch: refs/heads/asf-site
Commit: 975692b4742d5f306766eb861015679fd9d715b1
Parents: 3ab785a
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 26 00:23:06 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 26 00:23:06 2017 +0100

----------------------------------------------------------------------
 docs/alphaidx.html                              |  16 +-
 docs/app.html                                   |  16 +-
 docs/app_eccn.html                              |  16 +-
 docs/app_faq.html                               |  99 ++++++-----
 docs/app_install.html                           |  16 +-
 docs/app_legal.html                             |  16 +-
 docs/app_license.html                           |  30 +---
 docs/app_versions.html                          |  16 +-
 docs/detailed-toc.html                          |  18 +-
 docs/dgui.html                                  |  16 +-
 docs/dgui_datamodel.html                        |  16 +-
 docs/dgui_datamodel_basics.html                 |  16 +-
 docs/dgui_datamodel_types.html                  |  16 +-
 docs/dgui_misc.html                             |  16 +-
 docs/dgui_misc_alternativesyntax.html           |  16 +-
 docs/dgui_misc_autoescaping.html                |  16 +-
 docs/dgui_misc_namespace.html                   |  16 +-
 docs/dgui_misc_userdefdir.html                  |  22 +--
 docs/dgui_misc_var.html                         |  16 +-
 docs/dgui_misc_whitespace.html                  |  16 +-
 docs/dgui_quickstart.html                       |  16 +-
 docs/dgui_quickstart_basics.html                |  16 +-
 docs/dgui_quickstart_datamodel.html             |  16 +-
 docs/dgui_quickstart_template.html              |  16 +-
 docs/dgui_template.html                         |  16 +-
 docs/dgui_template_directives.html              |  16 +-
 docs/dgui_template_exp.html                     |  32 ++--
 docs/dgui_template_overallstructure.html        |  16 +-
 docs/dgui_template_valueinsertion.html          |  16 +-
 docs/docgen-resources/docgen.min.css            |   2 +-
 docs/gloss.html                                 |  71 ++++----
 docs/index.html                                 |  16 +-
 docs/pgui.html                                  |  16 +-
 docs/pgui_config.html                           |  16 +-
 docs/pgui_config_basics.html                    |  16 +-
 docs/pgui_config_custom_formats.html            |  18 +-
 docs/pgui_config_errorhandling.html             |  16 +-
 docs/pgui_config_incompatible_improvements.html |  16 +-
 docs/pgui_config_outputformatsautoesc.html      |  16 +-
 docs/pgui_config_settings.html                  |  16 +-
 docs/pgui_config_sharedvariables.html           |  16 +-
 docs/pgui_config_templateconfigurations.html    |  16 +-
 docs/pgui_config_templateloading.html           |  16 +-
 docs/pgui_datamodel.html                        |  16 +-
 docs/pgui_datamodel_basics.html                 |  16 +-
 docs/pgui_datamodel_directive.html              |  16 +-
 docs/pgui_datamodel_method.html                 |  16 +-
 docs/pgui_datamodel_node.html                   |  16 +-
 docs/pgui_datamodel_objectWrapper.html          |  16 +-
 docs/pgui_datamodel_parent.html                 |  16 +-
 docs/pgui_datamodel_scalar.html                 |  16 +-
 docs/pgui_misc.html                             |  16 +-
 docs/pgui_misc_ant.html                         |  18 +-
 docs/pgui_misc_beanwrapper.html                 |  16 +-
 docs/pgui_misc_charset.html                     |  16 +-
 docs/pgui_misc_jythonwrapper.html               |  16 +-
 docs/pgui_misc_logging.html                     |  16 +-
 docs/pgui_misc_multithreading.html              |  16 +-
 docs/pgui_misc_secureenv.html                   |  16 +-
 docs/pgui_misc_servlet.html                     |  56 +++---
 docs/pgui_misc_var.html                         |  16 +-
 docs/pgui_misc_xml_legacy.html                  |  16 +-
 docs/pgui_quickstart.html                       |  16 +-
 docs/pgui_quickstart_all.html                   |  16 +-
 docs/pgui_quickstart_createconfiguration.html   |  16 +-
 docs/pgui_quickstart_createdatamodel.html       |  16 +-
 docs/pgui_quickstart_gettemplate.html           |  16 +-
 docs/pgui_quickstart_merge.html                 |  16 +-
 docs/ref.html                                   |  16 +-
 docs/ref_builtins.html                          |  16 +-
 docs/ref_builtins_alphaidx.html                 |  16 +-
 docs/ref_builtins_boolean.html                  |  16 +-
 docs/ref_builtins_date.html                     |  16 +-
 docs/ref_builtins_expert.html                   |  23 +--
 docs/ref_builtins_hash.html                     |  16 +-
 docs/ref_builtins_loop_var.html                 |  16 +-
 docs/ref_builtins_node.html                     |  54 +++---
 docs/ref_builtins_number.html                   |  20 ++-
 docs/ref_builtins_sequence.html                 |  35 ++--
 docs/ref_builtins_string.html                   |  36 ++--
 docs/ref_builtins_type_independent.html         |  16 +-
 docs/ref_depr_builtin.html                      |  16 +-
 docs/ref_depr_directive.html                    |  16 +-
 docs/ref_depr_numerical_interpolation.html      |  16 +-
 docs/ref_depr_oldmacro.html                     |  16 +-
 docs/ref_depr_oldsyntax.html                    |  33 ++--
 docs/ref_depr_transform.html                    |  18 +-
 docs/ref_deprecated.html                        |  16 +-
 docs/ref_directive_alphaidx.html                |  16 +-
 docs/ref_directive_assign.html                  |  16 +-
 docs/ref_directive_attempt.html                 |  27 +--
 docs/ref_directive_autoesc.html                 |  16 +-
 docs/ref_directive_compress.html                |  16 +-
 docs/ref_directive_escape.html                  |  16 +-
 docs/ref_directive_flush.html                   |  16 +-
 docs/ref_directive_ftl.html                     |  37 ++--
 docs/ref_directive_function.html                |  16 +-
 docs/ref_directive_global.html                  |  16 +-
 docs/ref_directive_if.html                      |  16 +-
 docs/ref_directive_import.html                  |  16 +-
 docs/ref_directive_include.html                 |  16 +-
 docs/ref_directive_list.html                    |  16 +-
 docs/ref_directive_local.html                   |  16 +-
 docs/ref_directive_macro.html                   |  16 +-
 docs/ref_directive_noautoesc.html               |  16 +-
 docs/ref_directive_noparse.html                 |  16 +-
 docs/ref_directive_nt.html                      |  16 +-
 docs/ref_directive_outputformat.html            |  16 +-
 docs/ref_directive_setting.html                 |  16 +-
 docs/ref_directive_stop.html                    |  16 +-
 docs/ref_directive_switch.html                  |  16 +-
 docs/ref_directive_t.html                       |  24 +--
 docs/ref_directive_userDefined.html             |  16 +-
 docs/ref_directive_visit.html                   |  16 +-
 docs/ref_directives.html                        |  16 +-
 docs/ref_reservednames.html                     |  38 ++--
 docs/ref_specvar.html                           |  16 +-
 docs/search-results.html                        |  16 +-
 docs/toc.html                                   |  18 +-
 docs/toc.js                                     |   2 +-
 docs/versions_2_0.html                          |  16 +-
 docs/versions_2_01.html                         |  16 +-
 docs/versions_2_0RC1.html                       |  16 +-
 docs/versions_2_0RC2.html                       |  16 +-
 docs/versions_2_0RC3.html                       |  16 +-
 docs/versions_2_1.html                          |  21 ++-
 docs/versions_2_1_1.html                        |  27 +--
 docs/versions_2_1_2.html                        |  16 +-
 docs/versions_2_1_3.html                        |  16 +-
 docs/versions_2_1_4.html                        |  16 +-
 docs/versions_2_1_5.html                        |  16 +-
 docs/versions_2_2.html                          |  41 +++--
 docs/versions_2_2_1.html                        |  16 +-
 docs/versions_2_2_2.html                        |  16 +-
 docs/versions_2_2_3.html                        |  16 +-
 docs/versions_2_2_4.html                        |  16 +-
 docs/versions_2_2_5.html                        |  16 +-
 docs/versions_2_2_6.html                        |  20 ++-
 docs/versions_2_2_7.html                        |  25 +--
 docs/versions_2_2_8.html                        |  16 +-
 docs/versions_2_3.html                          |  50 +++---
 docs/versions_2_3_1.html                        |  16 +-
 docs/versions_2_3_10.html                       |  16 +-
 docs/versions_2_3_11.html                       |  32 ++--
 docs/versions_2_3_12.html                       |  16 +-
 docs/versions_2_3_13.html                       |  16 +-
 docs/versions_2_3_14.html                       |  16 +-
 docs/versions_2_3_15.html                       |  16 +-
 docs/versions_2_3_16.html                       |  16 +-
 docs/versions_2_3_17.html                       |  16 +-
 docs/versions_2_3_18.html                       |  16 +-
 docs/versions_2_3_19.html                       |  16 +-
 docs/versions_2_3_2.html                        |  19 +-
 docs/versions_2_3_20.html                       |  16 +-
 docs/versions_2_3_21.html                       |  16 +-
 docs/versions_2_3_22.html                       |  16 +-
 docs/versions_2_3_23.html                       |  16 +-
 docs/versions_2_3_24.html                       |  16 +-
 docs/versions_2_3_25.html                       |  16 +-
 docs/versions_2_3_3.html                        |  20 ++-
 docs/versions_2_3_4.html                        |  16 +-
 docs/versions_2_3_5.html                        |  16 +-
 docs/versions_2_3_6.html                        |  16 +-
 docs/versions_2_3_7.html                        |  28 +--
 docs/versions_2_3_7rc1.html                     |  16 +-
 docs/versions_2_3_8.html                        |  16 +-
 docs/versions_2_3_9.html                        |  16 +-
 docs/xgui.html                                  |  16 +-
 docs/xgui_declarative.html                      |  16 +-
 docs/xgui_declarative_basics.html               |  32 ++--
 docs/xgui_declarative_details.html              |  16 +-
 docs/xgui_expose.html                           |  16 +-
 docs/xgui_expose_dom.html                       |  20 ++-
 docs/xgui_expose_put.html                       |  18 +-
 docs/xgui_imperative.html                       |  16 +-
 docs/xgui_imperative_formal.html                | 176 ++++++++++---------
 docs/xgui_imperative_learn.html                 |  32 ++--
 docs/xgui_preface.html                          |  26 +--
 178 files changed, 1964 insertions(+), 1578 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/975692b4/docs/alphaidx.html
----------------------------------------------------------------------
diff --git a/docs/alphaidx.html b/docs/alphaidx.html
index 13dc6c8..bb92894 100644
--- a/docs/alphaidx.html
+++ b/docs/alphaidx.html
@@ -14,7 +14,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1485386406820">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,8 +35,8 @@ ga('send', 'pageview');
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Alphabetical Index"];</script>
-      <script src="toc.js"></script>
-      <script src="docgen-resources/main.min.js"></script>
+      <script src="toc.js?1485386406820"></script>
+      <script src="docgen-resources/main.min.js?1485386406820"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="gloss.html"><span>Previous</span></a><span class="paging-arrow disabled next"><span>Next</span></span></div><div class="title-wrapper">
 <h1 class="content-header header-part" id="alphaidx" itemprop="headline">Alphabetical Index</h1>
@@ -1679,9 +1679,11 @@ 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/">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://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="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:
  Freemarker 2.3.25</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2016-11-11T19:51:37Z" title="Friday, November 11, 2016 7:51:37 PM GMT">2016-11-11 19:51:37 GMT</time></span></p> <p class="copyright">
-� <span itemprop="copyrightYear">1999</span>\u20132016
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</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://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="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 class="last-generated">
+Last generated:
+<time itemprop="dateModified" datetime="2017-01-25T23:20:06Z" title="Wednesday, January 25, 2017 11:20:06 PM GMT">2017-01-25 23:20:06 GMT</time>, for Freemarker 2.3.25 </p>
+<p class="copyright">
+� <span itemprop="copyrightYear">1999</span>\u20132017
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/975692b4/docs/app.html
----------------------------------------------------------------------
diff --git a/docs/app.html b/docs/app.html
index cf74e9e..88dc960 100644
--- a/docs/app.html
+++ b/docs/app.html
@@ -14,7 +14,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1485386406820">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,8 +35,8 @@ ga('send', 'pageview');
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes"];</script>
-      <script src="toc.js"></script>
-      <script src="docgen-resources/main.min.js"></script>
+      <script src="toc.js?1485386406820"></script>
+      <script src="docgen-resources/main.min.js?1485386406820"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><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 class="title-wrapper">
 <h1 class="content-header header-part" id="app" itemprop="headline">Appendixes</h1>
@@ -44,9 +44,11 @@ ga('send', 'pageview');
 <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_25.html" data-menu-target="versions_2_3_25">2.3.25 (incubating at Apache)</a></li><li><a class="page-menu-link" href="versions_2_3_24.html" data-menu-target="versions_2_3_24">2.3.24 (incubating at Apache)</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 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="pag
 e-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" da
 ta-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" 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 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/">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://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="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:
  Freemarker 2.3.25</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2016-11-11T19:51:37Z" title="Friday, November 11, 2016 7:51:37 PM GMT">2016-11-11 19:51:37 GMT</time></span></p> <p class="copyright">
-� <span itemprop="copyrightYear">1999</span>\u20132016
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</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://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="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 class="last-generated">
+Last generated:
+<time itemprop="dateModified" datetime="2017-01-25T23:20:06Z" title="Wednesday, January 25, 2017 11:20:06 PM GMT">2017-01-25 23:20:06 GMT</time>, for Freemarker 2.3.25 </p>
+<p class="copyright">
+� <span itemprop="copyrightYear">1999</span>\u20132017
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/975692b4/docs/app_eccn.html
----------------------------------------------------------------------
diff --git a/docs/app_eccn.html b/docs/app_eccn.html
index bdc50c8..12ef7cb 100644
--- a/docs/app_eccn.html
+++ b/docs/app_eccn.html
@@ -14,7 +14,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1485386406820">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,8 +35,8 @@ ga('send', 'pageview');
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Legal","Export Control"];</script>
-      <script src="toc.js"></script>
-      <script src="docgen-resources/main.min.js"></script>
+      <script src="toc.js?1485386406820"></script>
+      <script src="docgen-resources/main.min.js?1485386406820"></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_license.html"><span>Previous</span></a><a class="paging-arrow next" href="gloss.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="app_eccn" itemprop="headline">Export Control</h1>
@@ -46,9 +46,11 @@ 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/">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://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="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:
  Freemarker 2.3.25</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2016-11-11T19:51:37Z" title="Friday, November 11, 2016 7:51:37 PM GMT">2016-11-11 19:51:37 GMT</time></span></p> <p class="copyright">
-� <span itemprop="copyrightYear">1999</span>\u20132016
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</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://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="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 class="last-generated">
+Last generated:
+<time itemprop="dateModified" datetime="2017-01-25T23:20:06Z" title="Wednesday, January 25, 2017 11:20:06 PM GMT">2017-01-25 23:20:06 GMT</time>, for Freemarker 2.3.25 </p>
+<p class="copyright">
+� <span itemprop="copyrightYear">1999</span>\u20132017
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/975692b4/docs/app_faq.html
----------------------------------------------------------------------
diff --git a/docs/app_faq.html b/docs/app_faq.html
index e4e91ec..4a9ff16 100644
--- a/docs/app_faq.html
+++ b/docs/app_faq.html
@@ -14,7 +14,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1485386406820">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,8 +35,8 @@ ga('send', 'pageview');
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","FAQ"];</script>
-      <script src="toc.js"></script>
-      <script src="docgen-resources/main.min.js"></script>
+      <script src="toc.js?1485386406820"></script>
+      <script src="docgen-resources/main.min.js?1485386406820"></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.html"><span>Previous</span></a><a class="paging-arrow next" href="app_versions.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="app_faq" itemprop="headline">FAQ</h1>
@@ -199,8 +199,8 @@ ga('send', 'pageview');
     <li>
       <a href="#faq_questionmark">
 
-            Why do I have ``?&#39;&#39;-s in the output instead of character
-            <em>X</em>?
+            Why do I have "?"-s in the output instead of
+            character <em>X</em>?
                 </a>
     </li>
     <li>
@@ -359,11 +359,11 @@ ga('send', 'pageview');
               </li>
 
               <li>
-                <p>``Object wrapping&#39;&#39;. This lets you show the objects to
-                templates in a customized, presentation oriented way (e.g.
-                <a href="xgui_imperative_learn.html">see here</a> how a
-                W3C DOM nodes can be seen by templates using this
-                technology.)</p>
+                <p>"Object wrapping". This lets you show the
+                objects to templates in a customized, presentation oriented
+                way (e.g. <a href="xgui_imperative_learn.html">see
+                here</a> how a W3C DOM nodes can be seen by templates using
+                this technology.)</p>
               </li>
 
               <li>
@@ -383,11 +383,12 @@ ga('send', 'pageview');
 
             <ul>
               <li>
-                <p>Not a ``standard&#39;&#39;. There are fewer tools and IDE
-                integrations, fewer developers knows it and there&#39;s much less
-                industry support in general. (However, most JSP tag libraries
-                can work in FreeMarker templates with the proper setup, unless
-                they are base on <code class="inline-code">.tag</code> files.)</p>
+                <p>Not a "standard". There are fewer tools and
+                IDE integrations, fewer developers knows it and there&#39;s much
+                less industry support in general. (However, most JSP tag
+                libraries can work in FreeMarker templates with the proper
+                setup, unless they are base on <code class="inline-code">.tag</code>
+                files.)</p>
               </li>
 
               <li>
@@ -411,7 +412,7 @@ ga('send', 'pageview');
 
             <p>You may read this if you are considering replacing JSP with
             FreeMarker in an existing application or in a legacy framework
-            that only supports JSP: <a href="pgui_misc_servlet.html#pgui_misc_servlet_model2">Programmer&#39;s Guide/Miscellaneous/Using FreeMarker with servlets/Using FreeMarker for ``Model 2&#39;&#39;</a></p>
+            that only supports JSP: <a href="pgui_misc_servlet.html#pgui_misc_servlet_model2">Programmer&#39;s Guide/Miscellaneous/Using FreeMarker with servlets/Using FreeMarker for "Model 2"</a></p>
           </dd>
 
         
@@ -567,7 +568,7 @@ ga('send', 'pageview');
 <div class="code-wrapper"><pre class="code-block code-template">&lt;a href=&quot;/shop/productdetails?id=${<strong>product.id?c</strong>}&quot;&gt;Details...&lt;/a&gt;</pre></div>
 
             <p>For computer audience you need <code class="inline-code">?c</code> anyway,
-            as the decimal separators can also warry depending on the
+            as the decimal separators can also wary depending on the
             locale.</p>
           </dd>
 
@@ -597,10 +598,10 @@ ga('send', 'pageview');
 // where cfg is a freemarker.template.Configuration object</pre></div>
 
             <p>However, sometimes you want to output a number not for human
-            audience, but for ``computer audience&#39;&#39; (like you want to print a
-            size in CSS), in which case you must use dot as decimal separator,
-            regardless of the locale (language) of the page. For that use the
-            <a href="ref_builtins_number.html#ref_builtin_c"><code>c</code>
+            audience, but for "computer audience" (like you want
+            to print a size in CSS), in which case you must use dot as decimal
+            separator, regardless of the locale (language) of the page. For
+            that use the <a href="ref_builtins_number.html#ref_builtin_c"><code>c</code>
             built-in</a>, for example:</p>
 
             
@@ -682,7 +683,7 @@ ga('send', 'pageview');
 
           <dd class="answer">
 
-            <p>Firs of all, you should know that FreeMarker doesn&#39;t load
+            <p>First of all, you should know that FreeMarker doesn&#39;t load
             templates from file system paths directly. Instead, it uses a
             simple virtual file system that might reads non-filesystem
             resources (templates from inside jar-s, from inside a database
@@ -782,8 +783,8 @@ ga('send', 'pageview');
             there is an older version of <code class="inline-code">freemarker.jar</code>
             around, which shadows the never. To check this, try to print the
             version number in a template with <code class="inline-code">${.version}</code>.
-            (If it dies with ``Unknown built-in variable: version&#39;&#39; error
-            message, then you use a very, very old release.).</p>
+            (If it dies with "Unknown built-in variable: version"
+            error message, then you use a very, very old release.).</p>
 
             <p>If you suspect that the problem is that you have multiple
             <code class="inline-code">freemarker.jar</code>-s, the typical culprit is that
@@ -1065,8 +1066,8 @@ ga('send', 'pageview');
             <ul>
               <li>
                 <p>Directives and methods that are written for presentation
-                purposes (like kind of ``tools&#39;&#39; for helping FreeMarker
-                templates) should declare their arguments as
+                purposes (like kind of "tools" for helping
+                FreeMarker templates) should declare their arguments as
                 <code class="inline-code">TemplateModel</code>-s and the more specific sub
                 interfaces of that. After all, the object wrapping is about
                 transforming the data-model to something that serves the
@@ -1124,13 +1125,23 @@ ga('send', 'pageview');
             <code class="inline-code">user[&quot;password&quot;]</code>), and variable names are
             strings.</p>
 
-            <p>So until FTL has a type that supports non-string keys, you
-            will have to turn to the Java API of the <code class="inline-code">Map</code>.
-            You can do it like this:
-            <code class="inline-code">myMap?api.get(nonStringKey)</code>. However, for
-            <code class="inline-code">?api</code> to work, you may need to configure
-            FreeMarker a bit; <a href="ref_builtins_expert.html#ref_buitin_api_and_has_api">see
-            more here...</a></p>
+            <p>If you only need to list the key-value pairs of a
+            <code class="inline-code">Map</code>, you can just write something like
+            <code class="inline-code">&lt;#list myMap as k, v&gt;${k}:
+            ${v}&lt;/#list&gt;</code> (see more about <a href="ref_directive_list.html#ref.directive.list">the <code>list directive</code>
+            here</a>). This enumerates the <code class="inline-code">Map</code> entries,
+            and supports non-string keys. This requires FreeMarker 2.3.25 or
+            later. (If for some reason you can&#39;t upgrade to 2.3.25, you can
+            use the Java API of <code class="inline-code">Map</code> instead, like
+            <code class="inline-code">&lt;#list myMap?api.entrySet() as kvp&gt;${kvp.key}:
+            ${kvp.value}&lt;/#list&gt;</code>.)</p>
+
+            <p>If you need to do more than listing, you will have to turn
+            to the Java API of the <code class="inline-code">Map</code>. You can do it like
+            this: <code class="inline-code">myMap?api.get(nonStringKey)</code>. However, for
+            <code class="inline-code">?api</code> to be enabled, you may need to configure
+            FreeMarker a bit (<a href="ref_builtins_expert.html#ref_buitin_api_and_has_api">see
+            more here</a>).</p>
 
             <p>Note that as Java&#39;s <code class="inline-code">Map</code> is particular
             about the exact class of the key, at least for numerical keys
@@ -1141,7 +1152,7 @@ ga('send', 'pageview');
             is because of FTL&#39;s deliberately simplified type system has only a
             single numerical type, while Java distinguishes a lot of numerical
             types. Note that the casting is not needed when the key value
-            comes directly from the data-model (i.e. you didn&#39;t modified its
+            comes directly from the data-model (i.e., you didn&#39;t modified its
             value with arithmetical calculations in the template), including
             the case when it&#39;s the return value of a method, and it was of the
             proper class before wrapping, because then the result of the
@@ -1352,11 +1363,11 @@ ga('send', 'pageview');
             <code class="inline-code">null</code>, it treats it exactly as a missing
             variable. For example, both if <code class="inline-code">x</code> is
             <code class="inline-code">null</code> in the data-model and if it&#39;s not present
-            at all, <code class="inline-code">${x!&#39;missing&#39;}</code> will print ``missing&#39;&#39;,
-            you can&#39;t tell the difference. Also, if for example you want to
-            test if a Java method has returned <code class="inline-code">null</code>, just
-            write something like <code class="inline-code">&lt;#if
-            foo.bar()??&gt;</code>.</p>
+            at all, <code class="inline-code">${x!&#39;missing&#39;}</code> will print
+            "missing", you can&#39;t tell the difference. Also, if
+            for example you want to test if a Java method has returned
+            <code class="inline-code">null</code>, just write something like
+            <code class="inline-code">&lt;#if foo.bar()??&gt;</code>.</p>
 
             <p>You may interested in the rationale behind this. From the
             viewpoint of the presentation layer a <code class="inline-code">null</code> and
@@ -1388,7 +1399,7 @@ ga('send', 'pageview');
             to the method instead. Like <code class="inline-code">foo.bar(nullArg)</code>
             will call the <code class="inline-code">bar</code> method with
             <code class="inline-code">null</code> as argument, assuming that there is no
-            varaible exists with ``nullArg&#39;&#39; name.</p>
+            variable exists with "nullArg" name.</p>
           </dd>
 
         
@@ -1421,8 +1432,8 @@ ga('send', 'pageview');
           
   <dt class="question" id="faq_questionmark">
     19.&nbsp; 
-            Why do I have ``?&#39;&#39;-s in the output instead of character
-            <em>X</em>?
+            Why do I have "?"-s in the output instead of
+            character <em>X</em>?
           
   </dt>
 
@@ -1778,9 +1789,9 @@ TemplateModel x = env.getVariable(&quot;x&quot;);  // get variable x</pre></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/">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://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="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 class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-01-09T13:30:20Z" title="Monday, January 9, 2017 1:30:20 PM GMT">2017-01-09 13:30:20 GMT</time>, for Freemarker 2.3.25 </p>
+<time itemprop="dateModified" datetime="2017-01-25T23:20:06Z" title="Wednesday, January 25, 2017 11:20:06 PM GMT">2017-01-25 23:20:06 GMT</time>, for Freemarker 2.3.25 </p>
 <p class="copyright">
 � <span itemprop="copyrightYear">1999</span>\u20132017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/975692b4/docs/app_install.html
----------------------------------------------------------------------
diff --git a/docs/app_install.html b/docs/app_install.html
index fdf01c4..81850b8 100644
--- a/docs/app_install.html
+++ b/docs/app_install.html
@@ -14,7 +14,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1485386406820">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,8 +35,8 @@ ga('send', 'pageview');
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Installing FreeMarker"];</script>
-      <script src="toc.js"></script>
-      <script src="docgen-resources/main.min.js"></script>
+      <script src="toc.js?1485386406820"></script>
+      <script src="docgen-resources/main.min.js?1485386406820"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><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 class="title-wrapper">
 <h1 class="content-header header-chapter" id="app_install" itemprop="headline">Installing FreeMarker</h1>
@@ -87,9 +87,11 @@ 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/">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://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="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:
  Freemarker 2.3.25</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2016-11-11T19:51:37Z" title="Friday, November 11, 2016 7:51:37 PM GMT">2016-11-11 19:51:37 GMT</time></span></p> <p class="copyright">
-� <span itemprop="copyrightYear">1999</span>\u20132016
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</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://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="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 class="last-generated">
+Last generated:
+<time itemprop="dateModified" datetime="2017-01-25T23:20:06Z" title="Wednesday, January 25, 2017 11:20:06 PM GMT">2017-01-25 23:20:06 GMT</time>, for Freemarker 2.3.25 </p>
+<p class="copyright">
+� <span itemprop="copyrightYear">1999</span>\u20132017
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/975692b4/docs/app_legal.html
----------------------------------------------------------------------
diff --git a/docs/app_legal.html b/docs/app_legal.html
index 0e7f893..5b2a3f6 100644
--- a/docs/app_legal.html
+++ b/docs/app_legal.html
@@ -14,7 +14,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1485386406820">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,8 +35,8 @@ ga('send', 'pageview');
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Legal"];</script>
-      <script src="toc.js"></script>
-      <script src="docgen-resources/main.min.js"></script>
+      <script src="toc.js?1485386406820"></script>
+      <script src="docgen-resources/main.min.js?1485386406820"></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_install.html"><span>Previous</span></a><a class="paging-arrow next" href="app_license.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="app_legal" itemprop="headline">Legal</h1>
@@ -44,9 +44,11 @@ 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/">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://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="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:
  Freemarker 2.3.25</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2016-11-11T19:51:37Z" title="Friday, November 11, 2016 7:51:37 PM GMT">2016-11-11 19:51:37 GMT</time></span></p> <p class="copyright">
-� <span itemprop="copyrightYear">1999</span>\u20132016
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</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://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="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 class="last-generated">
+Last generated:
+<time itemprop="dateModified" datetime="2017-01-25T23:20:06Z" title="Wednesday, January 25, 2017 11:20:06 PM GMT">2017-01-25 23:20:06 GMT</time>, for Freemarker 2.3.25 </p>
+<p class="copyright">
+� <span itemprop="copyrightYear">1999</span>\u20132017
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/975692b4/docs/app_license.html
----------------------------------------------------------------------
diff --git a/docs/app_license.html b/docs/app_license.html
index f62e019..6bf3613 100644
--- a/docs/app_license.html
+++ b/docs/app_license.html
@@ -14,7 +14,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1485386406820">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,8 +35,8 @@ ga('send', 'pageview');
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Legal","License"];</script>
-      <script src="toc.js"></script>
-      <script src="docgen-resources/main.min.js"></script>
+      <script src="toc.js?1485386406820"></script>
+      <script src="docgen-resources/main.min.js?1485386406820"></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_legal.html"><span>Previous</span></a><a class="paging-arrow next" href="app_eccn.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="app_license" itemprop="headline">License</h1>
@@ -249,20 +249,6 @@ ga('send', 'pageview');
 END LICENSE
 
 
-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. These files are:
-
-    freemarker/ext/jsp/web-app_2_2.dtd
-    freemarker/ext/jsp/web-app_2_3.dtd
-    freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
-    freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
-
-
 Historical notes
 ----------------
 
@@ -279,9 +265,11 @@ 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/">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://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="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:
  Freemarker 2.3.25</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2016-11-11T19:51:37Z" title="Friday, November 11, 2016 7:51:37 PM GMT">2016-11-11 19:51:37 GMT</time></span></p> <p class="copyright">
-� <span itemprop="copyrightYear">1999</span>\u20132016
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</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://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="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 class="last-generated">
+Last generated:
+<time itemprop="dateModified" datetime="2017-01-25T23:20:06Z" title="Wednesday, January 25, 2017 11:20:06 PM GMT">2017-01-25 23:20:06 GMT</time>, for Freemarker 2.3.25 </p>
+<p class="copyright">
+� <span itemprop="copyrightYear">1999</span>\u20132017
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/975692b4/docs/app_versions.html
----------------------------------------------------------------------
diff --git a/docs/app_versions.html b/docs/app_versions.html
index 38bed94..4aa1c1b 100644
--- a/docs/app_versions.html
+++ b/docs/app_versions.html
@@ -14,7 +14,7 @@
 <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">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1485386406820">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,8 +35,8 @@ ga('send', 'pageview');
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Appendixes","Version history"];</script>
-      <script src="toc.js"></script>
-      <script src="docgen-resources/main.min.js"></script>
+      <script src="toc.js?1485386406820"></script>
+      <script src="docgen-resources/main.min.js?1485386406820"></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_25.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="app_versions" itemprop="headline">Version history</h1>
@@ -44,9 +44,11 @@ ga('send', 'pageview');
 <div class="page-menu-title">Section Contents</div>
 <ul><li><a class="page-menu-link" href="versions_2_3_25.html" data-menu-target="versions_2_3_25">2.3.25 (incubating at Apache)</a></li><li><a class="page-menu-link" href="versions_2_3_24.html" data-menu-target="versions_2_3_24">2.3.24 (incubating at Apache)</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="version
 s_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.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.htm
 l" 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" 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-men
 u-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_25.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/">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://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="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:
  Freemarker 2.3.25</span><span class="last-updated"> Last generated:
-<time itemprop="dateModified" datetime="2016-11-11T19:51:37Z" title="Friday, November 11, 2016 7:51:37 PM GMT">2016-11-11 19:51:37 GMT</time></span></p> <p class="copyright">
-� <span itemprop="copyrightYear">1999</span>\u20132016
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</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://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="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 class="last-generated">
+Last generated:
+<time itemprop="dateModified" datetime="2017-01-25T23:20:06Z" title="Wednesday, January 25, 2017 11:20:06 PM GMT">2017-01-25 23:20:06 GMT</time>, for Freemarker 2.3.25 </p>
+<p class="copyright">
+� <span itemprop="copyrightYear">1999</span>\u20132017
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
 </div></div></div></body>
 </html>