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 2020/08/01 20:32:36 UTC

[freemarker-site] branch asf-site updated: Trying the output of the new Docgen version

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/freemarker-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 1acde34  Trying the output of the new Docgen version
1acde34 is described below

commit 1acde343ceb5fa7ce389e7c6ddc38d4691de90f8
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Aug 1 22:32:25 2020 +0200

    Trying the output of the new Docgen version
---
 docs/alphaidx.html                              |  22 +-
 docs/app.html                                   |  22 +-
 docs/app_eccn.html                              |  22 +-
 docs/app_faq.html                               |  88 ++++----
 docs/app_install.html                           |  22 +-
 docs/app_legal.html                             |  22 +-
 docs/app_license.html                           |  26 ++-
 docs/app_versions.html                          |  22 +-
 docs/detailed-toc.html                          |  22 +-
 docs/dgui.html                                  |  22 +-
 docs/dgui_datamodel.html                        |  22 +-
 docs/dgui_datamodel_basics.html                 |  42 ++--
 docs/dgui_datamodel_types.html                  |  34 +--
 docs/dgui_misc.html                             |  22 +-
 docs/dgui_misc_alternativesyntax.html           |  30 ++-
 docs/dgui_misc_autoescaping.html                | 100 +++++----
 docs/dgui_misc_namespace.html                   |  74 ++++---
 docs/dgui_misc_userdefdir.html                  | 122 +++++-----
 docs/dgui_misc_var.html                         |  50 +++--
 docs/dgui_misc_whitespace.html                  |  48 ++--
 docs/dgui_quickstart.html                       |  22 +-
 docs/dgui_quickstart_basics.html                |  34 +--
 docs/dgui_quickstart_datamodel.html             |  30 ++-
 docs/dgui_quickstart_template.html              | 100 +++++----
 docs/dgui_template.html                         |  22 +-
 docs/dgui_template_directives.html              |  30 ++-
 docs/dgui_template_exp.html                     | 224 ++++++++++---------
 docs/dgui_template_overallstructure.html        |  30 ++-
 docs/dgui_template_valueinsertion.html          |  30 ++-
 docs/docgen-resources/docgen.min.css            |   2 +-
 docs/docgen-resources/fonts/icomoon.eot         | Bin 4220 -> 4376 bytes
 docs/docgen-resources/fonts/icomoon.svg         |  40 ++--
 docs/docgen-resources/fonts/icomoon.ttf         | Bin 4056 -> 4212 bytes
 docs/docgen-resources/fonts/icomoon.woff        | Bin 4132 -> 4288 bytes
 docs/docgen-resources/main.min.js               |   2 +-
 docs/gloss.html                                 |  22 +-
 docs/index.html                                 |  22 +-
 docs/pgui.html                                  |  22 +-
 docs/pgui_config.html                           |  22 +-
 docs/pgui_config_basics.html                    |  22 +-
 docs/pgui_config_custom_formats.html            |  92 ++++----
 docs/pgui_config_errorhandling.html             |  54 +++--
 docs/pgui_config_incompatible_improvements.html |  32 ++-
 docs/pgui_config_outputformatsautoesc.html      |  48 ++--
 docs/pgui_config_settings.html                  |  42 ++--
 docs/pgui_config_sharedvariables.html           |  26 ++-
 docs/pgui_config_templateconfigurations.html    |  50 +++--
 docs/pgui_config_templateloading.html           |  34 +--
 docs/pgui_datamodel.html                        |  22 +-
 docs/pgui_datamodel_basics.html                 |  22 +-
 docs/pgui_datamodel_directive.html              |  52 +++--
 docs/pgui_datamodel_method.html                 |  36 +--
 docs/pgui_datamodel_node.html                   |  22 +-
 docs/pgui_datamodel_objectWrapper.html          |  50 +++--
 docs/pgui_datamodel_parent.html                 |  22 +-
 docs/pgui_datamodel_scalar.html                 |  22 +-
 docs/pgui_misc.html                             |  22 +-
 docs/pgui_misc_ant.html                         |  26 ++-
 docs/pgui_misc_beanwrapper.html                 |  40 ++--
 docs/pgui_misc_charset.html                     |  26 ++-
 docs/pgui_misc_jythonwrapper.html               |  24 +-
 docs/pgui_misc_logging.html                     |  24 +-
 docs/pgui_misc_multithreading.html              |  22 +-
 docs/pgui_misc_secureenv.html                   |  34 +--
 docs/pgui_misc_servlet.html                     |  60 ++---
 docs/pgui_misc_var.html                         |  22 +-
 docs/pgui_misc_xml_legacy.html                  |  30 ++-
 docs/pgui_quickstart.html                       |  22 +-
 docs/pgui_quickstart_all.html                   |  34 +--
 docs/pgui_quickstart_createconfiguration.html   |  26 ++-
 docs/pgui_quickstart_createdatamodel.html       |  34 +--
 docs/pgui_quickstart_gettemplate.html           |  24 +-
 docs/pgui_quickstart_merge.html                 |  26 ++-
 docs/ref.html                                   |  22 +-
 docs/ref_builtins.html                          |  22 +-
 docs/ref_builtins_alphaidx.html                 |  22 +-
 docs/ref_builtins_boolean.html                  |  30 ++-
 docs/ref_builtins_date.html                     |  58 ++---
 docs/ref_builtins_expert.html                   | 118 +++++-----
 docs/ref_builtins_hash.html                     |  38 ++--
 docs/ref_builtins_loop_var.html                 |  98 ++++----
 docs/ref_builtins_node.html                     |  22 +-
 docs/ref_builtins_number.html                   |  84 +++----
 docs/ref_builtins_sequence.html                 | 152 +++++++------
 docs/ref_builtins_string.html                   | 282 ++++++++++++------------
 docs/ref_builtins_type_independent.html         |  30 ++-
 docs/ref_depr_builtin.html                      |  22 +-
 docs/ref_depr_directive.html                    |  22 +-
 docs/ref_depr_numerical_interpolation.html      |  26 ++-
 docs/ref_depr_oldmacro.html                     |  42 ++--
 docs/ref_depr_oldsyntax.html                    |  26 ++-
 docs/ref_depr_transform.html                    |  34 +--
 docs/ref_deprecated.html                        |  22 +-
 docs/ref_directive_alphaidx.html                |  22 +-
 docs/ref_directive_assign.html                  |  46 ++--
 docs/ref_directive_attempt.html                 |  34 +--
 docs/ref_directive_autoesc.html                 |  30 ++-
 docs/ref_directive_compress.html                |  30 ++-
 docs/ref_directive_escape.html                  |  54 +++--
 docs/ref_directive_flush.html                   |  22 +-
 docs/ref_directive_ftl.html                     |  22 +-
 docs/ref_directive_function.html                |  36 +--
 docs/ref_directive_global.html                  |  22 +-
 docs/ref_directive_if.html                      |  42 ++--
 docs/ref_directive_import.html                  |  26 ++-
 docs/ref_directive_include.html                 |  46 ++--
 docs/ref_directive_list.html                    | 124 ++++++-----
 docs/ref_directive_local.html                   |  22 +-
 docs/ref_directive_macro.html                   | 106 +++++----
 docs/ref_directive_noautoesc.html               |  30 ++-
 docs/ref_directive_noparse.html                 |  30 ++-
 docs/ref_directive_nt.html                      |  22 +-
 docs/ref_directive_outputformat.html            |  46 ++--
 docs/ref_directive_setting.html                 |  30 ++-
 docs/ref_directive_stop.html                    |  22 +-
 docs/ref_directive_switch.html                  |  30 ++-
 docs/ref_directive_t.html                       |  30 ++-
 docs/ref_directive_userDefined.html             |  50 +++--
 docs/ref_directive_visit.html                   |  64 +++---
 docs/ref_directives.html                        |  22 +-
 docs/ref_reservednames.html                     |  22 +-
 docs/ref_specvar.html                           |  32 ++-
 docs/search-results.html                        |  22 +-
 docs/toc.html                                   |  24 +-
 docs/versions_2_0.html                          |  22 +-
 docs/versions_2_01.html                         |  22 +-
 docs/versions_2_0RC1.html                       |  36 +--
 docs/versions_2_0RC2.html                       |  22 +-
 docs/versions_2_0RC3.html                       |  26 ++-
 docs/versions_2_1.html                          |  22 +-
 docs/versions_2_1_1.html                        |  22 +-
 docs/versions_2_1_2.html                        |  22 +-
 docs/versions_2_1_3.html                        |  22 +-
 docs/versions_2_1_4.html                        |  22 +-
 docs/versions_2_1_5.html                        |  22 +-
 docs/versions_2_2.html                          |  22 +-
 docs/versions_2_2_1.html                        |  22 +-
 docs/versions_2_2_2.html                        |  22 +-
 docs/versions_2_2_3.html                        |  22 +-
 docs/versions_2_2_4.html                        |  22 +-
 docs/versions_2_2_5.html                        |  22 +-
 docs/versions_2_2_6.html                        |  22 +-
 docs/versions_2_2_7.html                        |  22 +-
 docs/versions_2_2_8.html                        |  22 +-
 docs/versions_2_3.html                          |  22 +-
 docs/versions_2_3_1.html                        |  22 +-
 docs/versions_2_3_10.html                       |  22 +-
 docs/versions_2_3_11.html                       |  22 +-
 docs/versions_2_3_12.html                       |  22 +-
 docs/versions_2_3_13.html                       |  22 +-
 docs/versions_2_3_14.html                       |  22 +-
 docs/versions_2_3_15.html                       |  22 +-
 docs/versions_2_3_16.html                       |  22 +-
 docs/versions_2_3_17.html                       |  22 +-
 docs/versions_2_3_18.html                       |  22 +-
 docs/versions_2_3_19.html                       |  22 +-
 docs/versions_2_3_2.html                        |  22 +-
 docs/versions_2_3_20.html                       |  22 +-
 docs/versions_2_3_21.html                       |  22 +-
 docs/versions_2_3_22.html                       |  26 ++-
 docs/versions_2_3_23.html                       |  22 +-
 docs/versions_2_3_24.html                       |  22 +-
 docs/versions_2_3_25.html                       |  22 +-
 docs/versions_2_3_26.html                       |  22 +-
 docs/versions_2_3_27.html                       |  22 +-
 docs/versions_2_3_28.html                       |  22 +-
 docs/versions_2_3_29.html                       |  22 +-
 docs/versions_2_3_3.html                        |  22 +-
 docs/versions_2_3_30.html                       |  22 +-
 docs/versions_2_3_31.html                       |  95 ++++++++
 docs/versions_2_3_4.html                        |  22 +-
 docs/versions_2_3_5.html                        |  22 +-
 docs/versions_2_3_6.html                        |  22 +-
 docs/versions_2_3_7.html                        |  22 +-
 docs/versions_2_3_7rc1.html                     |  22 +-
 docs/versions_2_3_8.html                        |  22 +-
 docs/versions_2_3_9.html                        |  22 +-
 docs/xgui.html                                  |  22 +-
 docs/xgui_declarative.html                      |  22 +-
 docs/xgui_declarative_basics.html               |  50 +++--
 docs/xgui_declarative_details.html              |  34 +--
 docs/xgui_expose.html                           |  22 +-
 docs/xgui_expose_dom.html                       |  30 ++-
 docs/xgui_expose_put.html                       |  26 ++-
 docs/xgui_imperative.html                       |  22 +-
 docs/xgui_imperative_formal.html                |  22 +-
 docs/xgui_imperative_learn.html                 | 144 ++++++------
 docs/xgui_preface.html                          |  22 +-
 188 files changed, 4091 insertions(+), 2550 deletions(-)

diff --git a/docs/alphaidx.html b/docs/alphaidx.html
index f8a34aa..59bb071 100644
--- a/docs/alphaidx.html
+++ b/docs/alphaidx.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/alphaidx.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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><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">
       <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?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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>
@@ -1758,7 +1766,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/app.html b/docs/app.html
index bc8446b..f385901 100644
--- a/docs/app.html
+++ b/docs/app.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/app.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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>
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <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?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/app_eccn.html b/docs/app_eccn.html
index 5d53e9e..de79d73 100644
--- a/docs/app_eccn.html
+++ b/docs/app_eccn.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/app_eccn.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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 [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <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?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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>
@@ -49,7 +57,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/app_faq.html b/docs/app_faq.html
index 643ee3b..545a8c8 100644
--- a/docs/app_faq.html
+++ b/docs/app_faq.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/app_faq.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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 [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 = ["Apache FreeMarker Manual","Appendixes","FAQ"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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>
@@ -300,7 +308,7 @@ ga('send', 'pageview');
 
                 
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;c:if test=&quot;${t}&quot;&gt;
+<pre class="code-block code-template">&lt;c:if test=&quot;${t}&quot;&gt;
   True
 &lt;/c:if&gt;
 
@@ -315,13 +323,13 @@ ga('send', 'pageview');
 
 &lt;c:forEach var=&quot;i&quot; items=&quot;${ls}&quot;&gt;
 - ${i}
-&lt;/c:forEach&gt;</pre></div>
+&lt;/c:forEach&gt;</pre>
 
                 <p>and the equivalent FTL:</p>
 
                 
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if t&gt;
+<pre class="code-block code-template">&lt;#if t&gt;
   True
 &lt;/#if&gt;
 
@@ -333,7 +341,7 @@ ga('send', 'pageview');
 
 &lt;#list ls as i&gt;
 - ${i}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
               </li>
 
               <li>
@@ -574,8 +582,8 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setNumberFormat(&quot;0.######&quot;);  // now it will print 1000000
-// where cfg is a freemarker.template.Configuration object</pre></div>
+<pre class="code-block code-unspecified">cfg.setNumberFormat(&quot;0.######&quot;);  // now it will print 1000000
+// where cfg is a freemarker.template.Configuration object</pre>
 
             <p>Note however than humans often find it hard to read big
             numbers without grouping separator. So in general it is
@@ -586,7 +594,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>
+<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>
 
             <p>For computer audience you need <code class="inline-code">?c</code> anyway,
             as the decimal separators can also wary depending on the
@@ -615,8 +623,8 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setLocale(java.util.Locale.ITALY);
-// where cfg is a freemarker.template.Configuration object</pre></div>
+<pre class="code-block code-unspecified">cfg.setLocale(java.util.Locale.ITALY);
+// where cfg is a freemarker.template.Configuration object</pre>
 
             <p>However, sometimes you want to output a number not for human
             audience, but for "computer audience" (like you want
@@ -627,7 +635,7 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">font-size: ${<strong>fontSize?c</strong>}pt;</pre></div>
+<pre class="code-block code-template">font-size: ${<strong>fontSize?c</strong>}pt;</pre>
           </dd>
 
         
@@ -1022,29 +1030,29 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;tiles:insert page=&quot;/layout.jsp&quot; <strong>flush=&quot;true&quot;</strong>/&gt;
-<em>...</em></pre></div>
+<pre class="code-block code-template">&lt;tiles:insert page=&quot;/layout.jsp&quot; <strong>flush=&quot;true&quot;</strong>/&gt;
+<em>...</em></pre>
 
             <p>but in FTL you should write:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@tiles.insert page=&quot;/layout.ftl&quot; <strong>flush=true</strong>/&gt;
-<em>...</em></pre></div>
+<pre class="code-block code-template">&lt;@tiles.insert page=&quot;/layout.ftl&quot; <strong>flush=true</strong>/&gt;
+<em>...</em></pre>
 
             <p>Also, for similar reasons, this is wrong:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;tiles:insert page=&quot;/layout.jsp&quot; <strong>flush=&quot;${needFlushing}&quot;</strong>/&gt;
-<em>...</em></pre></div>
+<pre class="code-block code-template">&lt;tiles:insert page=&quot;/layout.jsp&quot; <strong>flush=&quot;${needFlushing}&quot;</strong>/&gt;
+<em>...</em></pre>
 
             <p>and you should write:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;tiles:insert page=&quot;/layout.jsp&quot; <strong>flush=needFlushing</strong>/&gt;
-<em>...</em></pre></div>
+<pre class="code-block code-template">&lt;tiles:insert page=&quot;/layout.jsp&quot; <strong>flush=needFlushing</strong>/&gt;
+<em>...</em></pre>
 
             <p>(Not <code class="inline-code">flush=${needFlushing}</code>!)</p>
           </dd>
@@ -1074,7 +1082,7 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@s.include value=&quot;/WEB-INF/just-an-example.jspf&quot; /&gt;</pre></div>
+<pre class="code-block code-template">&lt;@s.include value=&quot;/WEB-INF/just-an-example.jspf&quot; /&gt;</pre>
 
             <p>If the FreeMarker support of the Web Application Framework
             is based on
@@ -1083,7 +1091,7 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@include_page path=&quot;/WEB-INF/just-an-example.jspf&quot; /&gt;</pre></div>
+<pre class="code-block code-template">&lt;@include_page path=&quot;/WEB-INF/just-an-example.jspf&quot; /&gt;</pre>
 
             <p>but if the Web Application Framework provides its own
             solution, then you may prefer that, after all it may does
@@ -1312,14 +1320,14 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign caculatedResults =
+<pre class="code-block code-template">&lt;#assign caculatedResults =
     &#39;com.example.foo.SmartKeywordIndexHelper&#39;?new().calculate(keywords)&gt;
 &lt;#-- some simple algorithms comes here, like: --&gt;
 &lt;ul&gt;
   &lt;#list caculatedResults as kw&gt;
     &lt;li&gt;&lt;a href=&quot;${kw.link}&quot;&gt;${kw.word}&lt;/a&gt;
   &lt;/#list&gt;
-&lt;/ul&gt;</pre></div>
+&lt;/ul&gt;</pre>
 
             <p>That is, you move out the complex part of the presentation
             task from the template into Java code. Note that it doesn&#39;t affect
@@ -1364,8 +1372,8 @@ ga('send', 'pageview');
 
                 
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign a = pp.newWritableSequence()&gt;
-&lt;@pp.add seq=a value=&quot;red&quot; /&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign a = pp.newWritableSequence()&gt;
+&lt;@pp.add seq=a value=&quot;red&quot; /&gt;</pre>
 
                 <p>The <code class="inline-code">pp.add</code> directive works only with
                 sequences that were created with
@@ -1483,8 +1491,8 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign capturedOutput&gt;&lt;@outputSomething /&gt;&lt;/#assign&gt;
-&lt;@otherDirective someParam=capturedOutput /&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign capturedOutput&gt;&lt;@outputSomething /&gt;&lt;/#assign&gt;
+&lt;@otherDirective someParam=capturedOutput /&gt;</pre>
           </dd>
 
         
@@ -1517,12 +1525,12 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">...
+<pre class="code-block code-unspecified">...
 resp.setContentType(&quot;text/html; charset=utf-8&quot;);
 Writer out = resp.getWriter();
 ...
 t.process(root, out);
-...</pre></div>
+...</pre>
 
             <p>Note that the question marks (or other substitution
             characters) may be produced outside FreeMarker, in which case the
@@ -1565,8 +1573,8 @@ t.process(root, out);
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// internally an Environment will be created, and then discarded
-myTemplate.process(root, out);</pre></div>
+<pre class="code-block code-unspecified">// internally an Environment will be created, and then discarded
+myTemplate.process(root, out);</pre>
 
             <p>To prevent this, you can do the below, which is equivalent
             with the above, except that you have chance to return the
@@ -1574,9 +1582,9 @@ myTemplate.process(root, out);</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Environment env = myTemplate.createProcessingEnvironment(root, out);
+<pre class="code-block code-unspecified">Environment env = myTemplate.createProcessingEnvironment(root, out);
 env.process();  // process the template
-TemplateModel x = env.getVariable(&quot;x&quot;);  // get variable x</pre></div>
+TemplateModel x = env.getVariable(&quot;x&quot;);  // get variable x</pre>
           </dd>
 
         
@@ -1603,7 +1611,7 @@ TemplateModel x = env.getVariable(&quot;x&quot;);  // get variable x</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@&quot;&lt;#assign ${varName}=&#39;example&#39;&gt;&quot;?interpret /&gt;</pre></div>
+<pre class="code-block code-template">&lt;@&quot;&lt;#assign ${varName}=&#39;example&#39;&gt;&quot;?interpret /&gt;</pre>
           </dd>
 
         
@@ -1944,7 +1952,7 @@ 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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/app_install.html b/docs/app_install.html
index 4eb68d5..9742c94 100644
--- a/docs/app_install.html
+++ b/docs/app_install.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/app_install.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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 [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <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?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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>
@@ -90,7 +98,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/app_legal.html b/docs/app_legal.html
index f7ad888..c9fa5b3 100644
--- a/docs/app_legal.html
+++ b/docs/app_legal.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/app_legal.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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 [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <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?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/app_license.html b/docs/app_license.html
index ad5462f..c465352 100644
--- a/docs/app_license.html
+++ b/docs/app_license.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/app_license.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,20 +30,28 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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 [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <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?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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>
 </div></div>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">
+<pre class="code-block code-unspecified">
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -264,11 +272,11 @@ to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
 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>
+Apache Software Foundation.</pre><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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/app_versions.html b/docs/app_versions.html
index 61934f3..d399091 100644
--- a/docs/app_versions.html
+++ b/docs/app_versions.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/app_versions.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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 [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <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?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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_30.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="app_versions" itemprop="headline">Version history</h1>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/detailed-toc.html b/docs/detailed-toc.html
index 45d7bbf..4fc3410 100644
--- a/docs/detailed-toc.html
+++ b/docs/detailed-toc.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/index.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><span itemprop="name">Table of Contents</span></li></ul>  </div>
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = [];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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">Apache FreeMarker Manual <span class="subtitle productname">For Freemarker 2.3.30</span>
@@ -74,7 +82,7 @@ boolean, as well as numerical ranges.</a></li><li><a class="page-menu-link" href
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui.html b/docs/dgui.html
index 35405c4..84d3ed5 100644
--- a/docs/dgui.html
+++ b/docs/dgui.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="index.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_quickstart.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-part" id="dgui" itemprop="headline">Template Author&#39;s Guide</h1>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_datamodel.html b/docs/dgui_datamodel.html
index 34dd506..314145d 100644
--- a/docs/dgui_datamodel.html
+++ b/docs/dgui_datamodel.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_datamodel.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Values, Types"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_quickstart_template.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_datamodel_basics.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="dgui_datamodel" itemprop="headline">Values, Types</h1>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_datamodel_basics.html b/docs/dgui_datamodel_basics.html
index d588974..891651e 100644
--- a/docs/dgui_datamodel_basics.html
+++ b/docs/dgui_datamodel_basics.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_datamodel_basics.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Values, Types","Basics"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_datamodel.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_datamodel_types.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_datamodel_basics" itemprop="headline">Basics</h1>
@@ -70,7 +78,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-data-model"><a name="example.stdDataModel"></a>(root)
+<pre class="code-block code-data-model"><a name="example.stdDataModel"></a>(root)
  |
  +- user = &quot;Big Joe&quot;
  |
@@ -94,7 +102,7 @@ ga('send', 'pageview');
      |
      +- name = &quot;coal&quot;
      |
-     +- weight = 40</pre></div>
+     +- weight = 40</pre>
 
           <p>We say that the <em>value</em> of the the
           <code class="inline-code">user</code> variable is &quot;Big Joe&quot; (a string), the
@@ -119,7 +127,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if cargo.weight &lt; <strong>100</strong>&gt;Light cargo&lt;/#if&gt;</pre></div>
+<pre class="code-block code-template">&lt;#if cargo.weight &lt; <strong>100</strong>&gt;Light cargo&lt;/#if&gt;</pre>
 
           <p>The temporaly result of a calculations are also called values,
           like 20 and 120 when this template is executed (it will print
@@ -127,7 +135,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${cargo.weight / 2 + 100}</pre></div>
+<pre class="code-block code-template">${cargo.weight / 2 + 100}</pre>
 
           <p>Explanation for this last: As the result of dividing the two
           values, 40 (the weight of the cargo) and 2, a new value 20 is
@@ -173,29 +181,29 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-data-model">(root)
+<pre class="code-block code-data-model">(root)
  |
  +- mouse = &quot;Yerri&quot;
      |
      +- age = 12
      |
-     +- color = &quot;brown&quot;</pre></div>
+     +- color = &quot;brown&quot;</pre>
 
           <p>If you merge this template with the above data-model:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${mouse}       &lt;#-- uses mouse as a string --&gt;
+<pre class="code-block code-template">${mouse}       &lt;#-- uses mouse as a string --&gt;
 ${mouse.age}   &lt;#-- uses mouse as a hash --&gt;
-${mouse.color} &lt;#-- uses mouse as a hash --&gt;</pre></div>
+${mouse.color} &lt;#-- uses mouse as a hash --&gt;</pre>
 
           <p>the output will be:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Yerri
+<pre class="code-block code-output">Yerri
 12
-brown</pre></div>
+brown</pre>
         
           
 
@@ -223,7 +231,7 @@ brown</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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_datamodel_types.html b/docs/dgui_datamodel_types.html
index 553153a..5cac030 100644
--- a/docs/dgui_datamodel_types.html
+++ b/docs/dgui_datamodel_types.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_datamodel_types.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Values, Types","The types"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_datamodel_basics.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_template.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_datamodel_types" itemprop="headline">The types</h1>
@@ -321,19 +329,19 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">The average of 3 and 5 is: ${avg(3, 5)}
+<pre class="code-block code-template">The average of 3 and 5 is: ${avg(3, 5)}
 The average of 6 and 10 and 20 is: ${avg(6, 10, 20)}
 The average of the price of a python and an elephant is:
-${avg(animals.python.price, animals.elephant.price)}</pre></div>
+${avg(animals.python.price, animals.elephant.price)}</pre>
 
             <p>this will output:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">The average of 3 and 5 is: 4
+<pre class="code-block code-output">The average of 3 and 5 is: 4
 The average of 6 and 10 and 20 is: 12
 The average of the price of a python and an elephant is:
-4999.5</pre></div>
+4999.5</pre>
 
             <p>What is the difference between a method and a function? As
             far as the template author is concerned, nothing. Well not really
@@ -378,10 +386,10 @@ The average of the price of a python and an elephant is:
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@<strong>box</strong> title=&quot;Attention!&quot;&gt;
+<pre class="code-block code-template">&lt;@<strong>box</strong> title=&quot;Attention!&quot;&gt;
   Too much copy-pasting may leads to
   maintenance headaches.
-&lt;/@<strong>box</strong>&gt;</pre></div>
+&lt;/@<strong>box</strong>&gt;</pre>
           
 
           
@@ -517,7 +525,7 @@ The average of the price of a python and an elephant is:
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_misc.html b/docs/dgui_misc.html
index c95ff56..01cb815 100644
--- a/docs/dgui_misc.html
+++ b/docs/dgui_misc.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_misc.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Miscellaneous"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_template_valueinsertion.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_misc_userdefdir.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="dgui_misc" itemprop="headline">Miscellaneous</h1>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_misc_alternativesyntax.html b/docs/dgui_misc_alternativesyntax.html
index 86a0db1..243b24e 100644
--- a/docs/dgui_misc_alternativesyntax.html
+++ b/docs/dgui_misc_alternativesyntax.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_misc_alternativesyntax.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Miscellaneous","Alternative (square bracket) syntax"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_misc_whitespace.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_misc_alternativesyntax" itemprop="headline">Alternative (square bracket) syntax</h1>
@@ -122,7 +130,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;p&gt;We have these animals:
+<pre class="code-block code-template">&lt;p&gt;We have these animals:
 &lt;table border=1&gt;
   &lt;tr&gt;&lt;th&gt;Name&lt;th&gt;Price
   <strong>[#list animals as animal]</strong>
@@ -133,7 +141,7 @@ ga('send', 'pageview');
       <strong>[#if animal.size == &quot;large&quot;]</strong>&lt;/b&gt;<strong>[/#if]</strong>
     &lt;td&gt;${animal.price} Euros
   <strong>[/#list]</strong>
-&lt;/table&gt;</pre></div>
+&lt;/table&gt;</pre>
 
           <p>The square bracket and the default (angle bracket) syntax are
           mutually exclusive within a template; they can&#39;t be mixed. If the
@@ -201,7 +209,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">[#--
+<pre class="code-block code-template">[#--
   Note:
   This example uses both interpolation_syntax=squareBracket and tag_syntax=squareBracket,
   but you can also use interpolation_syntax=squareBracket and tag_syntax=angleBracket.
@@ -217,7 +225,7 @@ ga('send', 'pageview');
       [#if animal.size == &quot;large&quot;]&lt;/b&gt;[/#if]
     &lt;td&gt;<strong>[=animal.price]</strong> Euros
   [/#list]
-&lt;/table&gt;</pre></div>
+&lt;/table&gt;</pre>
 
           <p>When square bracket interpolation syntax is used,
           <code class="inline-code">${<em class="code-color">expression</em>}</code> and
@@ -241,7 +249,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_misc_autoescaping.html b/docs/dgui_misc_autoescaping.html
index f70bd2b..d8a7cee 100644
--- a/docs/dgui_misc_autoescaping.html
+++ b/docs/dgui_misc_autoescaping.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_misc_autoescaping.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Miscellaneous","Auto-escaping and output formats"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_misc_namespace.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_misc_whitespace.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_misc_autoescaping" itemprop="headline">Auto-escaping and output formats</h1>
@@ -292,8 +300,8 @@ operator</a></li><li><a class="page-menu-link" href="#dgui_misc_autoescaping_str
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#ftl output_format=&quot;XML&quot;&gt;
-${&quot;&#39;&quot;}  &lt;#-- Prints: &amp;apos; --&gt;</pre></div>
+<pre class="code-block code-template">&lt;#ftl output_format=&quot;XML&quot;&gt;
+${&quot;&#39;&quot;}  &lt;#-- Prints: &amp;apos; --&gt;</pre>
 
           <p>Above, the output format was referred by its name shown in the
           earlier table <em>(looked up via
@@ -317,12 +325,12 @@ ${&quot;&#39;&quot;}  &lt;#-- Prints: &amp;apos; --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Let&#39;s assume we have &quot;HTML&quot; output format by default. --&gt;
+<pre class="code-block code-template">&lt;#-- Let&#39;s assume we have &quot;HTML&quot; output format by default. --&gt;
 ${&quot;&#39;&quot;}  &lt;#-- Prints: &amp;#39; --&gt;
 &lt;#outputformat &quot;XML&quot;&gt;
   ${&quot;&#39;&quot;}  &lt;#-- Prints: &amp;apos; --&gt;
 &lt;/#outputformat&gt;
-${&quot;&#39;&quot;}  &lt;#-- Prints: &amp;#39; --&gt;</pre></div>
+${&quot;&#39;&quot;}  &lt;#-- Prints: &amp;#39; --&gt;</pre>
 
           <p>Basically, each position in a template has an associated
           output format, and as you saw above, it might not be the same
@@ -352,9 +360,9 @@ ${&quot;&#39;&quot;}  &lt;#-- Prints: &amp;#39; --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Let&#39;s assume we have &quot;HTML&quot; output format by default. --&gt;
+<pre class="code-block code-template">&lt;#-- Let&#39;s assume we have &quot;HTML&quot; output format by default. --&gt;
 ${&#39;&lt;b&gt;test&lt;/b&gt;&#39;}  &lt;#-- prints: &amp;lt;b&amp;gt;test&amp;lt;/b&amp;gt; --&gt;
-${&#39;&lt;b&gt;test&lt;/b&gt;&#39;<strong>?no_esc</strong>}  &lt;#-- prints: &lt;b&gt;test&lt;/b&gt; --&gt;</pre></div>
+${&#39;&lt;b&gt;test&lt;/b&gt;&#39;<strong>?no_esc</strong>}  &lt;#-- prints: &lt;b&gt;test&lt;/b&gt; --&gt;</pre>
 
           <p>You can also disable auto escaping for a whole section with
           the <a href="ref_directive_noautoesc.html"><code>noautoesc</code>
@@ -362,13 +370,13 @@ ${&#39;&lt;b&gt;test&lt;/b&gt;&#39;<strong>?no_esc</strong>}  &lt;#-- prints: &l
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&#39;&amp;&#39;}  &lt;#-- prints: &amp;amp; --&gt;
+<pre class="code-block code-template">${&#39;&amp;&#39;}  &lt;#-- prints: &amp;amp; --&gt;
 <strong>&lt;#noautoesc&gt;</strong>
   ${&#39;&amp;&#39;}  &lt;#-- prints: &amp; --&gt;
   ...
   ${&#39;&amp;&#39;}  &lt;#-- prints: &amp; --&gt;
 <strong>&lt;/#noautoesc&gt;</strong>
-${&#39;&amp;&#39;}  &lt;#-- prints: &amp;amp; --&gt;</pre></div>
+${&#39;&amp;&#39;}  &lt;#-- prints: &amp;amp; --&gt;</pre>
 
           <p>Just like <code class="inline-code">outputformat</code>, this only applies
           to the part that&#39;s literally inside the block
@@ -381,23 +389,23 @@ ${&#39;&amp;&#39;}  &lt;#-- prints: &amp;amp; --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#ftl <strong>autoesc=false</strong>&gt;
+<pre class="code-block code-template">&lt;#ftl <strong>autoesc=false</strong>&gt;
 ${&#39;&amp;&#39;}  &lt;#-- prints: &amp; --&gt;
 <strong>&lt;#autoesc&gt;</strong>
   ${&#39;&amp;&#39;}  &lt;#-- prints: &amp;amp; --&gt;
   ...
   ${&#39;&amp;&#39;}  &lt;#-- prints: &amp;amp; --&gt;
 <strong>&lt;/#autoesc&gt;</strong>
-${&#39;&amp;&#39;}  &lt;#-- prints: &amp; --&gt;</pre></div>
+${&#39;&amp;&#39;}  &lt;#-- prints: &amp; --&gt;</pre>
 
           <p>You can also force escaping for an individual interpolation
           when escaping is disabled, with <a href="ref_builtins_string.html#ref_builtin_esc"><code>?esc</code></a>:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#ftl <strong>autoesc=false</strong>&gt;
+<pre class="code-block code-template">&lt;#ftl <strong>autoesc=false</strong>&gt;
 ${&#39;&amp;&#39;}  &lt;#-- prints: &amp; --&gt;
-${&#39;&amp;&#39;<strong>?esc</strong>}  &lt;#-- prints: &amp;amp; --&gt;</pre></div>
+${&#39;&amp;&#39;<strong>?esc</strong>}  &lt;#-- prints: &amp;amp; --&gt;</pre>
 
           <p>Naturally, both <code class="inline-code">autoesc</code> and
           <code class="inline-code">?esc</code> works inside <code class="inline-code">noautoesc</code>
@@ -440,7 +448,7 @@ ${&#39;&amp;&#39;<strong>?esc</strong>}  &lt;#-- prints: &amp;amp; --&gt;</pre><
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
+<pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
 
 &lt;@infoBox &quot;Foo &amp; bar&quot; /&gt;
 &lt;@infoBox &quot;Foo &lt;b&gt;bar&lt;/b&gt;&quot;?no_esc /&gt;
@@ -449,31 +457,31 @@ ${&#39;&amp;&#39;<strong>?esc</strong>}  &lt;#-- prints: &amp;amp; --&gt;</pre><
   &lt;div class=&quot;infoBox&quot;&gt;
     ${message}
   &lt;/div&gt;
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;div class=&quot;infoBox&quot;&gt;
+<pre class="code-block code-output">  &lt;div class=&quot;infoBox&quot;&gt;
     Foo &amp;amp; bar
   &lt;/div&gt;
   &lt;div class=&quot;infoBox&quot;&gt;
     Foo &lt;b&gt;bar&lt;/b&gt;
-  &lt;/div&gt;</pre></div>
+  &lt;/div&gt;</pre>
 
           <p>Another case where you get a markup output value is output
           capturing:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
+<pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
 &lt;#assign captured&gt;&lt;b&gt;Test&lt;/b&gt;&lt;/#assign&gt;
 Just a string: ${&quot;&lt;b&gt;Test&lt;/b&gt;&quot;}
-Captured output: ${captured}</pre></div>
+Captured output: ${captured}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Just a string: &amp;lt;b&amp;gt;Test&amp;lt;/b&amp;gt;
-Captured output: &lt;b&gt;Test&lt;/b&gt;</pre></div>
+<pre class="code-block code-output">Just a string: &amp;lt;b&amp;gt;Test&amp;lt;/b&amp;gt;
+Captured output: &lt;b&gt;Test&lt;/b&gt;</pre>
 
           <p>Because the captured output is markup output, it wasn&#39;t
           auto-escaped.</p>
@@ -493,7 +501,7 @@ Captured output: &lt;b&gt;Test&lt;/b&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
+<pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
 
 &lt;#assign markupOutput1=&quot;&lt;b&gt;Test&lt;/b&gt;&quot;?no_esc&gt;
 &lt;#assign markupOutput2=&quot;Foo &amp; bar&quot;?esc&gt;
@@ -504,17 +512,17 @@ ${markupOutput2}
 
 Possibly unintended double escaping:
 ${markupOutput1?markup_string}
-${markupOutput2?markup_string}</pre></div>
+${markupOutput2?markup_string}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">As expected:
+<pre class="code-block code-output">As expected:
 &lt;b&gt;Test&lt;/b&gt;
 Foo &amp;amp; bar
 
 Possibly unintended double escaping:
 &amp;lt;b&amp;gt;Test&amp;lt;/b&amp;gt;
-Foo &amp;amp;amp; bar</pre></div>
+Foo &amp;amp;amp; bar</pre>
         
           
 
@@ -574,7 +582,7 @@ Foo &amp;amp;amp; bar</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
+<pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
 
 &lt;#assign mo1 = &quot;Foo&#39;s bar {}&quot;?esc&gt;
 HTLM: ${mo1}
@@ -584,17 +592,17 @@ RTF:  &lt;#outputformat &#39;RTF&#39;&gt;${mo1}&lt;/#outputformat&gt;
 &lt;#assign mo2&gt;&lt;p&gt;Test&lt;/#assign&gt;
 HTML: ${mo2}
 XML:  &lt;#attempt&gt;&lt;#outputformat &#39;XML&#39;&gt;${mo2}&lt;/#outputformat&gt;&lt;#recover&gt;Failed&lt;/#attempt&gt;
-RTF:  &lt;#attempt&gt;&lt;#outputformat &#39;RTF&#39;&gt;${mo2}&lt;/#outputformat&gt;&lt;#recover&gt;Failed&lt;/#attempt&gt;</pre></div>
+RTF:  &lt;#attempt&gt;&lt;#outputformat &#39;RTF&#39;&gt;${mo2}&lt;/#outputformat&gt;&lt;#recover&gt;Failed&lt;/#attempt&gt;</pre>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">HTLM: Foo&amp;#39;s bar {}
+<pre class="code-block code-output">HTLM: Foo&amp;#39;s bar {}
 XML:  Foo&amp;apos;s bar {}
 RTF:  Foo&#39;s bar \{\}
 
 HTML: &lt;p&gt;Test
 XML:  Failed
-RTF:  Failed</pre></div>
+RTF:  Failed</pre>
 
             <p>But, an output format can also chose to insert pieces of
             other output formats as is, without converting them. Among the
@@ -604,20 +612,20 @@ RTF:  Failed</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- We assume that we have &quot;undefined&quot; output format here. --&gt;
+<pre class="code-block code-template">&lt;#-- We assume that we have &quot;undefined&quot; output format here. --&gt;
 
 &lt;#outputformat &quot;HTML&quot;&gt;&lt;#assign htmlMO&gt;&lt;p&gt;Test&lt;/#assign&gt;&lt;/#outputformat&gt;
 &lt;#outputformat &quot;XML&quot;&gt;&lt;#assign xmlMO&gt;&lt;p&gt;Test&lt;/p&gt;&lt;/#assign&gt;&lt;/#outputformat&gt;
 &lt;#outputformat &quot;RTF&quot;&gt;&lt;#assign rtfMO&gt;\par Test&lt;/#assign&gt;&lt;/#outputformat&gt;
 HTML: ${htmlMO}
 XML:  ${xmlMO}
-RTF:  ${rtfMO}</pre></div>
+RTF:  ${rtfMO}</pre>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">HTML: &lt;p&gt;Test
+<pre class="code-block code-output">HTML: &lt;p&gt;Test
 XML:  &lt;p&gt;Test&lt;/p&gt;
-RTF:  \par Test</pre></div>
+RTF:  \par Test</pre>
           
 
           
@@ -639,12 +647,12 @@ RTF:  \par Test</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
-${&quot;&lt;h1&gt;&quot;?no_esc + &quot;Foo &amp; bar&quot; + &quot;&lt;/h1&gt;&quot;?no_esc}</pre></div>
+<pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
+${&quot;&lt;h1&gt;&quot;?no_esc + &quot;Foo &amp; bar&quot; + &quot;&lt;/h1&gt;&quot;?no_esc}</pre>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">&lt;h1&gt;Foo &amp;amp; bar&lt;/h1&gt;</pre></div>
+<pre class="code-block code-output">&lt;h1&gt;Foo &amp;amp; bar&lt;/h1&gt;</pre>
 
             <p>If the two sides of the <code class="inline-code">+</code> operator are
             markup values of different output formats, the right side operand
@@ -675,7 +683,7 @@ ${&quot;&lt;h1&gt;&quot;?no_esc + &quot;Foo &amp; bar&quot; + &quot;&lt;/h1&gt;&
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
+<pre class="code-block code-template">&lt;#-- We assume that we have &quot;HTML&quot; output format by default. --&gt;
 &lt;#assign name = &quot;Foo &amp; Bar&quot;&gt;
 
 &lt;#assign s = &quot;&lt;p&gt;Hello ${name}!&quot;&gt;
@@ -683,15 +691,15 @@ ${s}
 &lt;p&gt;Hello ${name}!
 
 To prove that s didn&#39;t contain the value in escaped form:
-${s?replace(&#39;&amp;&#39;), &#39;and&#39;}</pre></div>
+${s?replace(&#39;&amp;&#39;), &#39;and&#39;}</pre>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">&amp;lt;p&amp;gt;Hello Foo &amp;amp; Bar!
+<pre class="code-block code-output">&amp;lt;p&amp;gt;Hello Foo &amp;amp; Bar!
 &lt;p&gt;Hello Foo &amp;amp; Bar!
 
 To prove that &quot;s&quot; didn&#39;t contain the value in escaped form:
-&amp;lt;p&amp;gt;Hello Foo and Bar!</pre></div>
+&amp;lt;p&amp;gt;Hello Foo and Bar!</pre>
           
 
           
@@ -711,7 +719,7 @@ To prove that &quot;s&quot; didn&#39;t contain the value in escaped form:
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_misc_namespace.html b/docs/dgui_misc_namespace.html
index 0b7ace0..879657f 100644
--- a/docs/dgui_misc_namespace.html
+++ b/docs/dgui_misc_namespace.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_misc_namespace.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Miscellaneous","Namespaces"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_misc_var.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_misc_autoescaping.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_misc_namespace" itemprop="headline">Namespaces</h1>
@@ -78,11 +86,11 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro copyright date&gt;
+<pre class="code-block code-template">&lt;#macro copyright date&gt;
   &lt;p&gt;Copyright (C) ${date} Someone. All rights reserved.&lt;/p&gt;
 &lt;/#macro&gt;
 
-&lt;#assign mail = &quot;user@example.com&quot;&gt;</pre></div>
+&lt;#assign mail = &quot;user@example.com&quot;&gt;</pre>
 
           <p>Save this into the <code class="inline-code">lib/example.ftl</code> file
           (inside the directory where you store the templates). Then create a
@@ -91,17 +99,17 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#<strong>import</strong> &quot;/lib/example.ftl&quot; as <strong>e</strong>&gt;
+<pre class="code-block code-template">&lt;#<strong>import</strong> &quot;/lib/example.ftl&quot; as <strong>e</strong>&gt;
 
 Some Web page...
 &lt;@<strong>e</strong>.copyright date=&quot;1999-2002&quot;/&gt;
-${<strong>e</strong>.mail}</pre></div>
+${<strong>e</strong>.mail}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Some Web page...
+<pre class="code-block code-output">Some Web page...
   &lt;p&gt;Copyright (C) 1999-2002 Someone. All rights reserved.&lt;/p&gt;
-user@example.com</pre></div>
+user@example.com</pre>
 
           <p>Note the <a href="ref_directive_import.html#ref.directive.import"><code>import</code>
           directive</a> above, and the subsequent usage of the
@@ -128,29 +136,29 @@ user@example.com</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro copyright date&gt;
+<pre class="code-block code-template">&lt;#macro copyright date&gt;
   &lt;p&gt;Copyright (C) ${date} Someone. All rights reserved.
   &lt;br&gt;Email: <strong>${mail}</strong>&lt;/p&gt;
 &lt;/#macro&gt;
 
-&lt;#assign mail = &quot;user@example.com&quot;&gt;</pre></div>
+&lt;#assign mail = &quot;user@example.com&quot;&gt;</pre>
 
           <p>and <code class="inline-code">some_web_page.ftl</code> with this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#import &quot;/lib/example.ftl&quot; as e&gt;
+<pre class="code-block code-template">&lt;#import &quot;/lib/example.ftl&quot; as e&gt;
 <strong>&lt;#assign mail=&quot;other@example.com&quot;&gt;</strong>
 &lt;@e.copyright date=&quot;1999-2002&quot;/&gt;
 ${e.mail}
-${mail}</pre></div>
+${mail}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;p&gt;Copyright (C) 1999-2002 Someone. All rights reserved.
+<pre class="code-block code-output">  &lt;p&gt;Copyright (C) 1999-2002 Someone. All rights reserved.
   &lt;br&gt;Email: <strong>user@example.com</strong>&lt;/p&gt;
 user@example.com
-other@example.com</pre></div>
+other@example.com</pre>
 
           <p>As you can see, the <code class="inline-code">mail</code> variable assigned
           in <code class="inline-code">some_web_page.ftl</code> is separate from the
@@ -171,15 +179,15 @@ other@example.com</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#import &quot;/lib/example.ftl&quot; as e&gt;
+<pre class="code-block code-template">&lt;#import &quot;/lib/example.ftl&quot; as e&gt;
 ${e.mail}
 &lt;#assign mail=&quot;other@example.com&quot; <strong>in e</strong>&gt;
-${e.mail}</pre></div>
+${e.mail}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">user@example.com
-other@example.com</pre></div>
+<pre class="code-block code-output">user@example.com
+other@example.com</pre>
         
           
 
@@ -195,23 +203,23 @@ other@example.com</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro copyright date&gt;
+<pre class="code-block code-template">&lt;#macro copyright date&gt;
   &lt;p&gt;Copyright (C) ${date} <strong>${user}</strong>. All rights reserved.&lt;/p&gt;
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
 
           <p>Assuming <code class="inline-code">user</code> is "John
           Doe":</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#import &quot;/lib/my_test.ftl&quot; as my&gt;
+<pre class="code-block code-template">&lt;#import &quot;/lib/my_test.ftl&quot; as my&gt;
 User is: ${user}
-&lt;@my.copyright date=&quot;1999-2002&quot;/&gt;</pre></div>
+&lt;@my.copyright date=&quot;1999-2002&quot;/&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">User is: John Doe
-  &lt;p&gt;Copyright (C) 1999-2002 John Doe. All rights reserved.&lt;/p&gt;</pre></div>
+<pre class="code-block code-output">User is: John Doe
+  &lt;p&gt;Copyright (C) 1999-2002 John Doe. All rights reserved.&lt;/p&gt;</pre>
 
           <p>Don&#39;t forget that the variables in the namespace (the
           variables you create with <code class="inline-code">assign</code>,
@@ -251,17 +259,17 @@ User is: ${user}
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#import &quot;/lib/example.ftl&quot; as e&gt;
+<pre class="code-block code-template">&lt;#import &quot;/lib/example.ftl&quot; as e&gt;
 &lt;#import &quot;/lib/example.ftl&quot; as e2&gt;
 &lt;#import &quot;/lib/example.ftl&quot; as e3&gt;
 ${e.mail}, ${e2.mail}, ${e3.mail}
 &lt;#assign mail=&quot;other@example.com&quot; in e&gt;
-${e.mail}, ${e2.mail}, ${e3.mail}</pre></div>
+${e.mail}, ${e2.mail}, ${e3.mail}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">user@example.com, user@example.com, user@example.com
-other@example.com, other@example.com, other@example.com</pre></div>
+<pre class="code-block code-output">user@example.com, user@example.com, user@example.com
+other@example.com, other@example.com, other@example.com</pre>
 
           <p>As you access the same namespace through <code class="inline-code">e</code>,
           <code class="inline-code">e2</code>, and <code class="inline-code">e3</code>, the
@@ -308,7 +316,7 @@ other@example.com, other@example.com, other@example.com</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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_misc_userdefdir.html b/docs/dgui_misc_userdefdir.html
index 040aa11..9d4bca3 100644
--- a/docs/dgui_misc_userdefdir.html
+++ b/docs/dgui_misc_userdefdir.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_misc_userdefdir.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Miscellaneous","Defining your own directives"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_misc.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_misc_var.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_misc_userdefdir" itemprop="headline">Defining your own directives</h1>
@@ -67,9 +75,9 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template"><strong>&lt;#macro greet&gt;</strong>
+<pre class="code-block code-template"><strong>&lt;#macro greet&gt;</strong>
   &lt;font size=&quot;+2&quot;&gt;Hello Joe!&lt;/font&gt;
-<strong>&lt;/#macro&gt;</strong></pre></div>
+<strong>&lt;/#macro&gt;</strong></pre>
 
           <p>The <code class="inline-code">macro</code> directive itself does not print
           anything; it just creates the macro variable, so there will be a
@@ -84,7 +92,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@greet&gt;&lt;/@greet&gt;</pre></div>
+<pre class="code-block code-template">&lt;@greet&gt;&lt;/@greet&gt;</pre>
 
           <p>But since
           <code class="inline-code">&lt;<em class="code-color">anything</em>&gt;&lt;/<em class="code-color">anything</em>&gt;</code>
@@ -95,14 +103,14 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@greet/&gt;</pre></div>
+<pre class="code-block code-template">&lt;@greet/&gt;</pre>
 
           <p>This will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;font size=&quot;+2&quot;&gt;Hello Joe!&lt;/font&gt;
-  </pre></div>
+<pre class="code-block code-output">  &lt;font size=&quot;+2&quot;&gt;Hello Joe!&lt;/font&gt;
+  </pre>
 
           <p>But macros can do much more, since the thing between
           <code class="inline-code">&lt;#macro <em class="code-color">...</em>&gt;</code> and
@@ -138,23 +146,23 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro greet <strong>person</strong>&gt;
+<pre class="code-block code-template">&lt;#macro greet <strong>person</strong>&gt;
   &lt;font size=&quot;+2&quot;&gt;Hello <strong>${person}</strong>!&lt;/font&gt;
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
 
           <p>and then you can use this macro as:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@greet <strong>person=&quot;Fred&quot;</strong>/&gt; and &lt;@greet <strong>person=&quot;Batman&quot;</strong>/&gt;</pre></div>
+<pre class="code-block code-template">&lt;@greet <strong>person=&quot;Fred&quot;</strong>/&gt; and &lt;@greet <strong>person=&quot;Batman&quot;</strong>/&gt;</pre>
 
           <p>which is similar to HTML syntax. This will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;font size=&quot;+2&quot;&gt;Hello <strong>Fred</strong>!&lt;/font&gt;
+<pre class="code-block code-output">  &lt;font size=&quot;+2&quot;&gt;Hello <strong>Fred</strong>!&lt;/font&gt;
  and   &lt;font size=&quot;+2&quot;&gt;Hello <strong>Batman</strong>!&lt;/font&gt;
- </pre></div>
+ </pre>
 
           <p>As you can see, the actual value of the macro parameter is
           accessible in the macro definition body as a variable
@@ -176,22 +184,22 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro greet person <strong>color</strong>&gt;
+<pre class="code-block code-template">&lt;#macro greet person <strong>color</strong>&gt;
   &lt;font size=&quot;+2&quot; color=&quot;${color}&quot;&gt;Hello ${person}!&lt;/font&gt;
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
 
           <p>and then you can use this macro like:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@greet person=&quot;Fred&quot; color=&quot;black&quot;/&gt;</pre></div>
+<pre class="code-block code-template">&lt;@greet person=&quot;Fred&quot; color=&quot;black&quot;/&gt;</pre>
 
           <p>The order of parameters is not important, so this is
           equivalent with the previous:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@greet color=&quot;black&quot; person=&quot;Fred&quot;/&gt;</pre></div>
+<pre class="code-block code-template">&lt;@greet color=&quot;black&quot; person=&quot;Fred&quot;/&gt;</pre>
 
           <p>When you call the macro, you can use only parameters that you
           have defined in the <code class="inline-code">macro</code> directive (in this
@@ -218,9 +226,9 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro greet person color<strong>=&quot;black&quot;</strong>&gt;
+<pre class="code-block code-template">&lt;#macro greet person color<strong>=&quot;black&quot;</strong>&gt;
   &lt;font size=&quot;+2&quot; color=&quot;${color}&quot;&gt;Hello ${person}!&lt;/font&gt;
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
 
           <p>Now <code class="inline-code">&lt;@greet person=&quot;Fred&quot;/&gt;</code> is OK,
           since it is equivalent with <code class="inline-code">&lt;@greet person=&quot;Fred&quot;
@@ -268,11 +276,11 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro border&gt;
+<pre class="code-block code-template">&lt;#macro border&gt;
   &lt;table border=4 cellspacing=0 cellpadding=4&gt;&lt;tr&gt;&lt;td&gt;
     <strong>&lt;#nested&gt;</strong>
   &lt;/tr&gt;&lt;/td&gt;&lt;/table&gt;
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
 
           <p>The <code class="inline-code">&lt;#nested&gt;</code> directive executes the
           template fragment between the start-tag and end-tags of the
@@ -280,38 +288,38 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@border&gt;The bordered text&lt;/@border&gt;</pre></div>
+<pre class="code-block code-template">&lt;@border&gt;The bordered text&lt;/@border&gt;</pre>
 
           <p>the output will be:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;table border=4 cellspacing=0 cellpadding=4&gt;&lt;tr&gt;&lt;td&gt;
+<pre class="code-block code-output">  &lt;table border=4 cellspacing=0 cellpadding=4&gt;&lt;tr&gt;&lt;td&gt;
     The bordered text
   &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
- </pre></div>
+ </pre>
 
           <p>The <code class="inline-code">nested</code> directive can be called for
           multiple times, for example:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro do_thrice&gt;<strong>
+<pre class="code-block code-template">&lt;#macro do_thrice&gt;<strong>
   &lt;#nested&gt;
   &lt;#nested&gt;
   &lt;#nested&gt;</strong>
 &lt;/#macro&gt;
 &lt;@do_thrice&gt;
   Anything.
-&lt;/@do_thrice&gt;</pre></div>
+&lt;/@do_thrice&gt;</pre>
 
           <p>will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  Anything.
+<pre class="code-block code-output">  Anything.
   Anything.
-  Anything.</pre></div>
+  Anything.</pre>
 
           <p>If you don&#39;t use the <code class="inline-code">nested</code> directive, then
           the nested content will not be executed. Thus, if you accidentally
@@ -319,16 +327,16 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@greet person=&quot;Joe&quot;&gt;
+<pre class="code-block code-template">&lt;@greet person=&quot;Joe&quot;&gt;
   Anything.
-&lt;/@greet&gt;</pre></div>
+&lt;/@greet&gt;</pre>
 
           <p>then FreeMarker will not see this as an error, and simply
           prints:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">&lt;font size=&quot;+2&quot;&gt;Hello Joe!&lt;/font&gt;</pre></div>
+<pre class="code-block code-output">&lt;font size=&quot;+2&quot;&gt;Hello Joe!&lt;/font&gt;</pre>
 
           <p>and the nested content will be ignored, since the
           <code class="inline-code">greet</code> macro never uses <code class="inline-code">nested</code>
@@ -339,19 +347,19 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@border&gt;
+<pre class="code-block code-template">&lt;@border&gt;
   &lt;ul&gt;
   &lt;@do_thrice&gt;
     &lt;li&gt;&lt;@greet person=&quot;Joe&quot;/&gt;
   &lt;/@do_thrice&gt;
   &lt;/ul&gt;
-&lt;/@border&gt;</pre></div>
+&lt;/@border&gt;</pre>
 
           <p>and will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;table border=4 cellspacing=0 cellpadding=4&gt;&lt;tr&gt;&lt;td&gt;
+<pre class="code-block code-output">  &lt;table border=4 cellspacing=0 cellpadding=4&gt;&lt;tr&gt;&lt;td&gt;
       &lt;ul&gt;
     &lt;li&gt;&lt;font size=&quot;+2&quot;&gt;Hello Joe!&lt;/font&gt;
 
@@ -361,28 +369,28 @@ ga('send', 'pageview');
 
   &lt;/ul&gt;
 
-  &lt;/tr&gt;&lt;/td&gt;&lt;/table&gt;</pre></div>
+  &lt;/tr&gt;&lt;/td&gt;&lt;/table&gt;</pre>
 
           <p>The <a href="dgui_misc_var.html">local variables</a> of a
           macro are not visible in the nested content. Say, this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro repeat count&gt;
+<pre class="code-block code-template">&lt;#macro repeat count&gt;
   &lt;#local y = &quot;test&quot;&gt;
   &lt;#list 1..count as x&gt;
     ${y} ${count}/${x}: &lt;#nested&gt;
   &lt;/#list&gt;
 &lt;/#macro&gt;
-&lt;@repeat count=3&gt;${y!&quot;?&quot;} ${x!&quot;?&quot;} ${count!&quot;?&quot;}&lt;/@repeat&gt;</pre></div>
+&lt;@repeat count=3&gt;${y!&quot;?&quot;} ${x!&quot;?&quot;} ${count!&quot;?&quot;}&lt;/@repeat&gt;</pre>
 
           <p>will print this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">    test 3/1: ? ? ?
+<pre class="code-block code-output">    test 3/1: ? ? ?
     test 3/2: ? ? ?
-    test 3/3: ? ? ?</pre></div>
+    test 3/3: ? ? ?</pre>
 
           <p>because the <code class="inline-code">y</code>, <code class="inline-code">x</code> and
           <code class="inline-code">count</code> are the local (private) variables of the
@@ -392,14 +400,14 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro test foo&gt;${foo} (&lt;#nested&gt;) ${foo}&lt;/#macro&gt;
-&lt;@test foo=&quot;A&quot;&gt;&lt;@test foo=&quot;B&quot;&gt;&lt;@test foo=&quot;C&quot;/&gt;&lt;/@test&gt;&lt;/@test&gt;</pre></div>
+<pre class="code-block code-template">&lt;#macro test foo&gt;${foo} (&lt;#nested&gt;) ${foo}&lt;/#macro&gt;
+&lt;@test foo=&quot;A&quot;&gt;&lt;@test foo=&quot;B&quot;&gt;&lt;@test foo=&quot;C&quot;/&gt;&lt;/@test&gt;&lt;/@test&gt;</pre>
 
           <p>and will print this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">A (B (C () C) B) A</pre></div>
+<pre class="code-block code-output">A (B (C () C) B) A</pre>
         
           
 
@@ -426,23 +434,23 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro do_thrice&gt;
+<pre class="code-block code-template">&lt;#macro do_thrice&gt;
   &lt;#nested <strong>1</strong>&gt;
   &lt;#nested <strong>2</strong>&gt;
   &lt;#nested <strong>3</strong>&gt;
 &lt;/#macro&gt;
 &lt;@do_thrice <strong>; x</strong>&gt; &lt;#-- user-defined directive uses &quot;;&quot; instead of &quot;as&quot; --&gt;
   ${<strong>x</strong>} Anything.
-&lt;/@do_thrice&gt;</pre></div>
+&lt;/@do_thrice&gt;</pre>
 
           <p>This will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  1 Anything.
+<pre class="code-block code-output">  1 Anything.
   2 Anything.
   3 Anything.
- </pre></div>
+ </pre>
 
           <p>The syntactical rule is that you pass the actual value of the
           loop variable for a certain &quot;loop&quot; (i.e. repetition of the nested
@@ -457,24 +465,24 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro repeat count&gt;
+<pre class="code-block code-template">&lt;#macro repeat count&gt;
   &lt;#list 1..count as x&gt;
     &lt;#nested <strong>x, x/2, x==count</strong>&gt;
   &lt;/#list&gt;
 &lt;/#macro&gt;
 &lt;@repeat count=4 ; <strong>c, halfc, last</strong>&gt;
   ${<strong>c</strong>}. ${<strong>halfc</strong>}&lt;#if <strong>last</strong>&gt; Last!&lt;/#if&gt;
-&lt;/@repeat&gt;</pre></div>
+&lt;/@repeat&gt;</pre>
 
           <p>The output will be:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  1. 0.5
+<pre class="code-block code-output">  1. 0.5
   2. 1
   3. 1.5
   4. 2 Last!
- </pre></div>
+ </pre>
 
           <p>It is not a problem if you specify different number of loop
           variables in the user-defined directive start-tag (that is, after
@@ -486,7 +494,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@repeat count=4 ; <strong>c, halfc, last</strong>&gt;
+<pre class="code-block code-template">&lt;@repeat count=4 ; <strong>c, halfc, last</strong>&gt;
   ${c}. ${halfc}&lt;#if last&gt; Last!&lt;/#if&gt;
 &lt;/@repeat&gt;
 &lt;@repeat count=4 ; <strong>c, halfc</strong>&gt;
@@ -494,7 +502,7 @@ ga('send', 'pageview');
 &lt;/@repeat&gt;
 &lt;@repeat count=4&gt;
   Just repeat it...
-&lt;/@repeat&gt;</pre></div>
+&lt;/@repeat&gt;</pre>
 
           <p>If you specify more variables after the semicolon than with
           the <code class="inline-code">nested</code> directive, then the last few loop
@@ -547,7 +555,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_misc_var.html b/docs/dgui_misc_var.html
index 6bcbb70..3bb36e6 100644
--- a/docs/dgui_misc_var.html
+++ b/docs/dgui_misc_var.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_misc_var.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Miscellaneous","Defining variables in the template"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_misc_userdefdir.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_misc_namespace.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_misc_var" itemprop="headline">Defining variables in the template</h1>
@@ -109,21 +117,21 @@ ga('send', 'pageview');
         </ul><p>Example: Create and replace variables with
         <code class="inline-code">assign</code>:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x = 1&gt;  &lt;#-- create variable x --&gt;
+<pre class="code-block code-template">&lt;#assign x = 1&gt;  &lt;#-- create variable x --&gt;
 ${x}
 &lt;#assign x = 2&gt; &lt;#-- replace variable x --&gt;
 ${x}
 &lt;#assign x++&gt; &lt;#-- replace variable x --&gt;
-${x}</pre></div>
+${x}</pre>
 
-<div class="code-wrapper"><pre class="code-block code-output">1
+<pre class="code-block code-output">1
 2
-3</pre></div><p>In the next example we demonstrate that local variables hide
+3</pre><p>In the next example we demonstrate that local variables hide
         (not overwrite) "plain" variables of the same name, and
         that loop variables hide (not overwrite) local and
         "plain" variables of the same name:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x = &quot;plain&quot;&gt;
+<pre class="code-block code-template">&lt;#assign x = &quot;plain&quot;&gt;
 1. ${x}  &lt;#-- we see the plain var. here --&gt;
 &lt;@test/&gt;
 6. ${x}  &lt;#-- the value of plain var. was not changed --&gt;
@@ -142,9 +150,9 @@ ${x}</pre></div>
     4. ${x}  &lt;#-- now the loop var. hides the local var. --&gt;
   &lt;/#list&gt;
   5. ${x}  &lt;#-- now we see the local var. again --&gt;
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
 
-<div class="code-wrapper"><pre class="code-block code-output">1. plain
+<pre class="code-block code-output">1. plain
   2. plain
   3. local
     4. loop
@@ -152,11 +160,11 @@ ${x}</pre></div>
 6. plain
     7. loop
     8. loop
-9. plain2 </pre></div><p>In the next example we demonstrate that an inner loop variable
+9. plain2 </pre><p>In the next example we demonstrate that an inner loop variable
         can hide (not overwrite) an outer loop variable of the same
         name:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&quot;loop 1&quot;] as x&gt;
+<pre class="code-block code-template">&lt;#list [&quot;loop 1&quot;] as x&gt;
   ${x}
   &lt;#list [&quot;loop 2&quot;] as x&gt;
     ${x}
@@ -166,22 +174,22 @@ ${x}</pre></div>
     ${x}
   &lt;/#list&gt;
   ${x}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
-<div class="code-wrapper"><pre class="code-block code-output">  loop 1
+<pre class="code-block code-output">  loop 1
     loop 2
       loop 3
     loop 2
-  loop 1</pre></div><p>When a variable hides the variable from the data-model, you can
+  loop 1</pre><p>When a variable hides the variable from the data-model, you can
         still read that variable from the data-model using <a href="dgui_template_exp.html#dgui_template_exp_var_special">special variable</a>
         <code class="inline-code">globals</code>. For example, assume we have a variable
         called <code class="inline-code">user</code> in the data-model with value "Big
         Joe":</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">${user}          &lt;#-- prints: Big Joe --&gt;
+<pre class="code-block code-template">${user}          &lt;#-- prints: Big Joe --&gt;
 &lt;#assign user = &quot;Joe Hider&quot;&gt;
 ${user}          &lt;#-- prints: Joe Hider --&gt;
-${.globals.user} &lt;#-- prints: Big Joe --&gt;</pre></div><p>You could also write <code class="inline-code">.data_model.user</code>
+${.globals.user} &lt;#-- prints: Big Joe --&gt;</pre><p>You could also write <code class="inline-code">.data_model.user</code>
         instead, and then not even a <code class="inline-code">&lt;#global user =
         &quot;<em class="code-color">...</em>&quot;&gt;</code> can hide the value in
         the data-model. However, global variables are often purposely set to
@@ -191,7 +199,7 @@ ${.globals.user} &lt;#-- prints: Big Joe --&gt;</pre></div><p>You could also wri
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_misc_whitespace.html b/docs/dgui_misc_whitespace.html
index 843b31b..c8d3bf9 100644
--- a/docs/dgui_misc_whitespace.html
+++ b/docs/dgui_misc_whitespace.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_misc_whitespace.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Miscellaneous","White-space handling"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_misc_autoescaping.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_misc_alternativesyntax.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_misc_whitespace" itemprop="headline">White-space handling</h1>
@@ -48,7 +56,7 @@ ga('send', 'pageview');
         business.</p><p>Let see this template. I have marked the components of template
         with colors: <span class="marked-text">text</span>, <span class="marked-interpolation">interpolation</span>, <span class="marked-ftl-tag">FTL tag</span>. With the <em><span class="marked-invisible-text">[BR]</span></em>-s I visualize the <a href="gloss.html#gloss.lineBreak">line breaks</a>.</p>
 
-<div class="code-wrapper"><pre class="code-block code-template"><span class="marked-text">&lt;p&gt;List of users:<em><span class="marked-invisible-text">[BR]</span></em>
+<pre class="code-block code-template"><span class="marked-text">&lt;p&gt;List of users:<em><span class="marked-invisible-text">[BR]</span></em>
 <span class="marked-ftl-tag">&lt;#assign users = [{&quot;name&quot;:&quot;Joe&quot;,        &quot;hidden&quot;:false},<em><span class="marked-invisible-text">[BR]</span></em>
                   {&quot;name&quot;:&quot;James Bond&quot;, &quot;hidden&quot;:true},<em><span class="marked-invisible-text">[BR]</span></em>
                   {&quot;name&quot;:&quot;Julia&quot;,      &quot;hidden&quot;:false}]&gt;</span><em><span class="marked-invisible-text">[BR]</span></em>
@@ -59,9 +67,9 @@ ga('send', 'pageview');
   <span class="marked-ftl-tag">&lt;/#if&gt;</span><em><span class="marked-invisible-text">[BR]</span></em>
 <span class="marked-ftl-tag">&lt;/#list&gt;</span><em><span class="marked-invisible-text">[BR]</span></em>
 &lt;/ul&gt;<em><span class="marked-invisible-text">[BR]</span></em>
-&lt;p&gt;That&#39;s all.</span></pre></div><p>If FreeMarker were to output all <span class="marked-text">text</span> as is, the output would be:</p>
+&lt;p&gt;That&#39;s all.</span></pre><p>If FreeMarker were to output all <span class="marked-text">text</span> as is, the output would be:</p>
 
-<div class="code-wrapper"><pre class="code-block code-output"><span class="marked-text">&lt;p&gt;List of users:<em><span class="marked-invisible-text">[BR]</span></em>
+<pre class="code-block code-output"><span class="marked-text">&lt;p&gt;List of users:<em><span class="marked-invisible-text">[BR]</span></em>
 <em><span class="marked-invisible-text">[BR]</span></em>
 &lt;ul&gt;<em><span class="marked-invisible-text">[BR]</span></em>
 <em><span class="marked-invisible-text">[BR]</span></em>
@@ -76,7 +84,7 @@ ga('send', 'pageview');
   <em><span class="marked-invisible-text">[BR]</span></em>
 <em><span class="marked-invisible-text">[BR]</span></em>
 &lt;/ul&gt;<em><span class="marked-invisible-text">[BR]</span></em>
-&lt;p&gt;That&#39;s all.</span></pre></div><p>You have a lot of unwanted spaces and line breaks here.
+&lt;p&gt;That&#39;s all.</span></pre><p>You have a lot of unwanted spaces and line breaks here.
         Fortunately neither HTML nor XML is typically white-space sensitive,
         but this amount of superfluous white-space can be annoying, and
         needlessly increases the size of produced HTML. Of course, it is even
@@ -184,19 +192,19 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output"><span class="marked-text">&lt;p&gt;List of users:<em><span class="marked-invisible-text">[BR]</span></em>
+<pre class="code-block code-output"><span class="marked-text">&lt;p&gt;List of users:<em><span class="marked-invisible-text">[BR]</span></em>
 &lt;ul&gt;<em><span class="marked-invisible-text">[BR]</span></em>
   &lt;li&gt;</span>Joe<span class="marked-text"><em><span class="marked-invisible-text">[BR]</span></em>
   &lt;li&gt;</span>Julia<span class="marked-text"><em><span class="marked-invisible-text">[BR]</span></em>
 &lt;/ul&gt;<em><span class="marked-invisible-text">[BR]</span></em>
-&lt;p&gt;That&#39;s all.</span></pre></div>
+&lt;p&gt;That&#39;s all.</span></pre>
 
           <p>This is because after stripping the template becomes the
           following; the ignored text is not <span class="marked-text">colored</span>:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template"><span class="marked-text">&lt;p&gt;List of users:<em><span class="marked-invisible-text">[BR]</span></em></span>
+<pre class="code-block code-template"><span class="marked-text">&lt;p&gt;List of users:<em><span class="marked-invisible-text">[BR]</span></em></span>
 <span class="marked-ftl-tag">&lt;#assign users = [{&quot;name&quot;:&quot;Joe&quot;,        &quot;hidden&quot;:false},<em><span class="marked-invisible-text">[BR]</span></em>
                   {&quot;name&quot;:&quot;James Bond&quot;, &quot;hidden&quot;:true},<em><span class="marked-invisible-text">[BR]</span></em>
                   {&quot;name&quot;:&quot;Julia&quot;,      &quot;hidden&quot;:false}]&gt;</span><em><span class="marked-invisible-text">[BR]</span></em>
@@ -207,7 +215,7 @@ ga('send', 'pageview');
   <span class="marked-ftl-tag">&lt;/#if&gt;</span><em><span class="marked-invisible-text">[BR]</span></em>
 <span class="marked-ftl-tag">&lt;/#list&gt;</span><em><span class="marked-invisible-text">[BR]</span></em>
 <span class="marked-text">&lt;/ul&gt;<em><span class="marked-invisible-text">[BR]</span></em>
-&lt;p&gt;That&#39;s all.</span></pre></div>
+&lt;p&gt;That&#39;s all.</span></pre>
 
           <p>White-space stripping can be enabled/disabled in per template
           manner with the <a href="ref_directive_ftl.html#ref.directive.ftl"><code>ftl</code> directive</a>.
@@ -244,7 +252,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template"><strong>&lt;#compress&gt;</strong>
+<pre class="code-block code-template"><strong>&lt;#compress&gt;</strong>
 &lt;#assign users = [{&quot;name&quot;:&quot;Joe&quot;,        &quot;hidden&quot;:false},
                   {&quot;name&quot;:&quot;James Bond&quot;, &quot;hidden&quot;:true},
                   {&quot;name&quot;:&quot;Julia&quot;,      &quot;hidden&quot;:false}]&gt;
@@ -255,16 +263,16 @@ List of users:
   &lt;/#if&gt;
 &lt;/#list&gt;
 That&#39;s all.
-<strong>&lt;/#compress&gt;</strong></pre></div>
+<strong>&lt;/#compress&gt;</strong></pre>
 
           <p>will be:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">List of users:
+<pre class="code-block code-output">List of users:
 - Joe
 - Julia
-That&#39;s all.</pre></div>
+That&#39;s all.</pre>
 
           <p>Note that <code class="inline-code">compress</code> is totally independent
           of white-space stripping. So it is possible that the white-space of
@@ -284,12 +292,12 @@ That&#39;s all.</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">List of users: - Joe - Julia That&#39;s all.</pre></div>
+<pre class="code-block code-output">List of users: - Joe - Julia That&#39;s all.</pre>
         <div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="dgui_misc_autoescaping.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_misc_alternativesyntax.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_quickstart.html b/docs/dgui_quickstart.html
index 03dfd38..0a6dbf1 100644
--- a/docs/dgui_quickstart.html
+++ b/docs/dgui_quickstart.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_quickstart.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Getting Started"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_quickstart_basics.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="dgui_quickstart" itemprop="headline">Getting Started</h1>
@@ -50,7 +58,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_quickstart_basics.html b/docs/dgui_quickstart_basics.html
index bbbc564..6ca9690 100644
--- a/docs/dgui_quickstart_basics.html
+++ b/docs/dgui_quickstart_basics.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_quickstart_basics.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,21 +30,29 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Getting Started","Template + data-model = output"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_quickstart.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_quickstart_datamodel.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_quickstart_basics" itemprop="headline">Template + data-model = output</h1>
 </div></div><p>Let&#39;s assume that you need a HTML page on a website, similar to
         this:</p>
 
-<div class="code-wrapper"><pre class="code-block code-output">&lt;html&gt;
+<pre class="code-block code-output">&lt;html&gt;
 &lt;head&gt;
   &lt;title&gt;Welcome!&lt;/title&gt;
 &lt;/head&gt;
@@ -53,7 +61,7 @@ ga('send', 'pageview');
   &lt;p&gt;Our latest product:
   &lt;a href=&quot;<strong>products/greenmouse.html</strong>&quot;&gt;<strong>green mouse</strong>&lt;/a&gt;!
 &lt;/body&gt;
-&lt;/html&gt;</pre></div><p>But the user&#39;s name (&quot;John Doe&quot; above) depends on who the
+&lt;/html&gt;</pre><p>But the user&#39;s name (&quot;John Doe&quot; above) depends on who the
         logged-in user is, and the latest product information should come from
         a database. Because this data changes, you cannot use static HTML.
         Instead, you can use a <strong>template</strong> of
@@ -61,7 +69,7 @@ ga('send', 'pageview');
         be, except that it contains some instructions to FreeMarker that makes
         it dynamic:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template"><a name="example.first"></a>&lt;html&gt;
+<pre class="code-block code-template"><a name="example.first"></a>&lt;html&gt;
 &lt;head&gt;
   &lt;title&gt;Welcome!&lt;/title&gt;
 &lt;/head&gt;
@@ -70,7 +78,7 @@ ga('send', 'pageview');
   &lt;p&gt;Our latest product:
   &lt;a href=&quot;<strong>${latestProduct.url}</strong>&quot;&gt;<strong>${latestProduct.name}</strong>&lt;/a&gt;!
 &lt;/body&gt;
-&lt;/html&gt;</pre></div><p>The template is stored on the Web server, usually just like the
+&lt;/html&gt;</pre><p>The template is stored on the Web server, usually just like the
         static HTML page would be. But whenever someone visits this page,
         FreeMarker will step in and transform the template on-the-fly to plain
         HTML by replacing the
@@ -100,7 +108,7 @@ ga('send', 'pageview');
         structure (like folders and files on your hard disk), which, in this
         case, could be visualized as:</p>
 
-<div class="code-wrapper"><pre class="code-block code-data-model">(root)
+<pre class="code-block code-data-model">(root)
   |
   +- <strong>user</strong> = &quot;Big Joe&quot;
   |
@@ -108,7 +116,7 @@ ga('send', 'pageview');
       |
       +- <strong>url</strong> = &quot;products/greenmouse.html&quot;
       |
-      +- <strong>name</strong> = &quot;green mouse&quot;</pre></div>  <div class="callout note">
+      +- <strong>name</strong> = &quot;green mouse&quot;</pre>  <div class="callout note">
     <strong class="callout-label">Note:</strong>
 
           <p>The above is just a visualization; the data-model is not in a
@@ -132,7 +140,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_quickstart_datamodel.html b/docs/dgui_quickstart_datamodel.html
index b518b52..49a6951 100644
--- a/docs/dgui_quickstart_datamodel.html
+++ b/docs/dgui_quickstart_datamodel.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_quickstart_datamodel.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,21 +30,29 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Getting Started","The data-model at a glance"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_quickstart_basics.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_quickstart_template.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_quickstart_datamodel" itemprop="headline">The data-model at a glance</h1>
 </div></div><p>As you have seen, the data-model is basically a tree. This tree
         can be arbitrarily complicated and deep, for example:</p>
 
-<div class="code-wrapper"><pre class="code-block code-data-model"><a name="example.qStart.dataModelWithHashes"></a>(root)
+<pre class="code-block code-data-model"><a name="example.qStart.dataModelWithHashes"></a>(root)
   |
   +- animals
   |   |
@@ -70,7 +78,7 @@ ga('send', 'pageview');
   |
   +- misc
       |
-      +- foo = &quot;Something&quot;</pre></div><p>The variables that act like directories (the root,
+      +- foo = &quot;Something&quot;</pre><p>The variables that act like directories (the root,
         <code class="inline-code">animals</code>, <code class="inline-code">mouse</code>,
         <code class="inline-code">elephant</code>, <code class="inline-code">python</code>,
         <code class="inline-code">misc</code>) are called <strong>hashes</strong>. Hashes store other variables (the so
@@ -90,7 +98,7 @@ ga('send', 'pageview');
         list. For example, in this data-model, <code class="inline-code">animals</code> and
         <code class="inline-code">misc.fruits</code> are sequences:</p>
 
-<div class="code-wrapper"><pre class="code-block code-data-model"><a name="example.qStart.dataModelWithSequences"></a>(root)
+<pre class="code-block code-data-model"><a name="example.qStart.dataModelWithSequences"></a>(root)
   |
   +- animals
   |   |
@@ -124,7 +132,7 @@ ga('send', 'pageview');
           |
           +- (1st) = &quot;orange&quot;
           |
-          +- (2nd) = &quot;banana&quot;</pre></div><p>To access a subvariable of a sequence you use a numerical index
+          +- (2nd) = &quot;banana&quot;</pre><p>To access a subvariable of a sequence you use a numerical index
         in square brackets. Indexes start from 0 (it&#39;s a programmer tradition
         to start with 0), thus the index of the 1st item is 0, the index of
         the 2nd item is 1, and so on. So to get the name of the first animal
@@ -192,7 +200,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_quickstart_template.html b/docs/dgui_quickstart_template.html
index 651e9fe..a92bb40 100644
--- a/docs/dgui_quickstart_template.html
+++ b/docs/dgui_quickstart_template.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_quickstart_template.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","Getting Started","The template at a glance"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_quickstart_datamodel.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_datamodel.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_quickstart_template" itemprop="headline">The template at a glance</h1>
@@ -114,7 +122,7 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;html&gt;
+<pre class="code-block code-template">&lt;html&gt;
 &lt;head&gt;
   &lt;title&gt;Welcome!&lt;/title&gt;
 &lt;/head&gt;
@@ -125,7 +133,7 @@ ga('send', 'pageview');
   &lt;p&gt;Our latest product:
   &lt;a href=&quot;${latestProduct.url}&quot;&gt;${latestProduct.name}&lt;/a&gt;!
 &lt;/body&gt;
-&lt;/html&gt;</pre></div>
+&lt;/html&gt;</pre>
 
             <p>Here you have told FreeMarker that the ", our beloved
             leader" should be there only if the value of the variable
@@ -154,9 +162,9 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if animals.python.price == <strong>0</strong>&gt;
+<pre class="code-block code-template">&lt;#if animals.python.price == <strong>0</strong>&gt;
   Pythons are free today!
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
             <p>Similarly as earlier when a string was specified directly,
             here a number is specified directly (<code class="inline-code">0</code>). Note
@@ -170,9 +178,9 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if animals.python.price <strong>!=</strong> 0&gt;
+<pre class="code-block code-template">&lt;#if animals.python.price <strong>!=</strong> 0&gt;
   Pythons are not free today!
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
             <p>As you probably guessed, <code class="inline-code">!=</code> means
             "not equals".</p>
@@ -182,20 +190,20 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if <strong>animals.python.price &lt; animals.elephant.price</strong>&gt;
+<pre class="code-block code-template">&lt;#if <strong>animals.python.price &lt; animals.elephant.price</strong>&gt;
   Pythons are cheaper than elephants today.
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
             <p>With the <code class="inline-code">&lt;#else&gt;</code> tag you can
             specify what to do if the condition is false. For example:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if animals.python.price &lt; animals.elephant.price&gt;
+<pre class="code-block code-template">&lt;#if animals.python.price &lt; animals.elephant.price&gt;
   Pythons are cheaper than elephants today.
 <strong>&lt;#else&gt;</strong>
   Pythons are not cheaper than elephants today.
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
             <p>This prints "Pythons are cheaper than elephants
             today." if the price of python is less than the price of
@@ -205,13 +213,13 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if animals.python.price &lt; animals.elephant.price&gt;
+<pre class="code-block code-template">&lt;#if animals.python.price &lt; animals.elephant.price&gt;
   Pythons are cheaper than elephants today.
 <strong>&lt;#elseif animals.elephant.price &lt; animals.python.price&gt;</strong>
   Elephants are cheaper than pythons today.
 &lt;#else&gt;
   Elephants and pythons cost the same today.
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
             <p>If you have a variable with boolean value (a true/false
             thing) then you can use it directly as the
@@ -220,9 +228,9 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if animals.python.protected&gt;
+<pre class="code-block code-template">&lt;#if animals.python.protected&gt;
   Pythons are protected animals!
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
           
 
           
@@ -241,23 +249,23 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;p&gt;We have these animals:
+<pre class="code-block code-template">&lt;p&gt;We have these animals:
 &lt;table border=1&gt;
   <strong>&lt;#list animals as animal&gt;</strong>
     &lt;tr&gt;&lt;td&gt;${<strong>animal</strong>.name}&lt;td&gt;${<strong>animal</strong>.price} Euros
   <strong>&lt;/#list&gt;</strong>
-&lt;/table&gt;</pre></div>
+&lt;/table&gt;</pre>
 
             <p>then the output will be:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">&lt;p&gt;We have these animals:
+<pre class="code-block code-output">&lt;p&gt;We have these animals:
 &lt;table border=1&gt;
     <strong>&lt;tr&gt;&lt;td&gt;mouse&lt;td&gt;50 Euros
     &lt;tr&gt;&lt;td&gt;elephant&lt;td&gt;5000 Euros
     &lt;tr&gt;&lt;td&gt;python&lt;td&gt;4999 Euros</strong>
-&lt;/table&gt;</pre></div>
+&lt;/table&gt;</pre>
 
             <p>The generic form of the <code class="inline-code">list</code> directive
             is:<code class="inline-code"> &lt;#list <em class="code-color">sequence</em> as
@@ -279,11 +287,11 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;ul&gt;
+<pre class="code-block code-template">&lt;ul&gt;
 <strong>&lt;#list misc.fruits as fruit&gt;</strong>
   &lt;li&gt;${fruit}
 <strong>&lt;/#list&gt;</strong>
-&lt;/ul&gt;</pre></div>
+&lt;/ul&gt;</pre>
 
             <p>The <code class="inline-code">misc.fruits</code> expression should be
             familiar to you; it <a href="dgui_quickstart_datamodel.html#topic.qStart.accessVariables">references a variable in
@@ -297,13 +305,13 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list misc.fruits&gt;
+<pre class="code-block code-template">&lt;#list misc.fruits&gt;
   &lt;ul&gt;
    <strong> &lt;#items as fruit&gt;</strong>
       &lt;li&gt;${fruit}
  <strong>   &lt;/#items&gt;</strong>
   &lt;/ul&gt;
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
             <p>Here, the <code class="inline-code">list</code> directive represents the
             listing as a whole, and only the part inside the
@@ -317,11 +325,11 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;p&gt;Fruits: &lt;#list misc.fruits as fruit&gt;${fruit}<strong>&lt;#sep&gt;, </strong>&lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;p&gt;Fruits: &lt;#list misc.fruits as fruit&gt;${fruit}<strong>&lt;#sep&gt;, </strong>&lt;/#list&gt;</pre>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">&lt;p&gt;Fruits: orange, banana</pre></div>
+<pre class="code-block code-output">&lt;p&gt;Fruits: orange, banana</pre>
 
             <p>The section covered by <code class="inline-code">sep</code> (which we
             could be written like this too:
@@ -338,7 +346,7 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;p&gt;Fruits: &lt;#list misc.fruits as fruit&gt;${fruit}&lt;#sep&gt;, <strong>&lt;#else&gt;None</strong>&lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;p&gt;Fruits: &lt;#list misc.fruits as fruit&gt;${fruit}&lt;#sep&gt;, <strong>&lt;#else&gt;None</strong>&lt;/#list&gt;</pre>
 
               <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -349,7 +357,7 @@ ga('send', 'pageview');
 
               
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;p&gt;Fruits: ${fruits?join(&quot;, &quot;, &quot;None&quot;)}</pre></div>
+<pre class="code-block code-template">&lt;p&gt;Fruits: ${fruits?join(&quot;, &quot;, &quot;None&quot;)}</pre>
               </div>
 
 
@@ -359,7 +367,7 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list misc.fruits&gt;
+<pre class="code-block code-template">&lt;#list misc.fruits&gt;
   &lt;p&gt;Fruits:
   &lt;ul&gt;
     &lt;#items as fruit&gt;
@@ -368,7 +376,7 @@ ga('send', 'pageview');
   &lt;/ul&gt;
 &lt;#else&gt;
   &lt;p&gt;We have no fruits.
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
               <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -397,19 +405,19 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;hr&gt;
+<pre class="code-block code-template">&lt;hr&gt;
 &lt;i&gt;
 Copyright (c) 2000 &lt;a href=&quot;http://www.acmee.com&quot;&gt;Acmee Inc&lt;/a&gt;,
 &lt;br&gt;
 All Rights Reserved.
-&lt;/i&gt;</pre></div>
+&lt;/i&gt;</pre>
 
             <p>Whenever you need that file you simply insert it with the
             <code class="inline-code">include</code> directive:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;html&gt;
+<pre class="code-block code-template">&lt;html&gt;
 &lt;head&gt;
   &lt;title&gt;Test page&lt;/title&gt;
 &lt;/head&gt;
@@ -418,13 +426,13 @@ All Rights Reserved.
   &lt;p&gt;Blah blah...
 <strong>  &lt;#include &quot;/copyright_footer.html&quot;&gt;</strong>
 &lt;/body&gt;
-&lt;/html&gt;</pre></div>
+&lt;/html&gt;</pre>
 
             <p>and the output will be:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">&lt;html&gt;
+<pre class="code-block code-output">&lt;html&gt;
 &lt;head&gt;
   &lt;title&gt;Test page&lt;/title&gt;
 &lt;/head&gt;
@@ -438,7 +446,7 @@ Copyright (c) 2000 &lt;a href=&quot;http://www.acmee.com&quot;&gt;Acmee Inc&lt;/
 All Rights Reserved.
 &lt;/i&gt;</strong>
 &lt;/body&gt;
-&lt;/html&gt;</pre></div>
+&lt;/html&gt;</pre>
 
             <p>If you change the <code class="inline-code">copyright_footer.html</code>,
             then the visitor will see the new copyright notice on all
@@ -467,11 +475,11 @@ All Rights Reserved.
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template"><strong>&lt;#list animals as animal&gt;</strong>
+<pre class="code-block code-template"><strong>&lt;#list animals as animal&gt;</strong>
       &lt;div<strong>&lt;#if animal.protected&gt;</strong><strong> </strong>class=&quot;protected&quot;<strong>&lt;/#if&gt;</strong>&gt;
         ${animal.name} for ${animal.price} Euros
       &lt;/div&gt;
-<strong>&lt;/#list&gt;</strong></pre></div>
+<strong>&lt;/#list&gt;</strong></pre>
 
           <p>Note that since FreeMarker does not interpret text outside FTL
           tags, interpolations and FTL comments, above you could use the FTL
@@ -624,7 +632,7 @@ All Rights Reserved.
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;h1&gt;Welcome ${user<strong>!&quot;visitor&quot;</strong>}!&lt;/h1&gt;</pre></div>
+<pre class="code-block code-template">&lt;h1&gt;Welcome ${user<strong>!&quot;visitor&quot;</strong>}!&lt;/h1&gt;</pre>
 
           <p>You can ask whether a variable isn&#39;t missing by putting
           <code class="inline-code">??</code> after its name. Combining this with the
@@ -634,7 +642,7 @@ All Rights Reserved.
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if <strong>user??</strong>&gt;&lt;h1&gt;Welcome ${user}!&lt;/h1&gt;&lt;/#if&gt;</pre></div>
+<pre class="code-block code-template">&lt;#if <strong>user??</strong>&gt;&lt;h1&gt;Welcome ${user}!&lt;/h1&gt;&lt;/#if&gt;</pre>
 
           <p>Regarding variable accessing with multiple steps, like
           <code class="inline-code">animals.python.price</code>, writing
@@ -683,7 +691,7 @@ All Rights Reserved.
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#ftl output_format=&quot;HTML&quot;&gt;</pre></div>
+<pre class="code-block code-template">&lt;#ftl output_format=&quot;HTML&quot;&gt;</pre>
 
           <p>(Use <code class="inline-code">&quot;XML&quot;</code> instead of
           <code class="inline-code">&quot;HTML&quot;</code> above if you generate XML.)</p>
@@ -708,7 +716,7 @@ All Rights Reserved.
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_template.html b/docs/dgui_template.html
index 8f57dba..6aeb3cd 100644
--- a/docs/dgui_template.html
+++ b/docs/dgui_template.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_template.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","The Template"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_datamodel_types.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_template_overallstructure.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="dgui_template" itemprop="headline">The Template</h1>
@@ -53,7 +61,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_template_directives.html b/docs/dgui_template_directives.html
index 58a14cd..3b8db25 100644
--- a/docs/dgui_template_directives.html
+++ b/docs/dgui_template_directives.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_template_directives.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","The Template","Directives"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_template_overallstructure.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_template_exp.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_template_directives" itemprop="headline">Directives</h1>
@@ -82,26 +90,26 @@ ga('send', 'pageview');
         and outside of the nested content of the <code class="inline-code">list</code>
         directive:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;ul&gt;
+<pre class="code-block code-template">&lt;ul&gt;
 <strong>&lt;#list animals as animal&gt;</strong>
   &lt;li&gt;${animal.name} for ${animal.price} Euros
   <strong>&lt;#if user == &quot;Big Joe&quot;&gt;</strong>
      (except for you)
 <strong>&lt;/#list&gt;</strong> &lt;#-- WRONG! The &quot;if&quot; has to be closed first. --&gt;
 <strong>&lt;/#if&gt;</strong>
-&lt;/ul&gt;</pre></div><p>Note that FreeMarker doesn&#39;t care about the nesting of HTML
+&lt;/ul&gt;</pre><p>Note that FreeMarker doesn&#39;t care about the nesting of HTML
         tags, only about the nesting of FTL tags. It just sees HTML as flat
         text, it doesn&#39;t interpret it in any way.</p><p>If you try to use a non-existing directive (e.g., you mistype
         the directive name), FreeMarker will decline to use the template and
         produce an error message.</p><p>FreeMarker ignores superfluous <a href="gloss.html#gloss.whiteSpace">white-space</a> inside FTL tags. So you
         can write this:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template"><span class="marked-text"><span class="marked-ftl-tag">&lt;#list<em><span class="marked-invisible-text">[BR]</span></em>
+<pre class="code-block code-template"><span class="marked-text"><span class="marked-ftl-tag">&lt;#list<em><span class="marked-invisible-text">[BR]</span></em>
   animals       as<em><span class="marked-invisible-text">[BR]</span></em>
      animal<em><span class="marked-invisible-text">[BR]</span></em>
 &gt;</span><em><span class="marked-invisible-text">[BR]</span></em>
 <span class="marked-interpolation">${animal.name}</span> for <span class="marked-interpolation">${animal.price}</span> Euros<em><span class="marked-invisible-text">[BR]</span></em>
-<span class="marked-ftl-tag">&lt;/#list    &gt;</span></span></pre></div><p>You may not, however, insert white-space between the
+<span class="marked-ftl-tag">&lt;/#list    &gt;</span></span></pre><p>You may not, however, insert white-space between the
         <code class="inline-code">&lt;</code> or <code class="inline-code">&lt;/</code> and the directive
         name.</p><p>The complete list and description of all directives can be found
         in the <a href="ref_directives.html">Template Language Reference/Directive Reference</a> (but I recommend that you look
@@ -129,7 +137,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_template_exp.html b/docs/dgui_template_exp.html
index ee270d9..0fea967 100644
--- a/docs/dgui_template_exp.html
+++ b/docs/dgui_template_exp.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_template_exp.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><li><a href="alphaidx.html">Alpha. index</a></li><li><a href="gloss.html">Glossary</a></li><li><a href="#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 = ["Apache FreeMarker Manual","Template Author\'s Guide","The Template","Expressions"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_template_directives.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_template_valueinsertion.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_template_exp" itemprop="headline">Expressions</h1>
@@ -316,21 +324,21 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;It&#39;s \&quot;quoted\&quot; and
+<pre class="code-block code-template">${&quot;It&#39;s \&quot;quoted\&quot; and
 this is a backslash: \\&quot;}
 
 ${&#39;It\&#39;s &quot;quoted&quot; and
-this is a backslash: \\&#39;}</pre></div>
+this is a backslash: \\&#39;}</pre>
 
             <p>will print:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">It&#39;s &quot;quoted&quot; and
+<pre class="code-block code-output">It&#39;s &quot;quoted&quot; and
 this is a backslash: \
 
 It&#39;s &quot;quoted&quot; and
-this is a backslash: \</pre></div>
+this is a backslash: \</pre>
 
               <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -535,15 +543,15 @@ this is a backslash: \</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">${r&quot;${foo}&quot;}
-${r&quot;C:\foo\bar&quot;}</pre></div>
+<pre class="code-block code-template">${r&quot;${foo}&quot;}
+${r&quot;C:\foo\bar&quot;}</pre>
 
             <p>will print:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">${foo}
-C:\foo\bar</pre></div>
+<pre class="code-block code-output">${foo}
+C:\foo\bar</pre>
           
 
           
@@ -616,18 +624,18 @@ C:\foo\bar</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list <strong>[&quot;foo&quot;, &quot;bar&quot;, &quot;baz&quot;]</strong> as x&gt;
+<pre class="code-block code-template">&lt;#list <strong>[&quot;foo&quot;, &quot;bar&quot;, &quot;baz&quot;]</strong> as x&gt;
 ${x}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
             <p>will print:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">foo
+<pre class="code-block code-output">foo
 bar
 baz
- </pre></div>
+ </pre>
 
             <p>The items in the list are expressions, so you can do this
             for example: <code class="inline-code">[2 + 2, [1, 2, 3, 4], &quot;foo&quot;]</code>. Here
@@ -826,7 +834,7 @@ baz
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">${user}</pre></div>
+<pre class="code-block code-template">${user}</pre>
 
             <p>If there is no such top-level variable, then an error will
             result when FreeMarker tries to evaluate the expression, and it
@@ -868,7 +876,7 @@ baz
 
             
 
-<div class="code-wrapper"><pre class="code-block code-data-model">(root)
+<pre class="code-block code-data-model">(root)
  |
  +- book
  |   |
@@ -880,7 +888,7 @@ baz
  |       |
  |       +- info = &quot;Biologist, 1923-1985, Canada&quot;
  |
- +- test = &quot;title&quot;</pre></div>
+ +- test = &quot;title&quot;</pre>
 
             <p>Now we can read the <code class="inline-code">title</code> with
             <code class="inline-code">book.title</code>, since the book expression will
@@ -1013,14 +1021,14 @@ baz
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign s = &quot;Hello ${user}!&quot;&gt;
-${s} &lt;#-- Just to see what the value of s is --&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign s = &quot;Hello ${user}!&quot;&gt;
+${s} &lt;#-- Just to see what the value of s is --&gt;</pre>
 
             <p>This will print:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">Hello Big Joe!</pre></div>
+<pre class="code-block code-output">Hello Big Joe!</pre>
 
               <div class="callout warning">
     <strong class="callout-label">Warning!</strong>
@@ -1048,7 +1056,7 @@ ${s} &lt;#-- Just to see what the value of s is --&gt;</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign s = &quot;Hello &quot; + user + &quot;!&quot;&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign s = &quot;Hello &quot; + user + &quot;!&quot;&gt;</pre>
 
             <p>This gives the same result as the earlier example with the
             <code class="inline-code">${<em class="code-color">...</em>}</code>.</p>
@@ -1117,16 +1125,16 @@ ${s} &lt;#-- Just to see what the value of s is --&gt;</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">${user[0]}
-${user[4]}</pre></div>
+<pre class="code-block code-template">${user[0]}
+${user[4]}</pre>
 
             <p>will print (note that the index of the first character is
             0):</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">B
-J</pre></div>
+<pre class="code-block code-output">B
+J</pre>
           
 
           
@@ -1182,22 +1190,22 @@ J</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign s = &quot;ABCDEF&quot;&gt;
+<pre class="code-block code-template">&lt;#assign s = &quot;ABCDEF&quot;&gt;
 ${s[2..3]}
 ${s[2..&lt;4]}
 ${s[2..*3]}
 ${s[2..*100]}
-${s[2..]}</pre></div>
+${s[2..]}</pre>
 
             <p>will print:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">CD
+<pre class="code-block code-output">CD
 CD
 CDE
 CDEF
-CDEF</pre></div>
+CDEF</pre>
 
               <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -1243,19 +1251,19 @@ CDEF</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&quot;Joe&quot;, &quot;Fred&quot;] + [&quot;Julia&quot;, &quot;Kate&quot;] as user&gt;
+<pre class="code-block code-template">&lt;#list [&quot;Joe&quot;, &quot;Fred&quot;] + [&quot;Julia&quot;, &quot;Kate&quot;] as user&gt;
 - ${user}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
             <p>will print:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">- Joe
+<pre class="code-block code-output">- Joe
 - Fred
 - Julia
 - Kate
- </pre></div>
+ </pre>
 
             <p>Note that sequence concatenation is not to be used for many
             repeated concatenations, like for appending items to a sequence
@@ -1294,14 +1302,14 @@ CDEF</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign seq = [&quot;A&quot;, &quot;B&quot;, &quot;C&quot;, &quot;D&quot;, &quot;E&quot;]&gt;
-&lt;#list seq[1..3] as i&gt;${i}&lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign seq = [&quot;A&quot;, &quot;B&quot;, &quot;C&quot;, &quot;D&quot;, &quot;E&quot;]&gt;
+&lt;#list seq[1..3] as i&gt;${i}&lt;/#list&gt;</pre>
 
             <p>will print</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">BCD </pre></div>
+<pre class="code-block code-output">BCD </pre>
 
             <p>Furthermore, the items in the slice will be in the same
             order as in the range. Thus for example the above example with the
@@ -1328,7 +1336,7 @@ CDEF</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign seq = [&quot;A&quot;, &quot;B&quot;, &quot;C&quot;]&gt;
+<pre class="code-block code-template">&lt;#assign seq = [&quot;A&quot;, &quot;B&quot;, &quot;C&quot;]&gt;
 
 Slicing with length limited ranges:
 - &lt;#list seq[0..*2] as i&gt;${i}&lt;/#list&gt;
@@ -1340,13 +1348,13 @@ Slicing with right-unlimited ranges:
 - &lt;#list seq[0..] as i&gt;${i}&lt;/#list&gt;
 - &lt;#list seq[1..] as i&gt;${i}&lt;/#list&gt;
 - &lt;#list seq[2..] as i&gt;${i}&lt;/#list&gt;
-- &lt;#list seq[3..] as i&gt;${i}&lt;/#list&gt;</pre></div>
+- &lt;#list seq[3..] as i&gt;${i}&lt;/#list&gt;</pre>
 
             <p>This will print:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">Slicing with length limited ranges:
+<pre class="code-block code-output">Slicing with length limited ranges:
 - AB
 - BC
 - C
@@ -1356,7 +1364,7 @@ Slicing with right-unlimited ranges:
 - ABC
 - BC
 - C
--</pre></div>
+-</pre>
 
             <p>Note above that slicing with length limited and right
             unbounded ranges allow the starting index to be past the last item
@@ -1404,18 +1412,18 @@ Slicing with right-unlimited ranges:
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign ages = {&quot;Joe&quot;:23, &quot;Fred&quot;:25} + {&quot;Joe&quot;:30, &quot;Julia&quot;:18}&gt;
+<pre class="code-block code-template">&lt;#assign ages = {&quot;Joe&quot;:23, &quot;Fred&quot;:25} + {&quot;Joe&quot;:30, &quot;Julia&quot;:18}&gt;
 - Joe is ${ages.Joe}
 - Fred is ${ages.Fred}
-- Julia is ${ages.Julia}</pre></div>
+- Julia is ${ages.Julia}</pre>
 
             <p>will print:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">- Joe is 30
+<pre class="code-block code-output">- Joe is 30
 - Fred is 25
-- Julia is 18</pre></div>
+- Julia is 18</pre>
 
             <p>Note that hash concatenation is not to be used for many
             repeated concatenations, like for adding items to a hash inside a
@@ -1475,17 +1483,17 @@ Slicing with right-unlimited ranges:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${100 - x * x}
+<pre class="code-block code-template">${100 - x * x}
 ${x / 2}
-${12 % 10}</pre></div>
+${12 % 10}</pre>
 
           <p>Assuming that <code class="inline-code">x</code> is 5, it will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">75
+<pre class="code-block code-output">75
 2.5
-2</pre></div>
+2</pre>
 
           <p>Both operands must be expressions which evaluate to a
           numerical value. So the example below will cause an error when
@@ -1494,7 +1502,7 @@ ${12 % 10}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${3 * &quot;5&quot;} &lt;#-- WRONG! --&gt;</pre></div>
+<pre class="code-block code-template">${3 * &quot;5&quot;} &lt;#-- WRONG! --&gt;</pre>
 
           <p>There is an exception to the above rule. The
           <code class="inline-code">+</code> operator, is used to <a href="#dgui_template_exp_stringop_interpolation">concatenate
@@ -1507,11 +1515,11 @@ ${12 % 10}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${3 + &quot;5&quot;}</pre></div>
+<pre class="code-block code-template">${3 + &quot;5&quot;}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">35</pre></div>
+<pre class="code-block code-output">35</pre>
 
           <p>Generally, FreeMarker never converts a string to a number
           automatically, but it may convert a number to a string
@@ -1523,21 +1531,21 @@ ${12 % 10}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${(x/2)?int}
+<pre class="code-block code-template">${(x/2)?int}
 ${1.1?int}
 ${1.999?int}
 ${-1.1?int}
-${-1.999?int}</pre></div>
+${-1.999?int}</pre>
 
           <p>Assuming that <code class="inline-code">x</code> is 5, it will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">2
+<pre class="code-block code-output">2
 1
 1
 -1
--1</pre></div>
+-1</pre>
 
           <p>Due to historical reasons, the <code class="inline-code">%</code> operator
           works by first truncating the operands to an integer number, and
@@ -1545,12 +1553,12 @@ ${-1.999?int}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${12 % 5}   &lt;#-- Prints 2 --&gt;
+<pre class="code-block code-template">${12 % 5}   &lt;#-- Prints 2 --&gt;
 ${12.9 % 5} &lt;#-- Prints 2 --&gt;
 ${12.1 % 5} &lt;#-- Prints 2 --&gt;
 
 ${12 % 6}   &lt;#-- Prints 0 --&gt;
-${12 % 6.9} &lt;#-- Prints 0 --&gt;</pre></div>
+${12 % 6.9} &lt;#-- Prints 0 --&gt;</pre>
 
           <p>The sign of the result of <code class="inline-code">%</code> is the same as
           the sign of the left hand operand, and its absolute value is the
@@ -1558,9 +1566,9 @@ ${12 % 6.9} &lt;#-- Prints 0 --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${-12 % -5} &lt;#-- Prints -2 --&gt;
+<pre class="code-block code-template">${-12 % -5} &lt;#-- Prints -2 --&gt;
 ${-12 % 5} &lt;#-- Prints -2 --&gt;
-${12 % -5} &lt;#-- Prints 2 --&gt;</pre></div>
+${12 % -5} &lt;#-- Prints 2 --&gt;</pre>
 
           <p class="programmers-note">About the precision of the operations:
           By default FreeMarker uses <code class="inline-code">BigDecimal</code>-s for all
@@ -1608,12 +1616,12 @@ ${12 % -5} &lt;#-- Prints 2 --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if <strong>user == &quot;Big Joe&quot;</strong>&gt;
+<pre class="code-block code-template">&lt;#if <strong>user == &quot;Big Joe&quot;</strong>&gt;
   It is Big Joe
 &lt;/#if&gt;
 &lt;#if <strong>user != &quot;Big Joe&quot;</strong>&gt;
   It is not Big Joe
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
           <p>The <code class="inline-code">user == &quot;Big Joe&quot;</code> expression in the
           <code class="inline-code">&lt;#if ...&gt;</code> will evaluate to the boolean
@@ -1638,9 +1646,9 @@ ${12 % -5} &lt;#-- Prints 2 --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if x <strong>&lt;=</strong> 12&gt;
+<pre class="code-block code-template">&lt;#if x <strong>&lt;=</strong> 12&gt;
   x is less or equivalent with 12
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
           <p>There&#39;s a problem with <code class="inline-code">&gt;=</code> and
           <code class="inline-code">&gt;</code>. FreeMarker interprets the
@@ -1718,12 +1726,12 @@ ${12 % -5} &lt;#-- Prints 2 --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if x &lt; 12 <strong>&amp;&amp;</strong> color == &quot;green&quot;&gt;
+<pre class="code-block code-template">&lt;#if x &lt; 12 <strong>&amp;&amp;</strong> color == &quot;green&quot;&gt;
   We have less than 12 things, and they are green.
 &lt;/#if&gt;
 &lt;#if <strong>!</strong>hot&gt; &lt;#-- here hot must be a boolean --&gt;
   It&#39;s not hot.
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
           <p>FreeMarker supports some more syntactical alternatives:</p>
 
@@ -1804,12 +1812,12 @@ ${12 % -5} &lt;#-- Prints 2 --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${testString?upper_case}
+<pre class="code-block code-template">${testString?upper_case}
 ${testString?html}
 ${testString?upper_case?html}
 
 ${testSequence?size}
-${testSequence?join(&quot;, &quot;)}</pre></div>
+${testSequence?join(&quot;, &quot;)}</pre>
 
           <p>Assuming that <code class="inline-code">testString</code> stores the string
           "Tom &amp; Jerry", and testSequnce stores the strings
@@ -1818,12 +1826,12 @@ ${testSequence?join(&quot;, &quot;)}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">TOM &amp; JERRY
+<pre class="code-block code-output">TOM &amp; JERRY
 Tom &amp;amp; Jerry
 TOM &amp;amp; JERRY
 
 3
-foo, bar, baz</pre></div>
+foo, bar, baz</pre>
 
           <p>Note the <code class="inline-code">test?upper_case?html</code> above. Since
           the result of <code class="inline-code">test?upper_case</code> is a string, you
@@ -1834,15 +1842,15 @@ foo, bar, baz</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${testSeqence[1]?cap_first}
+<pre class="code-block code-template">${testSeqence[1]?cap_first}
 ${&quot;horse&quot;?cap_first}
-${(testString + &quot; &amp; Duck&quot;)?html}</pre></div>
+${(testString + &quot; &amp; Duck&quot;)?html}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Bar
+<pre class="code-block code-output">Bar
 Horse
-Tom &amp;amp; Jerry &amp;amp; Duck</pre></div>
+Tom &amp;amp; Jerry &amp;amp; Duck</pre>
         
           
 
@@ -1870,13 +1878,13 @@ Tom &amp;amp; Jerry &amp;amp; Duck</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${repeat(&quot;Foo&quot;, 3)}</pre></div>
+<pre class="code-block code-template">${repeat(&quot;Foo&quot;, 3)}</pre>
 
           <p>will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">FooFooFoo</pre></div>
+<pre class="code-block code-output">FooFooFoo</pre>
 
           <p>Here <code class="inline-code">repeat</code> was evaluated to the method
           variable (according to how you <a href="#dgui_template_exp_var_toplevel">access top-level
@@ -1888,13 +1896,13 @@ Tom &amp;amp; Jerry &amp;amp; Duck</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${repeat(repeat(&quot;x&quot;, 2), 3) + repeat(&quot;Foo&quot;, 4)?upper_case}</pre></div>
+<pre class="code-block code-template">${repeat(repeat(&quot;x&quot;, 2), 3) + repeat(&quot;Foo&quot;, 4)?upper_case}</pre>
 
           <p>will print this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">xxxxxxFOOFOOFOOFOO</pre></div>
+<pre class="code-block code-output">xxxxxxFOOFOOFOOFOO</pre>
         
           
 
@@ -1982,16 +1990,16 @@ Tom &amp;amp; Jerry &amp;amp; Duck</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">${mouse!&quot;No mouse.&quot;}
+<pre class="code-block code-template">${mouse!&quot;No mouse.&quot;}
 &lt;#assign mouse=&quot;Jerry&quot;&gt;
-${mouse!&quot;No mouse.&quot;}</pre></div>
+${mouse!&quot;No mouse.&quot;}</pre>
 
             <p>The output will be:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">No mouse.
-Jerry</pre></div>
+<pre class="code-block code-output">No mouse.
+Jerry</pre>
 
             <p>The default value can be any kind of expression, so it
             doesn&#39;t have to be a string. For example you can write
@@ -2030,16 +2038,16 @@ Jerry</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">(${mouse!})
+<pre class="code-block code-template">(${mouse!})
 &lt;#assign mouse = &quot;Jerry&quot;&gt;
-(${mouse!})</pre></div>
+(${mouse!})</pre>
 
             <p>The output will be:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">()
-(Jerry)</pre></div>
+<pre class="code-block code-output">()
+(Jerry)</pre>
 
               <div class="callout warning">
     <strong class="callout-label">Warning!</strong>
@@ -2060,7 +2068,7 @@ Jerry</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">product.color!&quot;red&quot;</pre></div>
+<pre class="code-block code-template">product.color!&quot;red&quot;</pre>
 
             <p>This will handle if <code class="inline-code">color</code> is missing
             inside <code class="inline-code">product</code> (and returns
@@ -2071,7 +2079,7 @@ Jerry</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">(product.color)!&quot;red&quot;</pre></div>
+<pre class="code-block code-template">(product.color)!&quot;red&quot;</pre>
 
             <p>This will handle if <code class="inline-code">product.color</code> is
             missing. That is, if <code class="inline-code">product</code> is missing, or
@@ -2089,20 +2097,20 @@ Jerry</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign seq = [&#39;a&#39;, &#39;b&#39;]&gt;
+<pre class="code-block code-template">&lt;#assign seq = [&#39;a&#39;, &#39;b&#39;]&gt;
 ${seq[0]!&#39;-&#39;}
 ${seq[1]!&#39;-&#39;}
 ${seq[2]!&#39;-&#39;}
-${seq[3]!&#39;-&#39;}</pre></div>
+${seq[3]!&#39;-&#39;}</pre>
 
             <p>the outpur will be:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">a
+<pre class="code-block code-output">a
 b
 -
--</pre></div>
+-</pre>
 
             <p>A negative sequence index (as
             <code class="inline-code">seq[-1]!&#39;-&#39;</code>) will always cause an error, you
@@ -2142,7 +2150,7 @@ b
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if mouse??&gt;
+<pre class="code-block code-template">&lt;#if mouse??&gt;
   Mouse found
 &lt;#else&gt;
   No mouse found
@@ -2153,15 +2161,15 @@ Creating mouse...
   Mouse found
 &lt;#else&gt;
   No mouse found
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
             <p>The output will be:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">  No mouse found
+<pre class="code-block code-output">  No mouse found
 Creating mouse...
-  Mouse found</pre></div>
+  Mouse found</pre>
 
             <p>With non-top-level variables the rules are the same as with
             the default value operator, that is, you can write
@@ -2268,7 +2276,7 @@ Creating mouse...
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">                               &lt;#-- Output will be: --&gt;
+<pre class="code-block code-template">                               &lt;#-- Output will be: --&gt;
 ${3 * 2 + 2}                   &lt;#-- 8 --&gt;
 ${3 * (2 + 2)}                 &lt;#-- 12 --&gt;
 ${3 * ((2 + 2) * (1 / 2))}     &lt;#-- 6 --&gt;
@@ -2276,7 +2284,7 @@ ${&quot;green &quot; + &quot;mouse&quot;?upper_case}    &lt;#-- green MOUSE --&g
 ${(&quot;green &quot; + &quot;mouse&quot;)?upper_case}  &lt;#-- GREEN MOUSE --&gt;
 &lt;#if !(color == &quot;red&quot; || color == &quot;green&quot;)&gt;
   The color is nor red nor green
-&lt;/#if&gt;</pre></div>
+&lt;/#if&gt;</pre>
 
           <p>Note that the parentheses of a <a href="#dgui_template_exp_methodcall">method call
           expressions</a> have nothing to do with the parentheses used for
@@ -2294,23 +2302,23 @@ ${(&quot;green &quot; + &quot;mouse&quot;)?upper_case}  &lt;#-- GREEN MOUSE --&g
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${x + &quot;:&quot; + book.title?upper_case}</pre></div>
+<pre class="code-block code-template">${x + &quot;:&quot; + book.title?upper_case}</pre>
 
           <p>and</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${x+&quot;:&quot;+book.title?upper_case}</pre></div>
+<pre class="code-block code-template">${x+&quot;:&quot;+book.title?upper_case}</pre>
 
           <p>and</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${
+<pre class="code-block code-template">${
    x
  + &quot;:&quot;   +  book   .   title
    ?   upper_case
-      }</pre></div>
+      }</pre>
         
           
 
@@ -2328,7 +2336,7 @@ ${(&quot;green &quot; + &quot;mouse&quot;)?upper_case}  &lt;#-- GREEN MOUSE --&g
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x &lt;#-- A comment --&gt; = 123 &lt;#-- A comment --&gt;&gt;
+<pre class="code-block code-template">&lt;#assign x &lt;#-- A comment --&gt; = 123 &lt;#-- A comment --&gt;&gt;
 &lt;#function f(x &lt;#-- A comment --&gt;, y &lt;#-- A comment --&gt;)&gt;
   &lt;#return &lt;#-- A comment --&gt; 1 &lt;#-- A comment --&gt;&gt;
 &lt;/#function&gt;
@@ -2337,7 +2345,7 @@ ${(&quot;green &quot; + &quot;mouse&quot;)?upper_case}  &lt;#-- GREEN MOUSE --&g
     &quot;bar&quot;: x &lt;#-- A comment --&gt; + 1,
     &lt;#-- A comment --&gt;
     &quot;baaz&quot;: f(1 &lt;#-- A comment --&gt;, 2 &lt;#-- A comment --&gt;)
-} &lt;#-- A comment --&gt;&gt;</pre></div>
+} &lt;#-- A comment --&gt;&gt;</pre>
         
           
 
@@ -2498,7 +2506,7 @@ ${(&quot;green &quot; + &quot;mouse&quot;)?upper_case}  &lt;#-- GREEN MOUSE --&g
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_template_overallstructure.html b/docs/dgui_template_overallstructure.html
index 199d058..a4535a7 100644
--- a/docs/dgui_template_overallstructure.html
+++ b/docs/dgui_template_overallstructure.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_template_overallstructure.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","The Template","Overall structure"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_template.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_template_directives.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_template_overallstructure" itemprop="headline">Overall structure</h1>
@@ -77,7 +85,7 @@ ga('send', 'pageview');
         <span class="marked-interpolation">interpolation</span>, <span class="marked-ftl-tag">FTL tag</span>, <span class="marked-comment">comment</span>. With the <em><span class="marked-invisible-text">[BR]</span></em>-s I intend to visualize the
         <a href="gloss.html#gloss.lineBreak">line breaks</a>.</p>
 
-<div class="code-wrapper"><pre class="code-block code-template"><span class="marked-text">&lt;html&gt;<em><span class="marked-invisible-text">[BR]</span></em>
+<pre class="code-block code-template"><span class="marked-text">&lt;html&gt;<em><span class="marked-invisible-text">[BR]</span></em>
 &lt;head&gt;<em><span class="marked-invisible-text">[BR]</span></em>
   &lt;title&gt;Welcome!&lt;/title&gt;<em><span class="marked-invisible-text">[BR]</span></em>
 &lt;/head&gt;<em><span class="marked-invisible-text">[BR]</span></em>
@@ -91,7 +99,7 @@ ga('send', 'pageview');
   <span class="marked-ftl-tag">&lt;/#list&gt;</span><em><span class="marked-invisible-text">[BR]</span></em>
   &lt;/ul&gt;<em><span class="marked-invisible-text">[BR]</span></em>
 &lt;/body&gt;<em><span class="marked-invisible-text">[BR]</span></em>
-&lt;/html&gt;</span></pre></div><p>FTL distinguishes upper case and lower case letters. So
+&lt;/html&gt;</span></pre><p>FTL distinguishes upper case and lower case letters. So
         <code class="inline-code">list</code> is good directive name, while
         <code class="inline-code">List</code> is not. Similarly <code class="inline-code">${name}</code>
         is not the same as <code class="inline-code">${Name}</code> or
@@ -106,11 +114,11 @@ ga('send', 'pageview');
         inside <span class="marked-ftl-tag">FTL tags</span> and <span class="marked-interpolation">interpolations</span>. For
         example:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template"><span class="marked-text">&lt;h1&gt;Welcome <span class="marked-interpolation">${user <span class="marked-comment">&lt;#-- The name of user --&gt;</span>}</span>!&lt;/h1&gt;<em><span class="marked-invisible-text">[BR]</span></em>
+<pre class="code-block code-template"><span class="marked-text">&lt;h1&gt;Welcome <span class="marked-interpolation">${user <span class="marked-comment">&lt;#-- The name of user --&gt;</span>}</span>!&lt;/h1&gt;<em><span class="marked-invisible-text">[BR]</span></em>
 &lt;p&gt;We have these animals:<em><span class="marked-invisible-text">[BR]</span></em>
 &lt;ul&gt;<em><span class="marked-invisible-text">[BR]</span></em>
 <span class="marked-ftl-tag">&lt;#list <span class="marked-comment">&lt;#-- some comment... --&gt;</span> animals as <span class="marked-comment">&lt;#-- again... --&gt;</span> animal&gt;</span><em><span class="marked-invisible-text">[BR]</span></em></span>
-<em>...</em></pre></div>  <div class="callout note">
+<em>...</em></pre>  <div class="callout note">
     <strong class="callout-label">Note:</strong>
 
           <p>For those of you who have tried the above examples: You may
@@ -124,7 +132,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/dgui_template_valueinsertion.html b/docs/dgui_template_valueinsertion.html
index 07d40c9..da24f9c 100644
--- a/docs/dgui_template_valueinsertion.html
+++ b/docs/dgui_template_valueinsertion.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/dgui_template_valueinsertion.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="dgui.html"><span itemprop="name">Template Author&#39;s Guide</span></a></li [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Author\'s Guide","The Template","Interpolations"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_template_exp.html"><span>Previous</span></a><a class="paging-arrow next" href="dgui_misc.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="dgui_template_valueinsertion" itemprop="headline">Interpolations</h1>
@@ -139,21 +147,21 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${1.5}</pre></div>
+<pre class="code-block code-template">${1.5}</pre>
 
           <p>will print something like this if the current locale is
           English:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">1.5</pre></div>
+<pre class="code-block code-output">1.5</pre>
 
           <p>but if the current locale is German then it will print
           something like:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">1,5</pre></div>
+<pre class="code-block code-output">1,5</pre>
 
           <p>since German people use comma as decimal separator.</p>
 
@@ -173,7 +181,7 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;a href=&quot;/shop/productdetails?id=${product.id?c}&quot;&gt;Details...&lt;/a&gt;</pre></div>
+<pre class="code-block code-template">&lt;a href=&quot;/shop/productdetails?id=${product.id?c}&quot;&gt;Details...&lt;/a&gt;</pre>
             </div>
 
         
@@ -313,7 +321,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/docgen-resources/docgen.min.css b/docs/docgen-resources/docgen.min.css
index f2b9c58..244f329 100644
--- a/docs/docgen-resources/docgen.min.css
+++ b/docs/docgen-resources/docgen.min.css
@@ -1 +1 @@
-@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?-fbty7i);src:url(fonts/icomoon.eot?#iefix-fbty7i) format('embedded-opentype'),url(fonts/icomoon.woff?-fbty7i) format('woff'),url(fonts/icomoon.ttf?-fbty7i) format('truetype'),url(fonts/icomoon.svg?-fbty7i#icomoon) format('svg');font-weight:400;font-style:normal}html{font-family:Roboto,"Helvetica Neue",Arial,sans-serif;font-size:14px;color:#333;line-height:1.5;font-weight:400;background-color:#fff;-webkit-text-size-adjust:100%;-moz- [...]
\ No newline at end of file
+@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?2ctla8);src:url(fonts/icomoon.eot?2ctla8#iefix) format('embedded-opentype'),url(fonts/icomoon.ttf?2ctla8) format('truetype'),url(fonts/icomoon.woff?2ctla8) format('woff'),url(fonts/icomoon.svg?2ctla8#icomoon) format('svg');font-weight:400;font-style:normal;font-display:block}html{font-family:Roboto,"Helvetica Neue",Arial,sans-serif;font-size:14px;color:#333;line-height:1.5;font-weight:400;background-color:#fff;-webkit-text-size-adj [...]
\ No newline at end of file
diff --git a/docs/docgen-resources/fonts/icomoon.eot b/docs/docgen-resources/fonts/icomoon.eot
index 6d5cc05..4bcb54b 100644
Binary files a/docs/docgen-resources/fonts/icomoon.eot and b/docs/docgen-resources/fonts/icomoon.eot differ
diff --git a/docs/docgen-resources/fonts/icomoon.svg b/docs/docgen-resources/fonts/icomoon.svg
index 0c1e073..8a91463 100644
--- a/docs/docgen-resources/fonts/icomoon.svg
+++ b/docs/docgen-resources/fonts/icomoon.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" standalone="no"?>
-<!-- See NOTICE file for copyright information! -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>Generated by IcoMoon</metadata>
@@ -7,23 +6,24 @@
 <font id="icomoon" horiz-adv-x="1024">
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" d="" horiz-adv-x="512" />
-<glyph unicode="&#xe600;" d="M810.667 384h-256v-256h-85.333v256h-256v85.333h256v256h85.333v-256h256v-85.333z" />
-<glyph unicode="&#xe601;" d="M810.667 384h-597.333v85.333h597.333v-85.333z" />
-<glyph unicode="&#xe602;" d="M399.36 460.8c0-62.208 50.483-112.64 112.691-112.64s112.589 50.483 112.589 112.64c0 62.208-50.381 112.589-112.589 112.589s-112.691-50.381-112.691-112.589z" />
-<glyph unicode="&#xe604;" d="M998.963 52.224l-456.038 851.558c-6.349 11.008-18.125 17.818-30.925 17.818-12.851 0-24.627-6.81-30.925-17.818l-455.987-851.558c-6.195-10.803-6.093-24.115 0.256-34.816 6.4-10.803 18.022-17.408 30.618-17.408h912.077c12.544 0 24.269 6.605 30.618 17.408 6.349 10.701 6.451 24.013 0.307 34.816zM563.2 102.4h-102.4v102.4h102.4v-102.4zM563.2 281.6h-102.4v332.8h102.4v-332.8z" />
-<glyph unicode="&#xe605;" d="M636.518 972.8c68.608 0 102.912-46.694 102.912-100.198 0-66.816-59.597-128.614-137.165-128.614-64.973 0-102.861 38.4-101.069 101.888 0 53.402 45.107 126.925 135.322 126.925zM425.421-51.2c-54.17 0-93.85 33.382-55.962 180.429l62.157 260.71c10.803 41.677 12.595 58.419 0 58.419-16.23 0-86.477-28.774-128.102-57.19l-27.034 45.056c131.686 111.923 283.187 177.51 348.211 177.51 54.118 0 63.13-65.178 36.096-165.376l-71.219-274.022c-12.595-48.384-7.219-65.075 5.427-65.0 [...]
-<glyph unicode="&#xe606;" d="M768 614.4h-153.6v307.2h-204.8v-307.2h-153.6l256-256 256 256zM990.106 279.962c-10.752 11.469-82.483 88.218-102.963 108.237-13.568 13.261-32.973 21.402-53.35 21.402h-89.958l156.877-153.293h-181.453c-5.222 0-9.933-2.662-12.288-6.81l-41.779-95.898h-306.381l-41.779 95.898c-2.355 4.147-7.117 6.81-12.288 6.81h-181.453l156.826 153.293h-89.907c-20.326 0-39.731-8.141-53.35-21.402-20.48-20.070-92.211-96.819-102.963-108.237-25.037-26.675-38.81-47.923-32.256-74.189l28.72 [...]
-<glyph unicode="&#xe607;" d="M768 972.8h-204.8c-28.314 0-51.2-22.886-51.2-51.2l1.178-11.366c56.422 0 102.4-45.926 102.4-102.4v-581.581l50.022 60.467 153.6-184.32v819.2c0 28.314-22.886 51.2-51.2 51.2zM461.978 819.2h-205.978c-28.314 0-51.2-22.886-51.2-51.2v-819.2l153.6 184.32 153.6-184.32v819.2c0 28.314-21.709 51.2-50.022 51.2z" />
-<glyph unicode="&#xe608;" d="M512 906.24l122.266-344.166h328.294l-267.878-202.138 95.795-354.714-278.477 212.685-278.426-212.685 95.744 354.714-267.93 202.138h328.294l122.317 344.166z" />
-<glyph unicode="&#xe609;" d="M880.128 760.013c-85.606 78.592-224.41 78.592-310.016 0l-58.112-53.299-58.163 53.299c-85.606 78.592-224.358 78.592-309.965 0-96.307-88.371-96.307-231.373 0-319.744l368.128-337.869 368.128 337.869c96.256 88.371 96.256 231.424 0 319.744zM825.549 492.8l-313.549-292.608-313.6 292.608c-31.59 29.030-43.827 66.918-43.827 107.213s7.066 73.37 38.707 102.349c27.904 25.651 65.434 39.782 105.626 39.782 40.141 0 77.67-24.371 105.574-50.074l107.52-93.44 107.469 93.491c27.9 [...]
-<glyph unicode="&#xe60a;" d="M737.28 512h-296.96c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2h296.96c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2zM839.68 256h-399.36c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2h399.36c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2zM440.32 665.6h399.36c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2h-399.36c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2zM276.48 512h-92.16c-28.262 0-30.72-22.886-30 [...]
-<glyph unicode="&#xf002;" d="M658.286 475.428q0 105.714-75.143 180.857t-180.857 75.143-180.857-75.143-75.143-180.857 75.143-180.857 180.857-75.143 180.857 75.143 75.143 180.857zM950.857 0q0-29.714-21.714-51.429t-51.429-21.714q-30.857 0-51.429 21.714l-196 195.429q-102.286-70.857-228-70.857-81.714 0-156.286 31.714t-128.571 85.714-85.714 128.571-31.714 156.286 31.714 156.286 85.714 128.571 128.571 85.714 156.286 31.714 156.286-31.714 128.571-85.714 85.714-128.571 31.714-156.286q0-125.714-70 [...]
-<glyph unicode="&#xf099;" d="M925.714 717.714q-38.286-56-92.571-95.429 0.571-8 0.571-24 0-74.286-21.714-148.286t-66-142-105.429-120.286-147.429-83.429-184.571-31.143q-154.857 0-283.429 82.857 20-2.286 44.571-2.286 128.571 0 229.143 78.857-60 1.143-107.429 36.857t-65.143 91.143q18.857-2.857 34.857-2.857 24.571 0 48.571 6.286-64 13.143-106 63.714t-42 117.429v2.286q38.857-21.714 83.429-23.429-37.714 25.143-60 65.714t-22.286 88q0 50.286 25.143 93.143 69.143-85.143 168.286-136.286t212.286-56. [...]
-<glyph unicode="&#xf09b;" d="M877.714 438.857q0-143.429-83.714-258t-216.286-158.571q-15.429-2.857-22.571 4t-7.143 17.143v120.571q0 55.429-29.714 81.143 32.571 3.429 58.571 10.286t53.714 22.286 46.286 38 30.286 60 11.714 86q0 69.143-45.143 117.714 21.143 52-4.571 116.571-16 5.143-46.286-6.286t-52.571-25.143l-21.714-13.714q-53.143 14.857-109.714 14.857t-109.714-14.857q-9.143 6.286-24.286 15.429t-47.714 22-49.143 7.714q-25.143-64.571-4-116.571-45.143-48.571-45.143-117.714 0-48.571 11.714-85 [...]
-<glyph unicode="&#xf16c;" d="M530.286 150.286v-86.286l-404-0.571v86.286zM668 348v-400.571l-0.571-20v-0.571l-667.429 0.571v420.571h69.143v-353.143h530.286v353.143h68.571zM137.714 297.714l402.286-37.143-7.429-85.714-402.857 37.143zM176.571 478.286l390.286-104.571-22.286-83.429-390.286 104.571zM269.714 677.714l348-205.714-44-74.286-348 205.714zM475.429 866.857l227.429-334.286-70.857-48.571-228 333.714zM734.286 950.857l69.143-398.286-85.143-14.857-69.143 398.286z" horiz-adv-x="805" />
-<glyph unicode="&#xf188;" d="M932.571 402.286q0-14.857-10.857-25.714t-25.714-10.857h-128q0-97.714-38.286-165.714l118.857-119.429q10.857-10.857 10.857-25.714t-10.857-25.714q-10.286-10.857-25.714-10.857t-25.714 10.857l-113.143 112.571q-2.857-2.857-8.571-7.429t-24-16.286-37.143-20.857-46.857-16.571-55.429-7.429v512h-73.143v-512q-29.143 0-58 7.714t-49.714 18.857-37.714 22.286-24.857 18.571l-8.571 8-104.571-118.286q-11.429-12-27.429-12-13.714 0-24.571 9.143-10.857 10.286-11.714 25.429t8.857 2 [...]
-<glyph unicode="&#xf18e;" d="M658.286 438.857q0-8-5.143-13.143l-182.857-182.857q-5.143-5.143-13.143-5.143-7.429 0-12.857 5.429t-5.429 12.857v109.714h-201.143q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h201.143v109.714q0 8 5.143 13.143t13.143 5.143q6.857 0 13.714-5.714l182.286-182.286q5.143-5.143 5.143-13.143zM749.714 438.857q0 84.571-41.714 156t-113.143 113.143-156 41.714-156-41.714-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714 156 41. [...]
-<glyph unicode="&#xf190;" d="M658.286 493.714v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-201.143v-109.714q0-8-5.143-13.143t-13.143-5.143q-6.857 0-13.714 5.714l-182.286 182.286q-5.143 5.143-5.143 13.143t5.143 13.143l182.857 182.857q5.143 5.143 13.143 5.143 7.429 0 12.857-5.429t5.429-12.857v-109.714h201.143q7.429 0 12.857-5.429t5.429-12.857zM749.714 438.857q0 84.571-41.714 156t-113.143 113.143-156 41.714-156-41.714-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714 156 41.7 [...]
-<glyph unicode="&#xf1dd;" d="M730.286 842.857v-41.714q0-16.571-10.571-34.857t-24.286-18.286q-28.571 0-30.857-0.571-14.857-3.429-18.286-17.714-1.714-6.286-1.714-36.571v-658.286q0-14.286-10.286-24.571t-24.571-10.286h-61.714q-14.286 0-24.571 10.286t-10.286 24.571v696h-81.714v-696q0-14.286-10-24.571t-24.857-10.286h-61.714q-14.857 0-24.857 10.286t-10 24.571v283.429q-84 6.857-140 33.714-72 33.143-109.714 102.286-36.571 66.857-36.571 148 0 94.857 50.286 163.429 50.286 67.429 119.429 90.857 63.4 [...]
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe600;" glyph-name="add" d="M810.667 384h-256v-256h-85.333v256h-256v85.333h256v256h85.333v-256h256v-85.333z" />
+<glyph unicode="&#xe601;" glyph-name="remove" d="M810.667 384h-597.333v85.333h597.333v-85.333z" />
+<glyph unicode="&#xe602;" glyph-name="dot-single" d="M399.36 460.8c0-62.208 50.483-112.64 112.691-112.64s112.589 50.483 112.589 112.64c0 62.208-50.381 112.589-112.589 112.589s-112.691-50.381-112.691-112.589z" />
+<glyph unicode="&#xe604;" glyph-name="warning" d="M998.963 52.224l-456.038 851.558c-6.349 11.008-18.125 17.818-30.925 17.818-12.851 0-24.627-6.81-30.925-17.818l-455.987-851.558c-6.195-10.803-6.093-24.115 0.256-34.816 6.4-10.803 18.022-17.408 30.618-17.408h912.077c12.544 0 24.269 6.605 30.618 17.408 6.349 10.701 6.451 24.013 0.307 34.816zM563.2 102.4h-102.4v102.4h102.4v-102.4zM563.2 281.6h-102.4v332.8h102.4v-332.8z" />
+<glyph unicode="&#xe605;" glyph-name="info" d="M636.518 972.8c68.608 0 102.912-46.694 102.912-100.198 0-66.816-59.597-128.614-137.165-128.614-64.973 0-102.861 38.4-101.069 101.888 0 53.402 45.107 126.925 135.322 126.925zM425.421-51.2c-54.17 0-93.85 33.382-55.962 180.429l62.157 260.71c10.803 41.677 12.595 58.419 0 58.419-16.23 0-86.477-28.774-128.102-57.19l-27.034 45.056c131.686 111.923 283.187 177.51 348.211 177.51 54.118 0 63.13-65.178 36.096-165.376l-71.219-274.022c-12.595-48.384-7.219 [...]
+<glyph unicode="&#xe606;" glyph-name="download" d="M768 614.4h-153.6v307.2h-204.8v-307.2h-153.6l256-256 256 256zM990.106 279.962c-10.752 11.469-82.483 88.218-102.963 108.237-13.568 13.261-32.973 21.402-53.35 21.402h-89.958l156.877-153.293h-181.453c-5.222 0-9.933-2.662-12.288-6.81l-41.779-95.898h-306.381l-41.779 95.898c-2.355 4.147-7.117 6.81-12.288 6.81h-181.453l156.826 153.293h-89.907c-20.326 0-39.731-8.141-53.35-21.402-20.48-20.070-92.211-96.819-102.963-108.237-25.037-26.675-38.81-47.9 [...]
+<glyph unicode="&#xe607;" glyph-name="bookmarks" d="M768 972.8h-204.8c-28.314 0-51.2-22.886-51.2-51.2l1.178-11.366c56.422 0 102.4-45.926 102.4-102.4v-581.581l50.022 60.467 153.6-184.32v819.2c0 28.314-22.886 51.2-51.2 51.2zM461.978 819.2h-205.978c-28.314 0-51.2-22.886-51.2-51.2v-819.2l153.6 184.32 153.6-184.32v819.2c0 28.314-21.709 51.2-50.022 51.2z" />
+<glyph unicode="&#xe608;" glyph-name="star" d="M512 906.24l122.266-344.166h328.294l-267.878-202.138 95.795-354.714-278.477 212.685-278.426-212.685 95.744 354.714-267.93 202.138h328.294l122.317 344.166z" />
+<glyph unicode="&#xe609;" glyph-name="heart-outlined" d="M880.128 760.013c-85.606 78.592-224.41 78.592-310.016 0l-58.112-53.299-58.163 53.299c-85.606 78.592-224.358 78.592-309.965 0-96.307-88.371-96.307-231.373 0-319.744l368.128-337.869 368.128 337.869c96.256 88.371 96.256 231.424 0 319.744zM825.549 492.8l-313.549-292.608-313.6 292.608c-31.59 29.030-43.827 66.918-43.827 107.213s7.066 73.37 38.707 102.349c27.904 25.651 65.434 39.782 105.626 39.782 40.141 0 77.67-24.371 105.574-50.074l107. [...]
+<glyph unicode="&#xe60a;" glyph-name="list" d="M737.28 512h-296.96c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2h296.96c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2zM839.68 256h-399.36c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2h399.36c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2zM440.32 665.6h399.36c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2h-399.36c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2zM276.48 512h-92.16c-28.262 [...]
+<glyph unicode="&#xe900;" glyph-name="menu" d="M839.68 512h-655.36c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2h655.36c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2zM839.68 307.2h-655.36c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2h655.36c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2zM184.32 614.4h655.36c28.262 0 30.72 22.886 30.72 51.2s-2.458 51.2-30.72 51.2h-655.36c-28.262 0-30.72-22.886-30.72-51.2s2.458-51.2 30.72-51.2z" />
+<glyph unicode="&#xf002;" glyph-name="search" horiz-adv-x="951" d="M658.286 475.428q0 105.714-75.143 180.857t-180.857 75.143-180.857-75.143-75.143-180.857 75.143-180.857 180.857-75.143 180.857 75.143 75.143 180.857zM950.857 0q0-29.714-21.714-51.429t-51.429-21.714q-30.857 0-51.429 21.714l-196 195.429q-102.286-70.857-228-70.857-81.714 0-156.286 31.714t-128.571 85.714-85.714 128.571-31.714 156.286 31.714 156.286 85.714 128.571 128.571 85.714 156.286 31.714 156.286-31.714 128.571-85.714 85.7 [...]
+<glyph unicode="&#xf099;" glyph-name="twitter" horiz-adv-x="951" d="M925.714 717.714q-38.286-56-92.571-95.429 0.571-8 0.571-24 0-74.286-21.714-148.286t-66-142-105.429-120.286-147.429-83.429-184.571-31.143q-154.857 0-283.429 82.857 20-2.286 44.571-2.286 128.571 0 229.143 78.857-60 1.143-107.429 36.857t-65.143 91.143q18.857-2.857 34.857-2.857 24.571 0 48.571 6.286-64 13.143-106 63.714t-42 117.429v2.286q38.857-21.714 83.429-23.429-37.714 25.143-60 65.714t-22.286 88q0 50.286 25.143 93.143 69 [...]
+<glyph unicode="&#xf09b;" glyph-name="github" d="M877.714 438.857q0-143.429-83.714-258t-216.286-158.571q-15.429-2.857-22.571 4t-7.143 17.143v120.571q0 55.429-29.714 81.143 32.571 3.429 58.571 10.286t53.714 22.286 46.286 38 30.286 60 11.714 86q0 69.143-45.143 117.714 21.143 52-4.571 116.571-16 5.143-46.286-6.286t-52.571-25.143l-21.714-13.714q-53.143 14.857-109.714 14.857t-109.714-14.857q-9.143 6.286-24.286 15.429t-47.714 22-49.143 7.714q-25.143-64.571-4-116.571-45.143-48.571-45.143-117.71 [...]
+<glyph unicode="&#xf16c;" glyph-name="stack-overflow" horiz-adv-x="805" d="M530.286 150.286v-86.286l-404-0.571v86.286zM668 348v-400.571l-0.571-20v-0.571l-667.429 0.571v420.571h69.143v-353.143h530.286v353.143h68.571zM137.714 297.714l402.286-37.143-7.429-85.714-402.857 37.143zM176.571 478.286l390.286-104.571-22.286-83.429-390.286 104.571zM269.714 677.714l348-205.714-44-74.286-348 205.714zM475.429 866.857l227.429-334.286-70.857-48.571-228 333.714zM734.286 950.857l69.143-398.286-85.143-14.85 [...]
+<glyph unicode="&#xf188;" glyph-name="bug" horiz-adv-x="951" d="M932.571 402.286q0-14.857-10.857-25.714t-25.714-10.857h-128q0-97.714-38.286-165.714l118.857-119.429q10.857-10.857 10.857-25.714t-10.857-25.714q-10.286-10.857-25.714-10.857t-25.714 10.857l-113.143 112.571q-2.857-2.857-8.571-7.429t-24-16.286-37.143-20.857-46.857-16.571-55.429-7.429v512h-73.143v-512q-29.143 0-58 7.714t-49.714 18.857-37.714 22.286-24.857 18.571l-8.571 8-104.571-118.286q-11.429-12-27.429-12-13.714 0-24.571 9.143- [...]
+<glyph unicode="&#xf18e;" glyph-name="arrow-circle-o-right" d="M658.286 438.857q0-8-5.143-13.143l-182.857-182.857q-5.143-5.143-13.143-5.143-7.429 0-12.857 5.429t-5.429 12.857v109.714h-201.143q-7.429 0-12.857 5.429t-5.429 12.857v109.714q0 7.429 5.429 12.857t12.857 5.429h201.143v109.714q0 8 5.143 13.143t13.143 5.143q6.857 0 13.714-5.714l182.286-182.286q5.143-5.143 5.143-13.143zM749.714 438.857q0 84.571-41.714 156t-113.143 113.143-156 41.714-156-41.714-113.143-113.143-41.714-156 41.714-156  [...]
+<glyph unicode="&#xf190;" glyph-name="arrow-circle-o-left" d="M658.286 493.714v-109.714q0-7.429-5.429-12.857t-12.857-5.429h-201.143v-109.714q0-8-5.143-13.143t-13.143-5.143q-6.857 0-13.714 5.714l-182.286 182.286q-5.143 5.143-5.143 13.143t5.143 13.143l182.857 182.857q5.143 5.143 13.143 5.143 7.429 0 12.857-5.429t5.429-12.857v-109.714h201.143q7.429 0 12.857-5.429t5.429-12.857zM749.714 438.857q0 84.571-41.714 156t-113.143 113.143-156 41.714-156-41.714-113.143-113.143-41.714-156 41.714-156 11 [...]
+<glyph unicode="&#xf1dd;" glyph-name="paragraph" horiz-adv-x="731" d="M730.286 842.857v-41.714q0-16.571-10.571-34.857t-24.286-18.286q-28.571 0-30.857-0.571-14.857-3.429-18.286-17.714-1.714-6.286-1.714-36.571v-658.286q0-14.286-10.286-24.571t-24.571-10.286h-61.714q-14.286 0-24.571 10.286t-10.286 24.571v696h-81.714v-696q0-14.286-10-24.571t-24.857-10.286h-61.714q-14.857 0-24.857 10.286t-10 24.571v283.429q-84 6.857-140 33.714-72 33.143-109.714 102.286-36.571 66.857-36.571 148 0 94.857 50.286  [...]
 </font></defs></svg>
\ No newline at end of file
diff --git a/docs/docgen-resources/fonts/icomoon.ttf b/docs/docgen-resources/fonts/icomoon.ttf
index f643244..c81818a 100644
Binary files a/docs/docgen-resources/fonts/icomoon.ttf and b/docs/docgen-resources/fonts/icomoon.ttf differ
diff --git a/docs/docgen-resources/fonts/icomoon.woff b/docs/docgen-resources/fonts/icomoon.woff
index 7f40846..fb3e07d 100644
Binary files a/docs/docgen-resources/fonts/icomoon.woff and b/docs/docgen-resources/fonts/icomoon.woff differ
diff --git a/docs/docgen-resources/main.min.js b/docs/docgen-resources/main.min.js
index c3bd292..f9fd6f1 100644
--- a/docs/docgen-resources/main.min.js
+++ b/docs/docgen-resources/main.min.js
@@ -1 +1 @@
-"use strict";!function(e,f){var t,n,a,p=0;function h(e){e.stopPropagation();var t=e.target.parentNode;39===e.which?(t.classList.remove("closed"),t.classList.add("open")):37===e.which&&(t.classList.add("closed"),t.classList.remove("open"))}function v(e){if(e.children.length){for(var t=0;t<e.children.length;t++)if(e.children[t].isFile)return!1;return!0}return!0}function g(e){e.stopPropagation();var t=e.target;"LI"===t.tagName.toUpperCase()&&(t.classList.toggle("closed"),t.classList.toggle( [...]
\ No newline at end of file
+"use strict";!function(e,u){var t,n,a,p=0;function f(e){e.stopPropagation();var t=e.target.parentNode;39===e.which?(t.classList.remove("closed"),t.classList.add("open")):37===e.which&&(t.classList.add("closed"),t.classList.remove("open"))}function h(e){e.stopPropagation();var t=e.target;"LI"===t.tagName.toUpperCase()&&(t.classList.toggle("closed"),t.classList.toggle("open"))}function m(e,t,n){var a=document.createElement("ul");a.classList.add("depth-"+p);for(var s,i,l,d=0;d<e.length;d++) [...]
\ No newline at end of file
diff --git a/docs/gloss.html b/docs/gloss.html
index 092c57f..a659521 100644
--- a/docs/gloss.html
+++ b/docs/gloss.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/gloss.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="gloss.html"><span itemprop="name">Glossary</span></a></li></ul>  </div>
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><li><a href="alphaidx.html">Alpha. index</a></li><li>Glossary</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 = ["Apache FreeMarker Manual","Glossary"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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_eccn.html"><span>Previous</span></a><a class="paging-arrow next" href="alphaidx.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-part" id="gloss" itemprop="headline">Glossary</h1>
@@ -763,7 +771,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/index.html b/docs/index.html
index dcc4d21..1ac7731 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/index.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<ul class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="step-0" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><span itemprop="name">Table of Contents</span></li></ul>  </div>
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = [];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></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">Apache FreeMarker Manual <span class="subtitle productname">For Freemarker 2.3.30</span>
@@ -48,7 +56,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui.html b/docs/pgui.html
index c609be9..052598e 100644
--- a/docs/pgui.html
+++ b/docs/pgui.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li></ul [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="dgui_misc_alternativesyntax.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_quickstart.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-part" id="pgui" itemprop="headline">Programmer&#39;s Guide</h1>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config.html b/docs/pgui_config.html
index c7f5744..2c77910 100644
--- a/docs/pgui_config.html
+++ b/docs/pgui_config.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_datamodel_objectWrapper.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_basics.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="pgui_config" itemprop="headline">The Configuration</h1>
@@ -48,7 +56,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_basics.html b/docs/pgui_config_basics.html
index 7b7b52e..7b75313 100644
--- a/docs/pgui_config_basics.html
+++ b/docs/pgui_config_basics.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_basics.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","Basics"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_sharedvariables.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_basics" itemprop="headline">Basics</h1>
@@ -68,7 +76,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_custom_formats.html b/docs/pgui_config_custom_formats.html
index 7cce7ed..70ac01b 100644
--- a/docs/pgui_config_custom_formats.html
+++ b/docs/pgui_config_custom_formats.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_custom_formats.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","Custom number and date/time formats"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_outputformatsautoesc.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_incompatible_improvements.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_custom_formats" itemprop="headline">Custom number and date/time formats</h1>
@@ -147,7 +155,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example;
+<pre class="code-block code-unspecified">package com.example;
 
 import java.util.Locale;
 
@@ -200,33 +208,33 @@ public class HexTemplateNumberFormatFactory extends TemplateNumberFormatFactory
 
     }
 
-}</pre></div>
+}</pre>
 
           <p>We register the above format with name
           "hex":</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
+<pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
 Configuration cfg = ...;
 ...
 Map&lt;String, TemplateNumberFormatFactory&gt; customNumberFormats = ...;
 ...
 customNumberFormats.put(&quot;hex&quot;, HexTemplateNumberFormatFactory.INSTANCE);
 ...
-cfg.setCustomNumberFormats(customNumberFormats);</pre></div>
+cfg.setCustomNumberFormats(customNumberFormats);</pre>
 
           <p>Now we can use this format in templates:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${x?string.@hex}</pre></div>
+<pre class="code-block code-template">${x?string.@hex}</pre>
 
           <p>or even set it as the default number format:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setNumberFormat(&quot;@hex&quot;);</pre></div>
+<pre class="code-block code-unspecified">cfg.setNumberFormat(&quot;@hex&quot;);</pre>
         
           
 
@@ -241,7 +249,7 @@ cfg.setCustomNumberFormats(customNumberFormats);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example;
+<pre class="code-block code-unspecified">package com.example;
 
 import java.util.Locale;
 
@@ -343,27 +351,27 @@ public class BaseNTemplateNumberFormatFactory extends TemplateNumberFormatFactor
 
     }
 
-}</pre></div>
+}</pre>
 
           <p>We register the above format with name
           "base":</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
+<pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
 Configuration cfg = ...;
 ...
 Map&lt;String, TemplateNumberFormatFactory&gt; customNumberFormats = ...;
 ...
 customNumberFormats.put(&quot;base&quot;, BaseNTemplateNumberFormatFactory.INSTANCE);
 ...
-cfg.setCustomNumberFormats(customNumberFormats);</pre></div>
+cfg.setCustomNumberFormats(customNumberFormats);</pre>
 
           <p>Now we can use this format in templates:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${x?string.@base_8}</pre></div>
+<pre class="code-block code-template">${x?string.@base_8}</pre>
 
           <p>Above there the parameter string was <code class="inline-code">&quot;8&quot;</code>,
           as FreeMarker allows separating that from the format name with
@@ -377,14 +385,14 @@ cfg.setCustomNumberFormats(customNumberFormats);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setNumberFormat(&quot;@base 8&quot;);</pre></div>
+<pre class="code-block code-unspecified">cfg.setNumberFormat(&quot;@base 8&quot;);</pre>
 
           <p>Here&#39;s an example of using the a fallback number format (which
           is <code class="inline-code">&quot;0.0###&quot;</code>):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setNumberFormat(&quot;@base 8|0.0###&quot;);</pre></div>
+<pre class="code-block code-unspecified">cfg.setNumberFormat(&quot;@base 8|0.0###&quot;);</pre>
 
           <p>Note that this functionality, with the <code class="inline-code">|</code>
           syntax and all, is purely implemented in the example code
@@ -402,7 +410,7 @@ cfg.setCustomNumberFormats(customNumberFormats);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example;
+<pre class="code-block code-unspecified">package com.example;
 
 import java.util.Date;
 import java.util.Locale;
@@ -468,34 +476,34 @@ public class EpochMillisTemplateDateFormatFactory extends TemplateDateFormatFact
 
     }
 
-}</pre></div>
+}</pre>
 
           <p>We register the above format with name
           "epoch":</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
+<pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
 Configuration cfg = ...;
 ...
 Map&lt;String, TemplateDateFormatFactory&gt; customDateFormats = ...;
 ...
 customDateFormats.put(&quot;epoch&quot;, EpochMillisTemplateDateFormatFactory.INSTANCE);
 ...
-cfg.setCustomDateFormats(customDateFormats);</pre></div>
+cfg.setCustomDateFormats(customDateFormats);</pre>
 
           <p>Now we can use this format in templates:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${t?string.@epoch}</pre></div>
+<pre class="code-block code-template">${t?string.@epoch}</pre>
 
           <p>Of course, we could also set this as the default date-time
           format like:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setDateTimeFormat(&quot;@epoch&quot;);</pre></div>
+<pre class="code-block code-unspecified">cfg.setDateTimeFormat(&quot;@epoch&quot;);</pre>
 
           <p>For a more complex that for example uses format parameters,
           refer to the <a href="#pgui_config_custom_formats_ex_cust_algo_advanced">advanced
@@ -514,7 +522,7 @@ cfg.setCustomDateFormats(customDateFormats);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
+<pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
 Configuration cfg = ...;
 
 Map&lt;String, TemplateNumberFormatFactory&gt; customNumberFormats
@@ -528,16 +536,16 @@ Map&lt;String, TemplateDateFormatFactory&gt; customDateFormats
         = new HashMap&lt;String, TemplateDateFormatFactory&gt;();
 customDateFormats.put(&quot;fileDate&quot;, new AliasTemplateDateFormatFactory(&quot;dd/MMM/yy hh:mm a&quot;));
 customDateFormats.put(&quot;logEventTime&quot;, new AliasTemplateDateFormatFactory(&quot;iso ms u&quot;));
-cfg.setCustomDateFormats(customDateFormats);</pre></div>
+cfg.setCustomDateFormats(customDateFormats);</pre>
 
           <p>So now you can do this in a template:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${product.price?string.@price}
+<pre class="code-block code-template">${product.price?string.@price}
 ${product.weight?string.@weight}
 ${lastModified?string.@fileDate}
-${lastError.timestamp?string.@logEventTime}</pre></div>
+${lastError.timestamp?string.@logEventTime}</pre>
 
           <p>Note that the constructor parameter of
           <code class="inline-code">AliasTemplateNumberFormatFactory</code> can naturally
@@ -545,11 +553,11 @@ ${lastError.timestamp?string.@logEventTime}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Map&lt;String, TemplateNumberFormatFactory&gt; customNumberFormats
+<pre class="code-block code-unspecified">Map&lt;String, TemplateNumberFormatFactory&gt; customNumberFormats
         = new HashMap&lt;String, TemplateNumberFormatFactory&gt;();
 customNumberFormats.put(&quot;base&quot;, BaseNTemplateNumberFormatFactory.INSTANCE);
 customNumberFormats.put(&quot;oct&quot;, new AliasTemplateNumberFormatFactory(&quot;@base 8&quot;));
-cfg.setCustomNumberFormats(customNumberFormats);</pre></div>
+cfg.setCustomNumberFormats(customNumberFormats);</pre>
 
           <p>So now
           <code class="inline-code"><em class="code-color">n</em>?string.@oct</code> will
@@ -569,7 +577,7 @@ cfg.setCustomNumberFormats(customNumberFormats);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example;
+<pre class="code-block code-unspecified">package com.example;
 
 import freemarker.template.TemplateModelException;
 import freemarker.template.TemplateNumberModel;
@@ -593,34 +601,34 @@ public class UnitAwareTemplateNumberModel implements TemplateNumberModel {
         return unit;
     }
 
-}</pre></div>
+}</pre>
 
           <p>When you fill the data-model, you could do something like
           this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Map&lt;String, Object&gt; dataModel = new HashMap&lt;&gt;();
+<pre class="code-block code-unspecified">Map&lt;String, Object&gt; dataModel = new HashMap&lt;&gt;();
 dataModel.put(&quot;weight&quot;, new UnitAwareTemplateNumberModel(1.5, &quot;kg&quot;));
-// Rather than just: dataModel.put(&quot;weight&quot;, 1.5);</pre></div>
+// Rather than just: dataModel.put(&quot;weight&quot;, 1.5);</pre>
 
           <p>Then if we have this in the template:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${weight}</pre></div>
+<pre class="code-block code-template">${weight}</pre>
 
           <p>we want to see this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">1.5 kg</pre></div>
+<pre class="code-block code-output">1.5 kg</pre>
 
           <p>To achieve that, we define this custom number format:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example;
+<pre class="code-block code-unspecified">package com.example;
 
 import java.util.Locale;
 
@@ -681,14 +689,14 @@ public class UnitAwareTemplateNumberFormatFactory extends TemplateNumberFormatFa
 
     }
 
-}</pre></div>
+}</pre>
 
           <p>Finally, we set the above custom format as the default number
           format:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
+<pre class="code-block code-unspecified">// Where you initalize the application-wide Configuration singleton:
 Configuration cfg = ...;
 
 Map&lt;String, TemplateNumberFormatFactory&gt; customNumberFormats = new HashMap&lt;&gt;();
@@ -696,12 +704,12 @@ customNumberFormats.put(&quot;ua&quot;, UnitAwareTemplateNumberFormatFactory.INS
 cfg.setCustomNumberFormats(customNumberFormats);
 
 // Note: &quot;0.####;; roundingMode=halfUp&quot; is a standard format specified in FreeMarker.
-cfg.setNumberFormat(&quot;@ua 0.####;; roundingMode=halfUp&quot;);</pre></div>
+cfg.setNumberFormat(&quot;@ua 0.####;; roundingMode=halfUp&quot;);</pre>
         <div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_config_outputformatsautoesc.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_incompatible_improvements.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_errorhandling.html b/docs/pgui_config_errorhandling.html
index 309875e..e83ca5e 100644
--- a/docs/pgui_config_errorhandling.html
+++ b/docs/pgui_config_errorhandling.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_errorhandling.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","Error handling"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_templateloading.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_templateconfigurations.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_errorhandling" itemprop="headline">Error handling</h1>
@@ -198,8 +206,8 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">void handleTemplateException(TemplateException te, Environment env, Writer out)
-        throws TemplateException;</pre></div>
+<pre class="code-block code-unspecified">void handleTemplateException(TemplateException te, Environment env, Writer out)
+        throws TemplateException;</pre>
 
           <p>Whenever a <code class="inline-code">TemplateException</code> occurs, this
           method will be called. The exception to handle is in the
@@ -223,7 +231,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">class MyTemplateExceptionHandler implements TemplateExceptionHandler {
+<pre class="code-block code-unspecified">class MyTemplateExceptionHandler implements TemplateExceptionHandler {
     public void handleTemplateException(TemplateException te, Environment env, java.io.Writer out)
             throws TemplateException {
         try {
@@ -236,7 +244,7 @@ ga('send', 'pageview');
 
 <em>...</em>
 
-cfg.setTemplateExceptionHandler(new MyTemplateExceptionHandler());</pre></div>
+cfg.setTemplateExceptionHandler(new MyTemplateExceptionHandler());</pre>
 
           <p>If an error occurs in an interpolation which is not inside an
           FTL tag (that is, not enclosed into
@@ -248,21 +256,21 @@ cfg.setTemplateExceptionHandler(new MyTemplateExceptionHandler());</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">a${badVar}b</pre></div>
+<pre class="code-block code-template">a${badVar}b</pre>
 
           <p>will print this if we use the
           <code class="inline-code">MyTemplateExceptionHandler</code>:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">a[ERROR: Expression badVar is undefined on line 1, column 4 in test.ftl.]b</pre></div>
+<pre class="code-block code-output">a[ERROR: Expression badVar is undefined on line 1, column 4 in test.ftl.]b</pre>
 
           <p>This template will print the same (except that the column
           number will differ...):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">a${&quot;moo&quot; + badVar}b</pre></div>
+<pre class="code-block code-template">a${&quot;moo&quot; + badVar}b</pre>
 
           <p>because the whole interpolation is skipped if any error occurs
           inside it.</p>
@@ -279,13 +287,13 @@ cfg.setTemplateExceptionHandler(new MyTemplateExceptionHandler());</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">a&lt;#if badVar&gt;Foo&lt;/#if&gt;b</pre></div>
+<pre class="code-block code-template">a&lt;#if badVar&gt;Foo&lt;/#if&gt;b</pre>
 
           <p>will print this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">a[ERROR: Expression badVar is undefined on line 1, column 7 in test.ftlh.]b</pre></div>
+<pre class="code-block code-output">a[ERROR: Expression badVar is undefined on line 1, column 7 in test.ftlh.]b</pre>
 
           <p>Note that the error occurred in the <code class="inline-code">if</code>
           start-tag (<code class="inline-code">&lt;#if badVar&gt;</code>), but the whole
@@ -299,7 +307,7 @@ cfg.setTemplateExceptionHandler(new MyTemplateExceptionHandler());</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">a&lt;#if &quot;foo${badVar}&quot; == &quot;foobar&quot;&gt;Foo&lt;/#if&gt;b</pre></div>
+<pre class="code-block code-template">a&lt;#if &quot;foo${badVar}&quot; == &quot;foobar&quot;&gt;Foo&lt;/#if&gt;b</pre>
 
           <p>because whole directive calling will be skipped if any error
           occurs during the parameter evaluation.</p>
@@ -310,36 +318,36 @@ cfg.setTemplateExceptionHandler(new MyTemplateExceptionHandler());</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">a
+<pre class="code-block code-template">a
 &lt;#if true&gt;
   Foo
   ${badVar}
   Bar
 &lt;/#if&gt;
-c</pre></div>
+c</pre>
 
           <p>or in the macro definition body:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">a
+<pre class="code-block code-template">a
 &lt;@test /&gt;
 b
 &lt;#macro test&gt;
   Foo
   ${badVar}
   Bar
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
 
           <p>the output will be something like:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">a
+<pre class="code-block code-output">a
   Foo
   [ERROR: Expression badVar is undefined on line 4, column 5 in test.ftlh.]
   Bar
-c</pre></div>
+c</pre>
         
           
 
@@ -384,7 +392,7 @@ c</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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_incompatible_improvements.html b/docs/pgui_config_incompatible_improvements.html
index 4cfe54a..b355a7a 100644
--- a/docs/pgui_config_incompatible_improvements.html
+++ b/docs/pgui_config_incompatible_improvements.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_incompatible_improvements.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","The \"incompatible improvements\" setting"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_custom_formats.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_incompatible_improvements" itemprop="headline">The &quot;incompatible improvements&quot; setting</h1>
@@ -103,7 +111,7 @@ ga('send', 'pageview');
 
               
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">... = new Configuration(Configuration.VERSION_2_3_28)</pre></div>
+<pre class="code-block code-unspecified">... = new Configuration(Configuration.VERSION_2_3_28)</pre>
             </li>
 
             <li>
@@ -112,7 +120,7 @@ ga('send', 'pageview');
 
               
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setIncompatibleImprovements(Configuration.VERSION_2_3_28)</pre></div>
+<pre class="code-block code-unspecified">cfg.setIncompatibleImprovements(Configuration.VERSION_2_3_28)</pre>
             </li>
 
             <li>
@@ -122,7 +130,7 @@ ga('send', 'pageview');
 
               
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">incompatible_improvements=2.3.28</pre></div>
+<pre class="code-block code-unspecified">incompatible_improvements=2.3.28</pre>
             </li>
 
             <li>
@@ -133,10 +141,10 @@ ga('send', 'pageview');
 
               
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">&lt;init-param&gt;
+<pre class="code-block code-unspecified">&lt;init-param&gt;
     &lt;param-name&gt;incompatible_improvements&lt;/param-name&gt;
     &lt;param-value&gt;2.3.28&lt;/param-value&gt;
-&lt;/init-param&gt;</pre></div>
+&lt;/init-param&gt;</pre>
             </li>
           </ul>
 
@@ -184,7 +192,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_outputformatsautoesc.html b/docs/pgui_config_outputformatsautoesc.html
index 5031768..c1a2d93 100644
--- a/docs/pgui_config_outputformatsautoesc.html
+++ b/docs/pgui_config_outputformatsautoesc.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_outputformatsautoesc.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","Associating output formats with templates"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_templateconfigurations.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_custom_formats.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_outputformatsautoesc" itemprop="headline">Associating output formats with templates</h1>
@@ -72,8 +80,8 @@ ga('send', 'pageview');
         directive</a>s.)</p><p>To check if you have configured FreeMarker properly, you can use
         this template:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;p&gt;Output format: ${.output_format}
-&lt;p&gt;Auto-escaping: ${.auto_esc?c}</pre></div><p>See the <a href="dgui_misc_autoescaping.html#topic.predefinedOutputFormats">table of
+<pre class="code-block code-template">&lt;p&gt;Output format: ${.output_format}
+&lt;p&gt;Auto-escaping: ${.auto_esc?c}</pre><p>See the <a href="dgui_misc_autoescaping.html#topic.predefinedOutputFormats">table of
         predefined output formats here...</a></p><p>Configuration examples:</p><ul>
           <li>
             <p>To enable automatic output format associations to
@@ -94,15 +102,15 @@ ga('send', 'pageview');
 
                 
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Where you initalize the Configuration singletion, add:
-cfg.setRecognizeStandardFileExtensions(true);</pre></div>
+<pre class="code-block code-unspecified">// Where you initalize the Configuration singletion, add:
+cfg.setRecognizeStandardFileExtensions(true);</pre>
 
                 <p>or if you configure FreeMarker with Java
                 <code class="inline-code">*.properties</code> file:</p>
 
                 
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">recognizeStandardFileExtensions = true</pre></div>
+<pre class="code-block code-unspecified">recognizeStandardFileExtensions = true</pre>
               </li>
             </ul>
           </li>
@@ -117,7 +125,7 @@ cfg.setRecognizeStandardFileExtensions(true);</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Where you initalize the Configuration singletion, add:
+<pre class="code-block code-unspecified">// Where you initalize the Configuration singletion, add:
 
 TemplateConfiguration tcHTML = new TemplateConfiguration();
 tcHTML.setOutputFormat(HTMLOutputFormat.INSTANCE);
@@ -125,7 +133,7 @@ tcHTML.setOutputFormat(HTMLOutputFormat.INSTANCE);
 cfg.setTemplateConfigurations(
         new ConditionalTemplateConfigurationFactory(
                 new PathGlobMatcher(&quot;mail/**&quot;),
-                tcHTML));</pre></div>
+                tcHTML));</pre>
 
             <p>or if you are configuring FreeMarker from Java
             <code class="inline-code">*.properties</code> file (the <code class="inline-code">\</code>-s
@@ -133,10 +141,10 @@ cfg.setTemplateConfigurations(
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">templateConfigurations = \
+<pre class="code-block code-unspecified">templateConfigurations = \
     ConditionalTemplateConfigurationFactory( \
         PathGlobMatcher(&quot;mail/**&quot;), \
-        TemplateConfiguration(outputFormat = HTMLOutputFormat()))</pre></div>
+        TemplateConfiguration(outputFormat = HTMLOutputFormat()))</pre>
           </li>
 
           <li>
@@ -152,7 +160,7 @@ cfg.setTemplateConfigurations(
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">TemplateConfiguration tcHTML = new TemplateConfiguration();
+<pre class="code-block code-unspecified">TemplateConfiguration tcHTML = new TemplateConfiguration();
 tcHTML.setOutputFormat(HTMLOutputFormat.INSTANCE);
 
 TemplateConfiguration tcXML = new TemplateConfiguration();
@@ -175,7 +183,7 @@ cfg.setTemplateConfigurations(
                         new FileExtensionMatcher(&quot;rtf&quot;),
                         tcRTF)
         ).allowNoMatch(true)
-);</pre></div>
+);</pre>
 
             <p>or if you are configuring FreeMarker from Java
             <code class="inline-code">*.properties</code> file (the <code class="inline-code">\</code>-s
@@ -183,7 +191,7 @@ cfg.setTemplateConfigurations(
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">templateConfigurations = \
+<pre class="code-block code-unspecified">templateConfigurations = \
     FirstMatchTemplateConfigurationFactory( \
         ConditionalTemplateConfigurationFactory( \
             FileExtensionMatcher(&quot;xml&quot;), \
@@ -196,14 +204,14 @@ cfg.setTemplateConfigurations(
         ConditionalTemplateConfigurationFactory( \
             FileExtensionMatcher(&quot;rtf&quot;), \
             TemplateConfiguration(outputFormat = RTFOutputFormat())), \
-        allowNoMatch = true)</pre></div>
+        allowNoMatch = true)</pre>
           </li>
         </ul><p>(You can find some more complex
         <code class="inline-code">template_configurations</code> setups <a href="pgui_config_templateconfigurations.html">here...</a>)</p><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_config_templateconfigurations.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_custom_formats.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_settings.html b/docs/pgui_config_settings.html
index 89e41cc..66c4c4d 100644
--- a/docs/pgui_config_settings.html
+++ b/docs/pgui_config_settings.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_settings.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","Settings"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_sharedvariables.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_templateloading.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_settings" itemprop="headline">Settings</h1>
@@ -192,13 +200,13 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Configuration myCfg = new Configuration(Configuration.VERSION_2_3_27);
+<pre class="code-block code-unspecified">Configuration myCfg = new Configuration(Configuration.VERSION_2_3_27);
 myCfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
 myCfg.setDefaultEncoding(&quot;UTF-8&quot;);
 DefaultObjectWrapperBuilder owb = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_27);
 owb.setForceLegacyNonListCollections(false);
 owb.setDefaultDateType(TemplateDateModel.DATETIME);
-myCfg.setObjectWrapper(owb.build());</pre></div>
+myCfg.setObjectWrapper(owb.build());</pre>
 
             <p>You do this before you start to actually use the
             <code class="inline-code">Configuration</code> object (typically, when you
@@ -218,7 +226,7 @@ myCfg.setObjectWrapper(owb.build());</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">&lt;bean id=&quot;freemarkerConfig&quot;
+<pre class="code-block code-unspecified">&lt;bean id=&quot;freemarkerConfig&quot;
     class=&quot;org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer&quot;&gt;
   &lt;property name=&quot;freemarkerSettings&quot;&gt;
     &lt;props&gt;
@@ -233,7 +241,7 @@ myCfg.setObjectWrapper(owb.build());</pre></div>
       &lt;/prop&gt;
     &lt;/props&gt;
   &lt;/property&gt;
-&lt;/bean&gt;</pre></div>
+&lt;/bean&gt;</pre>
 
             <p>Here&#39;s the same when configuring FreeMarker for Struts,
             which looks for a <code class="inline-code">freemarker.properties</code> in the
@@ -241,13 +249,13 @@ myCfg.setObjectWrapper(owb.build());</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">incompatible_improvements=2.3.27
+<pre class="code-block code-unspecified">incompatible_improvements=2.3.27
 template_exception_handler=rethrow
 default_encoding=UTF-8
 object_wrapper=DefaultObjectWrapper( \
         2.3.27, \
         forceLegacyNonListCollections = false, \
-        defaultDateType = freemarker.template.TemplateDateModel.DATETIME)</pre></div>
+        defaultDateType = freemarker.template.TemplateDateModel.DATETIME)</pre>
 
             <p>As demonstrated above with
             <code class="inline-code">object_wrapper</code>, some settings can accept quite
@@ -317,10 +325,10 @@ object_wrapper=DefaultObjectWrapper( \
 
                 
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Environment env = myTemplate.createProcessingEnvironment(root, out);
+<pre class="code-block code-unspecified">Environment env = myTemplate.createProcessingEnvironment(root, out);
 env.setLocale(java.util.Locale.ITALY);
 env.setNumberFormat(&quot;0.####&quot;);
-env.process();  // process the template</pre></div>
+env.process();  // process the template</pre>
               </li>
 
               <li>
@@ -330,8 +338,8 @@ env.process();  // process the template</pre></div>
 
                 
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#setting locale=&quot;it_IT&quot;&gt;
-&lt;#setting number_format=&quot;0.####&quot;&gt;</pre></div>
+<pre class="code-block code-template">&lt;#setting locale=&quot;it_IT&quot;&gt;
+&lt;#setting number_format=&quot;0.####&quot;&gt;</pre>
               </li>
             </ul>
 
@@ -371,7 +379,7 @@ env.process();  // process the template</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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_sharedvariables.html b/docs/pgui_config_sharedvariables.html
index c55e583..9be4f2a 100644
--- a/docs/pgui_config_sharedvariables.html
+++ b/docs/pgui_config_sharedvariables.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_sharedvariables.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","Shared variables"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_basics.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_settings.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_sharedvariables" itemprop="headline">Shared variables</h1>
@@ -46,10 +54,10 @@ ga('send', 'pageview');
         the configuration with the <code class="inline-code">setSharedVariable</code>
         methods:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Configuration cfg = new Configuration(Configuration.VERSION_2_3_27);
+<pre class="code-block code-unspecified">Configuration cfg = new Configuration(Configuration.VERSION_2_3_27);
 <em>..</em>.
 cfg.setSharedVariable(&quot;warp&quot;, new WarpDirective());
-cfg.setSharedVariable(&quot;company&quot;, &quot;Foo Inc.&quot;);</pre></div><p>In all templates that use this configuration, an user-defined
+cfg.setSharedVariable(&quot;company&quot;, &quot;Foo Inc.&quot;);</pre><p>In all templates that use this configuration, an user-defined
         directive with name <code class="inline-code">wrap</code> and a string with name
         <code class="inline-code">company</code> will be visible in the data-model root, so
         you don&#39;t have to add them to the root hash again and again. A
@@ -136,7 +144,7 @@ cfg.setSharedVariable(&quot;company&quot;, &quot;Foo Inc.&quot;);</pre></div><p>
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_templateconfigurations.html b/docs/pgui_config_templateconfigurations.html
index 2b8ad89..f48a2c4 100644
--- a/docs/pgui_config_templateconfigurations.html
+++ b/docs/pgui_config_templateconfigurations.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_templateconfigurations.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","Template configurations"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_errorhandling.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_outputformatsautoesc.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_templateconfigurations" itemprop="headline">Template configurations</h1>
@@ -64,9 +72,9 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">TemplateConfiguration tcUTF8XML = new TemplateConfiguration();
+<pre class="code-block code-unspecified">TemplateConfiguration tcUTF8XML = new TemplateConfiguration();
 tc.setEncoding(&quot;utf-8&quot;);
-tc.setOutputFormat(XMLOutputFormat.INSTANCE);</pre></div>
+tc.setOutputFormat(XMLOutputFormat.INSTANCE);</pre>
           </li>
 
           <li>
@@ -102,10 +110,10 @@ tc.setOutputFormat(XMLOutputFormat.INSTANCE);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setTemplateConfigurations(
+<pre class="code-block code-unspecified">cfg.setTemplateConfigurations(
         new ConditionalTemplateConfigurationFactory(
                 new FileExtensionMatcher(&quot;xml&quot;),
-                tcUTF8XML));</pre></div>
+                tcUTF8XML));</pre>
 
           <p>The same configuring is also doable if you don&#39;t have access
           to the configuring Java code, but only to a Java
@@ -116,14 +124,14 @@ tc.setOutputFormat(XMLOutputFormat.INSTANCE);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">templateConfigurations = \
+<pre class="code-block code-unspecified">templateConfigurations = \
     ConditionalTemplateConfigurationFactory( \
         FileExtensionMatcher(&quot;xml&quot;), \
         TemplateConfiguration( \
             encoding = &quot;utf-8&quot;, \
             outputFormat = XMLOutputFormat() \
         ) \
-    )</pre></div>
+    )</pre>
         
           
 
@@ -148,7 +156,7 @@ tc.setOutputFormat(XMLOutputFormat.INSTANCE);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">TemplateConfiguration tcSubject = new TemplateConfiguration();
+<pre class="code-block code-unspecified">TemplateConfiguration tcSubject = new TemplateConfiguration();
 tcSubject.setOutputFormat(PlainTextOutputFormat.INSTANCE);
         
 TemplateConfiguration tcBody = new TemplateConfiguration();
@@ -167,7 +175,7 @@ cfg.setTemplateConfigurations(
                         )
                         .noMatchErrorDetails(
                                 &quot;Mail template names must contain \&quot;.subject.\&quot; or \&quot;.body.\&quot;!&quot;)
-                ));</pre></div>
+                ));</pre>
 
           <p>The equivalent configuration using a Java
           <code class="inline-code">*.properties</code> file or other kind of string-string
@@ -176,7 +184,7 @@ cfg.setTemplateConfigurations(
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">templateConfigurations = \
+<pre class="code-block code-unspecified">templateConfigurations = \
     ConditionalTemplateConfigurationFactory( \
         PathGlobMatcher(&quot;mail/**&quot;), \
         FirstMatchTemplateConfigurationFactory( \
@@ -190,7 +198,7 @@ cfg.setTemplateConfigurations(
             ), \
             noMatchErrorDetails = &#39;Mail template names must contain &quot;.subject.&quot; or &quot;.body.&quot;!&#39; \
         ) \
-    )</pre></div>
+    )</pre>
         
           
 
@@ -237,7 +245,7 @@ cfg.setTemplateConfigurations(
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">TemplateConfiguration tcStats = new TemplateConfiguration();
+<pre class="code-block code-unspecified">TemplateConfiguration tcStats = new TemplateConfiguration();
 tcStats.setDateTimeFormat(&quot;iso&quot;);
 tcStats.setDateFormat(&quot;iso&quot;);
 tcStats.setTimeFormat(&quot;iso&quot;);
@@ -271,7 +279,7 @@ cfg.setTemplateConfigurations(
                                 tcHTML)
                 ).allowNoMatch(true)
         )
-);</pre></div>
+);</pre>
 
           <p>The equivalent configuration using a Java
           <code class="inline-code">*.properties</code> file or other kind of string-string
@@ -280,7 +288,7 @@ cfg.setTemplateConfigurations(
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">templateConfigurations = \
+<pre class="code-block code-unspecified">templateConfigurations = \
     MergingTemplateConfigurationFactory( \
         ConditionalTemplateConfigurationFactory( \
             FileNameGlobMatcher(&quot;*.stats.*&quot;), \
@@ -309,12 +317,12 @@ cfg.setTemplateConfigurations(
             ), \
             allowNoMatch = true \
         ) \
-    )</pre></div>
+    )</pre>
         <div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_config_errorhandling.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_outputformatsautoesc.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_config_templateloading.html b/docs/pgui_config_templateloading.html
index 753e38d..45af674 100644
--- a/docs/pgui_config_templateloading.html
+++ b/docs/pgui_config_templateloading.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_config_templateloading.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Configuration","Template loading"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_settings.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config_errorhandling.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_config_templateloading" itemprop="headline">Template loading</h1>
@@ -145,10 +153,10 @@ ga('send', 'pageview');
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">WebappTemplateLoader templateLoader = new WebappTemplateLoader(servletContext, &quot;WEB-INF/templates&quot;);
+<pre class="code-block code-unspecified">WebappTemplateLoader templateLoader = new WebappTemplateLoader(servletContext, &quot;WEB-INF/templates&quot;);
 templateLoader.setURLConnectionUsesCaches(false);
 templateLoader.setAttemptFileAccess(false);
-cfg.setTemplateLoader(templateLoader);</pre></div>
+cfg.setTemplateLoader(templateLoader);</pre>
           
 
           
@@ -170,7 +178,7 @@ cfg.setTemplateLoader(templateLoader);</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">import freemarker.cache.*; // template loaders live in this package
+<pre class="code-block code-unspecified">import freemarker.cache.*; // template loaders live in this package
 
 <em>...</em>
 
@@ -180,7 +188,7 @@ ClassTemplateLoader ctl = new ClassTemplateLoader(getClass(), &quot;/com/example
 
 MultiTemplateLoader mtl = new MultiTemplateLoader(new TemplateLoader[] { ftl1, ftl2, ctl });
 
-cfg.setTemplateLoader(mtl);</pre></div>
+cfg.setTemplateLoader(mtl);</pre>
 
             <p>Now FreeMarker will try to load templates from
             <code class="inline-code">/tmp/templates</code> directory, and if it does not
@@ -333,14 +341,14 @@ cfg.setTemplateLoader(mtl);</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setCacheStorage(new freemarker.cache.MruCacheStorage(20, 250))</pre></div>
+<pre class="code-block code-unspecified">cfg.setCacheStorage(new freemarker.cache.MruCacheStorage(20, 250))</pre>
 
           <p>Or, since <code class="inline-code">MruCacheStorage</code> is the default
           cache storage implementation:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">cfg.setSetting(Configuration.CACHE_STORAGE_KEY, &quot;strong:20, soft:250&quot;);</pre></div>
+<pre class="code-block code-unspecified">cfg.setSetting(Configuration.CACHE_STORAGE_KEY, &quot;strong:20, soft:250&quot;);</pre>
 
           <p>When you create a new <code class="inline-code">Configuration</code> object,
           initially it uses an <code class="inline-code">MruCacheStorage</code> where
@@ -357,7 +365,7 @@ cfg.setTemplateLoader(mtl);</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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_datamodel.html b/docs/pgui_datamodel.html
index 60fa56d..1d96782 100644
--- a/docs/pgui_datamodel.html
+++ b/docs/pgui_datamodel.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_datamodel.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Data Model"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_quickstart_all.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel_basics.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="pgui_datamodel" itemprop="headline">The Data Model</h1>
@@ -48,7 +56,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_datamodel_basics.html b/docs/pgui_datamodel_basics.html
index cd2f978..329435a 100644
--- a/docs/pgui_datamodel_basics.html
+++ b/docs/pgui_datamodel_basics.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_datamodel_basics.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Data Model","Basics"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_datamodel.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel_scalar.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_datamodel_basics" itemprop="headline">Basics</h1>
@@ -98,7 +106,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_datamodel_directive.html b/docs/pgui_datamodel_directive.html
index 765405b..cfd35a1 100644
--- a/docs/pgui_datamodel_directive.html
+++ b/docs/pgui_datamodel_directive.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_datamodel_directive.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Data Model","Directives"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_datamodel_method.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel_node.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_datamodel_directive" itemprop="headline">Directives</h1>
@@ -66,7 +74,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">foo
+<pre class="code-block code-template">foo
 <strong>&lt;@upper&gt;</strong>
   bar
   &lt;#-- All kind of FTL is allowed here --&gt;
@@ -75,25 +83,25 @@ ga('send', 'pageview');
   &lt;/#list&gt;
   baaz
 <strong>&lt;/@upper&gt;</strong>
-wombat</pre></div>
+wombat</pre>
 
           <p>will output this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">foo
+<pre class="code-block code-output">foo
   BAR
     RED
     GREEN
     BLUE
   BAAZ
-wombat</pre></div>
+wombat</pre>
 
           <p>This is the source code of the directive class:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example;
+<pre class="code-block code-unspecified">package com.example;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Map;
@@ -172,7 +180,7 @@ public class UpperDirective implements TemplateDirectiveModel {
         }
     }
 
-}</pre></div>
+}</pre>
 
           <p>Now we still need to create an instance of this class, and
           make this directive available to the template with the name &quot;upper&quot;
@@ -181,7 +189,7 @@ public class UpperDirective implements TemplateDirectiveModel {
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">root.put(&quot;upper&quot;, new com.example.UpperDirective());</pre></div>
+<pre class="code-block code-unspecified">root.put(&quot;upper&quot;, new com.example.UpperDirective());</pre>
 
           <p>But typically it is better practice to put commonly used
           directives into the <code class="inline-code">Configuration</code> as <a href="pgui_config_sharedvariables.html">shared
@@ -195,13 +203,13 @@ public class UpperDirective implements TemplateDirectiveModel {
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Maybe you have directives that you have implemented in FTL --&gt;
+<pre class="code-block code-template">&lt;#-- Maybe you have directives that you have implemented in FTL --&gt;
 &lt;#macro something&gt;
   ...
 &lt;/#macro&gt;
 
 &lt;#-- Now you can&#39;t use &lt;#macro upper&gt;, but instead you can: --&gt;
-&lt;#assign upper = &quot;com.example.UpperDirective&quot;?new()&gt;</pre></div>
+&lt;#assign upper = &quot;com.example.UpperDirective&quot;?new()&gt;</pre>
         
           
 
@@ -218,7 +226,7 @@ public class UpperDirective implements TemplateDirectiveModel {
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x = 1&gt;
+<pre class="code-block code-template">&lt;#assign x = 1&gt;
 
 <strong>&lt;@repeat count=4&gt;</strong>
   Test ${x}
@@ -231,13 +239,13 @@ public class UpperDirective implements TemplateDirectiveModel {
 
 <strong>&lt;@repeat count=3; cnt&gt;</strong>
   ${cnt}. Test
-<strong>&lt;/@repeat&gt;</strong></pre></div>
+<strong>&lt;/@repeat&gt;</strong></pre>
 
           <p>Output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  Test 1
+<pre class="code-block code-output">  Test 1
   Test 2
   Test 3
   Test 4
@@ -249,13 +257,13 @@ public class UpperDirective implements TemplateDirectiveModel {
   1. Test
   2. Test
   3. Test
- </pre></div>
+ </pre>
 
           <p>The class:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example;
+<pre class="code-block code-unspecified">package com.example;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Iterator;
@@ -381,7 +389,7 @@ public class RepeatDirective implements TemplateDirectiveModel {
         }
     }
 
-}</pre></div>
+}</pre>
         
           
 
@@ -404,7 +412,7 @@ public class RepeatDirective implements TemplateDirectiveModel {
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_datamodel_method.html b/docs/pgui_datamodel_method.html
index 68a9269..46787ba 100644
--- a/docs/pgui_datamodel_method.html
+++ b/docs/pgui_datamodel_method.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_datamodel_method.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Data Model","Methods"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_datamodel_parent.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel_directive.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_datamodel_method" itemprop="headline">Methods</h1>
@@ -59,7 +67,7 @@ ga('send', 'pageview');
         second string of the first occurrence of the first string, or -1 if
         the second string doesn&#39;t contains the first.</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">public class IndexOfMethod implements TemplateMethodModel {
+<pre class="code-block code-unspecified">public class IndexOfMethod implements TemplateMethodModel {
 
     public TemplateModel exec(List args) throws TemplateModelException {
         if (args.size() != 2) {
@@ -68,22 +76,22 @@ ga('send', 'pageview');
         return new SimpleNumber(
             ((String) args.get(1)).indexOf((String) args.get(0)));
     }
-}</pre></div><p>If you put an instance of this, say, into the root:</p>
+}</pre><p>If you put an instance of this, say, into the root:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">root.put(&quot;indexOf&quot;, new IndexOfMethod());</pre></div><p>then you can call it in the template:</p>
+<pre class="code-block code-unspecified">root.put(&quot;indexOf&quot;, new IndexOfMethod());</pre><p>then you can call it in the template:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x = &quot;something&quot;&gt;
+<pre class="code-block code-template">&lt;#assign x = &quot;something&quot;&gt;
 ${indexOf(&quot;met&quot;, x)}
-${indexOf(&quot;foo&quot;, x)}</pre></div><p>and then the output will be:</p>
+${indexOf(&quot;foo&quot;, x)}</pre><p>and then the output will be:</p>
 
-<div class="code-wrapper"><pre class="code-block code-output">2
--1</pre></div><p>If you need to access the runtime FTL environment (read/write
+<pre class="code-block code-output">2
+-1</pre><p>If you need to access the runtime FTL environment (read/write
         variables, get the current locale, etc.), you can get it with
         <code class="inline-code">Environment.getCurrentEnvironment()</code>.</p><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_datamodel_parent.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel_directive.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_datamodel_node.html b/docs/pgui_datamodel_node.html
index 86337cf..051081e 100644
--- a/docs/pgui_datamodel_node.html
+++ b/docs/pgui_datamodel_node.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_datamodel_node.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Data Model","Node variables"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_datamodel_directive.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel_objectWrapper.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_datamodel_node" itemprop="headline">Node variables</h1>
@@ -116,7 +124,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_datamodel_objectWrapper.html b/docs/pgui_datamodel_objectWrapper.html
index 6136d23..9ed6d48 100644
--- a/docs/pgui_datamodel_objectWrapper.html
+++ b/docs/pgui_datamodel_objectWrapper.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_datamodel_objectWrapper.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Data Model","Object wrappers"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_datamodel_node.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_datamodel_objectWrapper" itemprop="headline">Object wrappers</h1>
@@ -196,7 +204,7 @@ ga('send', 'pageview');
 
                       
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">... = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_27).build()</pre></div>
+<pre class="code-block code-unspecified">... = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_27).build()</pre>
                     </li>
 
                     <li>
@@ -204,7 +212,7 @@ ga('send', 'pageview');
 
                       
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">... = new DefaultObjectWrapper(Configuration.VERSION_2_3_27)</pre></div>
+<pre class="code-block code-unspecified">... = new DefaultObjectWrapper(Configuration.VERSION_2_3_27)</pre>
                     </li>
 
                     <li>
@@ -215,7 +223,7 @@ ga('send', 'pageview');
 
                       
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">object_wrapper=DefaultObjectWrapper(2.3.27)</pre></div>
+<pre class="code-block code-unspecified">object_wrapper=DefaultObjectWrapper(2.3.27)</pre>
                     </li>
 
                     <li>
@@ -227,10 +235,10 @@ ga('send', 'pageview');
 
                       
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">&lt;init-param&gt;
+<pre class="code-block code-unspecified">&lt;init-param&gt;
     &lt;param-name&gt;object_wrapper&lt;/param-name&gt;
     &lt;param-value&gt;DefaultObjectWrapper(2.3.27)&lt;/param-value&gt;
-&lt;/init-param&gt;</pre></div>
+&lt;/init-param&gt;</pre>
                     </li>
                   </ul>
                 </li>
@@ -277,13 +285,13 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example.myapp;
+<pre class="code-block code-unspecified">package com.example.myapp;
 
 public class Tupple&lt;E1, E2&gt; {
     public Tupple(E1 e1, E2 e2) { ... }
     public E1 getE1() { ... }
     public E2 getE2() { ... }
-}</pre></div>
+}</pre>
 
           <p>You want templates to see this as a sequence of length 2, so
           that you can do things like <code class="inline-code">someTupple[1]</code>,
@@ -296,7 +304,7 @@ public class Tupple&lt;E1, E2&gt; {
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example.myapp.freemarker;
+<pre class="code-block code-unspecified">package com.example.myapp.freemarker;
 
 ...
 
@@ -329,7 +337,7 @@ public class TuppleAdapter extends WrappingTemplateModel implements TemplateSequ
         return tupple;
     }
 
-}</pre></div>
+}</pre>
 
           <p>Regarding the classes and interfaces:</p>
 
@@ -363,7 +371,7 @@ public class TuppleAdapter extends WrappingTemplateModel implements TemplateSequ
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">package com.example.myapp.freemarker;
+<pre class="code-block code-unspecified">package com.example.myapp.freemarker;
 
 ...
 
@@ -382,17 +390,17 @@ public class MyAppObjectWrapper extends DefaultObjectWrapper {
         return super.handleUnknownType(obj);
     }
 
-}</pre></div>
+}</pre>
 
           <p>and then where you configure FreeMarker (<a href="pgui_config.html">about configuring, see here...</a>) we plug
           our object wrapper in:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Where you initialize the cfg *singleton* (happens just once in the application life-cycle):
+<pre class="code-block code-unspecified">// Where you initialize the cfg *singleton* (happens just once in the application life-cycle):
 cfg = new Configuration(Configuration.VERSION_2_3_27);
 ...
-cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements()));</pre></div>
+cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements()));</pre>
 
           <p>or if you are configuring FreeMarker with
           <code class="inline-code">java.util.Properties</code> instead (and let&#39;s say it&#39;s
@@ -400,12 +408,12 @@ cfg.setObjectWrapper(new MyAppObjectWrapper(cfg.getIncompatibleImprovements()));
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">object_wrapper=com.example.myapp.freemarker.MyAppObjectWrapper(2.3.27)</pre></div>
+<pre class="code-block code-unspecified">object_wrapper=com.example.myapp.freemarker.MyAppObjectWrapper(2.3.27)</pre>
         <div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_datamodel_node.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_config.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_datamodel_parent.html b/docs/pgui_datamodel_parent.html
index 3cfe923..61d0000 100644
--- a/docs/pgui_datamodel_parent.html
+++ b/docs/pgui_datamodel_parent.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_datamodel_parent.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Data Model","Containers"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_datamodel_scalar.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel_method.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_datamodel_parent" itemprop="headline">Containers</h1>
@@ -122,7 +130,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_datamodel_scalar.html b/docs/pgui_datamodel_scalar.html
index b76b789..178cf3e 100644
--- a/docs/pgui_datamodel_scalar.html
+++ b/docs/pgui_datamodel_scalar.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_datamodel_scalar.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","The Data Model","Scalars"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_datamodel_basics.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel_parent.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_datamodel_scalar" itemprop="headline">Scalars</h1>
@@ -147,7 +155,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc.html b/docs/pgui_misc.html
index 78b8121..77acdef 100644
--- a/docs/pgui_misc.html
+++ b/docs/pgui_misc.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_config_incompatible_improvements.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_var.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="pgui_misc" itemprop="headline">Miscellaneous</h1>
@@ -48,7 +56,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_ant.html b/docs/pgui_misc_ant.html
index 950df01..6b1fc96 100644
--- a/docs/pgui_misc_ant.html
+++ b/docs/pgui_misc_ant.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_ant.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Using FreeMarker with Ant"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_xml_legacy.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_jythonwrapper.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_ant" itemprop="headline">Using FreeMarker with Ant</h1>
@@ -81,13 +89,13 @@ ga('send', 'pageview');
         documents generated into directory &quot;html&quot;. You would write something
         like:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">&lt;taskdef name=&quot;freemarker&quot; classname=&quot;freemarker.ext.ant.FreemarkerXmlTask&quot;&gt;
+<pre class="code-block code-unspecified">&lt;taskdef name=&quot;freemarker&quot; classname=&quot;freemarker.ext.ant.FreemarkerXmlTask&quot;&gt;
   &lt;classpath&gt;
     &lt;pathelement location=&quot;freemarker.jar&quot; /&gt;
   &lt;/classpath&gt;
 &lt;/taskdef&gt;
 &lt;mkdir dir=&quot;html&quot; /&gt;
-&lt;freemarker basedir=&quot;xml&quot; destdir=&quot;html&quot; includes=&quot;**/*.xml&quot; template=&quot;xml2html.ftl&quot; /&gt;</pre></div><p>The task would invoke the template for every XML document. Every
+&lt;freemarker basedir=&quot;xml&quot; destdir=&quot;html&quot; includes=&quot;**/*.xml&quot; template=&quot;xml2html.ftl&quot; /&gt;</pre><p>The task would invoke the template for every XML document. Every
         document would be parsed into a DOM tree, then wrapped as a FreeMarker
         node variable. When template processing begins, the special variable,
         <code class="inline-code">.node</code>, is set to the root node of the XML
@@ -104,7 +112,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_beanwrapper.html b/docs/pgui_misc_beanwrapper.html
index 2d6e192..85ae2dc 100644
--- a/docs/pgui_misc_beanwrapper.html
+++ b/docs/pgui_misc_beanwrapper.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_beanwrapper.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Bean wrapper"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_multithreading.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_logging.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_beanwrapper" itemprop="headline">Bean wrapper</h1>
@@ -545,10 +553,10 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
+<pre class="code-block code-unspecified">BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
 TemplateHashModel staticModels = wrapper.getStaticModels();
 TemplateHashModel fileStatics =
-    (TemplateHashModel) staticModels.get(&quot;java.io.File&quot;);</pre></div>
+    (TemplateHashModel) staticModels.get(&quot;java.io.File&quot;);</pre>
 
           <p>And you will get a template hash model that exposes all static
           methods and static fields (both final and non-final) of the
@@ -557,7 +565,7 @@ TemplateHashModel fileStatics =
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">root.put(&quot;File&quot;, fileStatics);</pre></div>
+<pre class="code-block code-unspecified">root.put(&quot;File&quot;, fileStatics);</pre>
 
           <p>From now on, you can use <code class="inline-code">${File.SEPARATOR}</code>
           to insert the file separator character into your template, or you
@@ -565,7 +573,7 @@ TemplateHashModel fileStatics =
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list File.listRoots() as fileSystemRoot&gt;...&lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#list File.listRoots() as fileSystemRoot&gt;...&lt;/#list&gt;</pre>
 
           <p>Of course, you must be aware of the potential security issues
           this model brings.</p>
@@ -576,7 +584,7 @@ TemplateHashModel fileStatics =
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">root.put(&quot;statics&quot;, BeansWrapper.getDefaultInstance().getStaticModels());</pre></div>
+<pre class="code-block code-unspecified">root.put(&quot;statics&quot;, BeansWrapper.getDefaultInstance().getStaticModels());</pre>
 
           <p>This object exposes just about any class&#39; static methods if
           it&#39;s used as a hash with class name as the key. You can then use
@@ -612,10 +620,10 @@ TemplateHashModel fileStatics =
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
+<pre class="code-block code-unspecified">BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
 TemplateHashModel enumModels = wrapper.getEnumModels();
 TemplateHashModel roundingModeEnums =
-    (TemplateHashModel) enumModels.get(&quot;java.math.RoundingMode&quot;);</pre></div>
+    (TemplateHashModel) enumModels.get(&quot;java.math.RoundingMode&quot;);</pre>
 
           <p>And you will get a template hash model that exposes all enum
           values of the <code class="inline-code">java.math.RoundingMode</code> class as
@@ -624,7 +632,7 @@ TemplateHashModel roundingModeEnums =
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">root.put(&quot;RoundingMode&quot;, roundingModeEnums);</pre></div>
+<pre class="code-block code-unspecified">root.put(&quot;RoundingMode&quot;, roundingModeEnums);</pre>
 
           <p>From now on, you can use <code class="inline-code">RoundingMode.UP</code> as
           an expression to reference the <code class="inline-code">UP</code> enum value in
@@ -636,7 +644,7 @@ TemplateHashModel roundingModeEnums =
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">root.put(&quot;enums&quot;, BeansWrapper.getDefaultInstance().getEnumModels());</pre></div>
+<pre class="code-block code-unspecified">root.put(&quot;enums&quot;, BeansWrapper.getDefaultInstance().getEnumModels());</pre>
 
           <p>This object exposes any enum class if it&#39;s used as a hash with
           class name as the key. You can then use expression like
@@ -658,7 +666,7 @@ TemplateHashModel roundingModeEnums =
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_charset.html b/docs/pgui_misc_charset.html
index 9ffc569..125ea87 100644
--- a/docs/pgui_misc_charset.html
+++ b/docs/pgui_misc_charset.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_charset.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Charset issues"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_var.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_multithreading.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_charset" itemprop="headline">Charset issues</h1>
@@ -157,15 +165,15 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Writer w = new OutputStreamWriter(out, outputCharset);
+<pre class="code-block code-unspecified">Writer w = new OutputStreamWriter(out, outputCharset);
 Environment env = template.createProcessingEnvironment(dataModel, w);
 env.setOutputEncoding(outputCharset);
-env.process();</pre></div>
+env.process();</pre>
         <div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_misc_var.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_multithreading.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_jythonwrapper.html b/docs/pgui_misc_jythonwrapper.html
index e24b3fa..63916e7 100644
--- a/docs/pgui_misc_jythonwrapper.html
+++ b/docs/pgui_misc_jythonwrapper.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_jythonwrapper.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Jython wrapper"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_ant.html"><span>Previous</span></a><a class="paging-arrow next" href="ref.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_jythonwrapper" itemprop="headline">Jython wrapper</h1>
@@ -48,7 +56,7 @@ ga('send', 'pageview');
         <code class="inline-code">TemplateModel</code>. In the very basic case, you only
         need to call the</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">public TemplateModel wrap(Object obj);</pre></div><p>method of the
+<pre class="code-block code-unspecified">public TemplateModel wrap(Object obj);</pre><p>method of the
         <code class="inline-code">freemarker.ext.jython.JythonWrapper</code> class. This
         method will wrap the passed object into an appropriate
         <code class="inline-code">TemplateModel</code>. Below is a summary of the properties
@@ -126,7 +134,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_logging.html b/docs/pgui_misc_logging.html
index 6d2dc66..43a6159 100644
--- a/docs/pgui_misc_logging.html
+++ b/docs/pgui_misc_logging.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_logging.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Logging"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_beanwrapper.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_servlet.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_logging" itemprop="headline">Logging</h1>
@@ -100,7 +108,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">java <em>...</em> -Dorg.freemarker.loggerLibrary=SLF4J</pre></div>
+<pre class="code-block code-unspecified">java <em>...</em> -Dorg.freemarker.loggerLibrary=SLF4J</pre>
 
           <p>The supported system property values are:
           <code class="inline-code">SLF4J</code>, <code class="inline-code">CommonsLogging</code>,
@@ -242,7 +250,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_multithreading.html b/docs/pgui_misc_multithreading.html
index 57fcd32..39dad0b 100644
--- a/docs/pgui_misc_multithreading.html
+++ b/docs/pgui_misc_multithreading.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_multithreading.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Multithreading"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_charset.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_beanwrapper.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_multithreading" itemprop="headline">Multithreading</h1>
@@ -66,7 +74,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_secureenv.html b/docs/pgui_misc_secureenv.html
index 09d6e1a..6aae2d5 100644
--- a/docs/pgui_misc_secureenv.html
+++ b/docs/pgui_misc_secureenv.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_secureenv.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Configuring security policy for FreeMarker"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_servlet.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_xml_legacy.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_secureenv" itemprop="headline">Configuring security policy for FreeMarker</h1>
@@ -47,38 +55,38 @@ ga('send', 'pageview');
         your security policy file for
         <code class="inline-code">freemarker.jar</code>:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">grant codeBase &quot;file:/path/to/freemarker.jar&quot;
+<pre class="code-block code-unspecified">grant codeBase &quot;file:/path/to/freemarker.jar&quot;
 {
   permission java.util.PropertyPermission &quot;file.encoding&quot;, &quot;read&quot;;
   permission java.util.PropertyPermission &quot;freemarker.*&quot;, &quot;read&quot;;
-}</pre></div><p>Additionally, if you are loading templates from a directory, you
+}</pre><p>Additionally, if you are loading templates from a directory, you
         need to give FreeMarker permissions to read files from that directory
         using the following permission:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">grant codeBase &quot;file:/path/to/freemarker.jar&quot;
+<pre class="code-block code-unspecified">grant codeBase &quot;file:/path/to/freemarker.jar&quot;
 {
   ...
   permission java.io.FilePermission &quot;/path/to/templates/-&quot;, &quot;read&quot;;
-}</pre></div><p>Finally, if you&#39;re just using the default template loading
+}</pre><p>Finally, if you&#39;re just using the default template loading
         mechanism which loads templates from the current directory, then
         specify these permissions additionally: (note that the expression
         <code class="inline-code">${user.dir}</code> will be evaluated at run time by the
         policy interpreter, pretty much as if it were a FreeMarker
         template)</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">
+<pre class="code-block code-unspecified">
 grant codeBase &quot;file:/path/to/freemarker.jar&quot;
 {
   ...
   permission java.util.PropertyPermission &quot;user.dir&quot;, &quot;read&quot;;
   permission java.io.FilePermission &quot;${user.dir}/-&quot;, &quot;read&quot;;
-}</pre></div><p>Naturally, if you&#39;re running under Windows, use double backslash
+}</pre><p>Naturally, if you&#39;re running under Windows, use double backslash
         instead of a single slash for separating directory components in
         paths.</p><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_misc_servlet.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_xml_legacy.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_servlet.html b/docs/pgui_misc_servlet.html
index 81f3dc0..fcff312 100644
--- a/docs/pgui_misc_servlet.html
+++ b/docs/pgui_misc_servlet.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_servlet.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Using FreeMarker with servlets"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_logging.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_secureenv.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_servlet" itemprop="headline">Using FreeMarker with servlets</h1>
@@ -101,7 +109,7 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">&lt;servlet&gt;
+<pre class="code-block code-unspecified">&lt;servlet&gt;
   &lt;servlet-name&gt;freemarker&lt;/servlet-name&gt;
   &lt;servlet-class&gt;<strong>freemarker.ext.servlet.FreemarkerServlet</strong>&lt;/servlet-class&gt;
 
@@ -198,7 +206,7 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
   &lt;auth-constraint&gt;
     &lt;!-- Nobody is allowed to visit these directly. --&gt;
   &lt;/auth-constraint&gt;
-&lt;/security-constraint&gt;</pre></div>
+&lt;/security-constraint&gt;</pre>
 
           <p>After this, you can use FTL files (<code class="inline-code">*.ftl</code>)
           in the same manner as JSP (<code class="inline-code">*.jsp</code>) files. (Of
@@ -230,7 +238,7 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;%@ taglib uri=&quot;/WEB-INF/struts-bean.tld&quot; prefix=&quot;bean&quot; %&gt;
+<pre class="code-block code-template">&lt;%@ taglib uri=&quot;/WEB-INF/struts-bean.tld&quot; prefix=&quot;bean&quot; %&gt;
 &lt;%@ taglib uri=&quot;/WEB-INF/struts-logic.tld&quot; prefix=&quot;logic&quot; %&gt;
 
 &lt;html&gt;
@@ -245,14 +253,14 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
     &lt;/logic:iterate&gt;
   &lt;/ul&gt;
 &lt;/body&gt;
-&lt;/html&gt;</pre></div>
+&lt;/html&gt;</pre>
 
           <p>you can use this FTL file (use <code class="inline-code">ftl</code> file
           extension instead of <code class="inline-code">jsp</code>):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;html&gt;
+<pre class="code-block code-template">&lt;html&gt;
 &lt;head&gt;&lt;title&gt;Acmee Products International&lt;/title&gt;
 &lt;body&gt;
   &lt;h1&gt;Hello ${user}!&lt;/h1&gt;
@@ -263,7 +271,7 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
     &lt;/#list&gt;
   &lt;/ul&gt;
 &lt;/body&gt;
-&lt;/html&gt;</pre></div>
+&lt;/html&gt;</pre>
 
             <div class="callout warning">
     <strong class="callout-label">Warning!</strong>
@@ -284,17 +292,17 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- WRONG: --&gt;
+<pre class="code-block code-template">&lt;#-- WRONG: --&gt;
 &lt;@my.jspTag color=&quot;${aVariable}&quot; name=&quot;aStringLiteral&quot;
-            width=&quot;100&quot; height=${a+b} /&gt;</pre></div>
+            width=&quot;100&quot; height=${a+b} /&gt;</pre>
 
             <p>and this is good:</p>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Good: --&gt;
+<pre class="code-block code-template">&lt;#-- Good: --&gt;
 &lt;@my.jspTag color=aVariable name=&quot;aStringLiteral&quot;
-            width=100 height=a+b /&gt;</pre></div>
+            width=100 height=a+b /&gt;</pre>
             </div>
 
 
@@ -372,13 +380,13 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@include_page path=&quot;path/to/some.jsp&quot;/&gt;</pre></div>
+<pre class="code-block code-template">&lt;@include_page path=&quot;path/to/some.jsp&quot;/&gt;</pre>
 
           <p>is identical to using this tag in JSP:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;jsp:include page=&quot;path/to/some.jsp&quot;&gt;</pre></div>
+<pre class="code-block code-template">&lt;jsp:include page=&quot;path/to/some.jsp&quot;&gt;</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -432,7 +440,7 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@include_page path=&quot;path/to/some.jsp&quot; inherit_params=true params={&quot;foo&quot;: &quot;99&quot;, &quot;bar&quot;: [&quot;a&quot;, &quot;b&quot;]}/&gt;</pre></div>
+<pre class="code-block code-template">&lt;@include_page path=&quot;path/to/some.jsp&quot; inherit_params=true params={&quot;foo&quot;: &quot;99&quot;, &quot;bar&quot;: [&quot;a&quot;, &quot;b&quot;]}/&gt;</pre>
 
           <p>This will include the page
           <code class="inline-code">path/to/some.jsp</code>, pass it all request parameters
@@ -477,7 +485,7 @@ resources</a></li><li><a class="page-menu-link" href="#autoid_63" data-menu-targ
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;%@ page contentType=&quot;text/html;charset=ISO-8859-2&quot; language=&quot;java&quot;%&gt;
+<pre class="code-block code-template">&lt;%@ page contentType=&quot;text/html;charset=ISO-8859-2&quot; language=&quot;java&quot;%&gt;
 &lt;%@ taglib prefix=&quot;e&quot; uri=&quot;/WEB-INF/example.tld&quot; %&gt;
 &lt;%@ taglib prefix=&quot;oe&quot; uri=&quot;/WEB-INF/other-example.tld&quot; %&gt;
 &lt;%@ taglib prefix=&quot;c&quot; uri=&quot;http://java.sun.com/jsp/jstl/core&quot; %&gt;
@@ -513,13 +521,13 @@ ${e:someELFunction(1, 2)}
   ${person.name}
 &lt;/c:forEach&gt;
 
-${fn:trim(bar)}</pre></div>
+${fn:trim(bar)}</pre>
 
           <p>the about equivalent FTL is:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign e=JspTaglibs[&quot;/WEB-INF/example.tld&quot;]&gt;
+<pre class="code-block code-template">&lt;#assign e=JspTaglibs[&quot;/WEB-INF/example.tld&quot;]&gt;
 &lt;#assign oe=JspTaglibs[&quot;/WEB-INF/other-example.tld&quot;]&gt;
 
 &lt;#-- Custom JSP tags and functions: --#&gt;
@@ -549,7 +557,7 @@ ${e.someELFunction(1, 2)}
   ${person.name}
 &lt;/#list&gt;
 
-${bar?trim}</pre></div>
+${bar?trim}</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -628,9 +636,9 @@ ${bar?trim}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">&lt;listener&gt;
+<pre class="code-block code-unspecified">&lt;listener&gt;
   &lt;listener-class&gt;freemarker.ext.jsp.EventForwarding&lt;/listener-class&gt;
-&lt;/listener&gt;</pre></div>
+&lt;/listener&gt;</pre>
 
           <p>Note that you can use JSP taglibs with FreeMarker even if the
           servlet container has no native JSP support, just make sure that the
@@ -684,7 +692,7 @@ ${bar?trim}</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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_var.html b/docs/pgui_misc_var.html
index 51f49a0..4e132f1 100644
--- a/docs/pgui_misc_var.html
+++ b/docs/pgui_misc_var.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_var.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Variables, scopes"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_charset.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_var" itemprop="headline">Variables, scopes</h1>
@@ -106,7 +114,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_misc_xml_legacy.html b/docs/pgui_misc_xml_legacy.html
index c4ab900..697a10a 100644
--- a/docs/pgui_misc_xml_legacy.html
+++ b/docs/pgui_misc_xml_legacy.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_misc_xml_legacy.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Miscellaneous","Legacy XML wrapper implementation"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_secureenv.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_misc_ant.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_misc_xml_legacy" itemprop="headline">Legacy XML wrapper implementation</h1>
@@ -96,7 +104,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign thirdChapter = xmldoc.book.chapter[2]&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign thirdChapter = xmldoc.book.chapter[2]&gt;</pre>
         
           
 
@@ -450,7 +458,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign firstChapter=xmldoc(&quot;//chapter[first()]&quot;)&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign firstChapter=xmldoc(&quot;//chapter[first()]&quot;)&gt;</pre>
         
           
 
@@ -465,13 +473,13 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">public void registerNamespace(String prefix, String uri);</pre></div>
+<pre class="code-block code-unspecified">public void registerNamespace(String prefix, String uri);</pre>
 
           <p>method, or inside a template using the</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${<em>nodelist</em>._registerNamespace(<em>prefix</em>, <em>uri</em>)}</pre></div>
+<pre class="code-block code-template">${<em>nodelist</em>._registerNamespace(<em>prefix</em>, <em>uri</em>)}</pre>
 
           <p>syntax. From there on, you can refer to children elements in
           the namespace denoted by the particular URI through the
@@ -498,7 +506,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_quickstart.html b/docs/pgui_quickstart.html
index f3f6d26..f686ca8 100644
--- a/docs/pgui_quickstart.html
+++ b/docs/pgui_quickstart.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_quickstart.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Getting Started"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_quickstart_createconfiguration.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="pgui_quickstart" itemprop="headline">Getting Started</h1>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_quickstart_all.html b/docs/pgui_quickstart_all.html
index 1e7da6a..675973f 100644
--- a/docs/pgui_quickstart_all.html
+++ b/docs/pgui_quickstart_all.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_quickstart_all.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Getting Started","Putting all together"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_quickstart_merge.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_quickstart_all" itemprop="headline">Putting all together</h1>
@@ -45,7 +53,7 @@ ga('send', 'pageview');
         fragments. Don&#39;t forget to put <code class="inline-code">freemarker.jar</code> into
         the <code class="inline-code">CLASSPATH</code>.</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">import freemarker.template.*;
+<pre class="code-block code-unspecified">import freemarker.template.*;
 import java.util.*;
 import java.io.*;
 
@@ -86,7 +94,7 @@ public class Test {
         // Note: Depending on what `out` is, you may need to call `out.close()`.
         // This is usually the case for file output, but not for servlet output.
     }
-}</pre></div>  <div class="callout note">
+}</pre>  <div class="callout note">
     <strong class="callout-label">Note:</strong>
 
           <p>I have suppressed the exceptions for the sake of simplicity.
@@ -95,7 +103,7 @@ public class Test {
 <p>For the sake completeness, here&#39;s the the Product class used in
         the data model:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">/**
+<pre class="code-block code-unspecified">/**
  * Product bean; note that it must be a public class!
  */
 public class Product {
@@ -123,9 +131,9 @@ public class Product {
         this.name = name;
     }
 
-}</pre></div><p>and the template:</p>
+}</pre><p>and the template:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;html&gt;
+<pre class="code-block code-template">&lt;html&gt;
 &lt;head&gt;
   &lt;title&gt;Welcome!&lt;/title&gt;
 &lt;/head&gt;
@@ -134,11 +142,11 @@ public class Product {
   &lt;p&gt;Our latest product:
   &lt;a href=&quot;${latestProduct.url}&quot;&gt;${latestProduct.name}&lt;/a&gt;!
 &lt;/body&gt;
-&lt;/html&gt;</pre></div><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_quickstart_merge.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel.html"><span>Next</span></a></div></div></div></div>      </div>
+&lt;/html&gt;</pre><div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="pgui_quickstart_merge.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_datamodel.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_quickstart_createconfiguration.html b/docs/pgui_quickstart_createconfiguration.html
index 849c0ef..4f2f0fc 100644
--- a/docs/pgui_quickstart_createconfiguration.html
+++ b/docs/pgui_quickstart_createconfiguration.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_quickstart_createconfiguration.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Getting Started","Create a configuration instance"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_quickstart.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_quickstart_createdatamodel.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_quickstart_createconfiguration" itemprop="headline">Create a configuration instance</h1>
@@ -50,7 +58,7 @@ ga('send', 'pageview');
         <code class="inline-code">Template</code> objects).</p><p>Normally you will <em>do this only once</em> at the
         beginning of the application (possibly servlet) life-cycle:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Create your Configuration instance, and specify if up to what FreeMarker
+<pre class="code-block code-unspecified">// Create your Configuration instance, and specify if up to what FreeMarker
 // version (here 2.3.29) do you want to apply the fixes that are not 100%
 // backward-compatible. See the Configuration JavaDoc for details.
 Configuration cfg = new Configuration(Configuration.VERSION_2_3_29);
@@ -77,7 +85,7 @@ cfg.setLogTemplateExceptions(false);
 cfg.setWrapUncheckedExceptions(true);
 
 // Do not fall back to higher scopes when reading a null loop variable:
-cfg.setFallbackOnNullLoopVariable(false);</pre></div><p>From now you should use this <em>single</em>
+cfg.setFallbackOnNullLoopVariable(false);</pre><p>From now you should use this <em>single</em>
         configuration instance (i.e., its a singleton). Note however that if a
         system has multiple independent components that use FreeMarker, then
         of course they will use their own private
@@ -102,7 +110,7 @@ cfg.setFallbackOnNullLoopVariable(false);</pre></div><p>From now you should use
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_quickstart_createdatamodel.html b/docs/pgui_quickstart_createdatamodel.html
index cd6c82b..32945b2 100644
--- a/docs/pgui_quickstart_createdatamodel.html
+++ b/docs/pgui_quickstart_createdatamodel.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_quickstart_createdatamodel.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Getting Started","Create a data-model"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_quickstart_createconfiguration.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_quickstart_gettemplate.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_quickstart_createdatamodel" itemprop="headline">Create a data-model</h1>
@@ -84,7 +92,7 @@ ga('send', 'pageview');
         </ul><p>For example, let&#39;s build the data-model of the <a href="dgui_quickstart_basics.html#example.first">first example of the Template Author&#39;s
         Guide</a>. For convenience, here it is again:</p>
 
-<div class="code-wrapper"><pre class="code-block code-data-model">(root)
+<pre class="code-block code-data-model">(root)
   |
   +- user = &quot;Big Joe&quot;
   |
@@ -92,9 +100,9 @@ ga('send', 'pageview');
       |
       +- url = &quot;products/greenmouse.html&quot;
       |
-      +- name = &quot;green mouse&quot;</pre></div><p>This Java code fragment that builds this data-model:</p>
+      +- name = &quot;green mouse&quot;</pre><p>This Java code fragment that builds this data-model:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">// Create the root hash. We use a Map here, but it could be a JavaBean too.
+<pre class="code-block code-unspecified">// Create the root hash. We use a Map here, but it could be a JavaBean too.
 Map&lt;String, Object&gt; root = new HashMap&lt;&gt;();
 
 // Put string &quot;user&quot; into the root
@@ -105,14 +113,14 @@ Product latest = new Product();
 latest.setUrl(&quot;products/greenmouse.html&quot;);
 latest.setName(&quot;green mouse&quot;);
 // and put it into the root
-root.put(&quot;latestProduct&quot;, latest);</pre></div><p>As demonstrated above, for hashes (something that stores other
+root.put(&quot;latestProduct&quot;, latest);</pre><p>As demonstrated above, for hashes (something that stores other
         named items) you can use either a <code class="inline-code">Map</code> or any kind
         of public class that has public
         <code class="inline-code">get<em class="code-color">Xxx</em></code>/<code class="inline-code">is<em class="code-color">Xxx</em></code>
         methods as prescribed by the JavaBeans specification. Like the above
         <code class="inline-code">Product</code> class could be something like:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">/**
+<pre class="code-block code-unspecified">/**
  * Product bean; note that it must be a public class!
  */
 public class Product {
@@ -140,7 +148,7 @@ public class Product {
         this.name = name;
     }
 
-}</pre></div><p>Regardless if <code class="inline-code">latestProduct</code> is a
+}</pre><p>Regardless if <code class="inline-code">latestProduct</code> is a
         <code class="inline-code">Map</code> that contains the <code class="inline-code">&quot;name&quot;</code> and
         <code class="inline-code">&quot;url&quot;</code> keys, or it&#39;s a JavaBean as shown above, in
         the template you can use <code class="inline-code">${latestProduct.name}</code>. The
@@ -163,7 +171,7 @@ public class Product {
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_quickstart_gettemplate.html b/docs/pgui_quickstart_gettemplate.html
index 7c667d2..c54e459 100644
--- a/docs/pgui_quickstart_gettemplate.html
+++ b/docs/pgui_quickstart_gettemplate.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_quickstart_gettemplate.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Getting Started","Get the template"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_quickstart_createdatamodel.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_quickstart_merge.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_quickstart_gettemplate" itemprop="headline">Get the template</h1>
@@ -49,7 +57,7 @@ ga('send', 'pageview');
         <code class="inline-code">test.ftlh</code> file of the <a href="pgui_quickstart_createconfiguration.html">earlier</a> set
         directory, then you can do this:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Template temp = cfg.getTemplate(&quot;test.ftlh&quot;);</pre></div><p>This gives you a <code class="inline-code">Template</code> instance that was
+<pre class="code-block code-unspecified">Template temp = cfg.getTemplate(&quot;test.ftlh&quot;);</pre><p>This gives you a <code class="inline-code">Template</code> instance that was
         created by reading
         <code class="inline-code"><em class="code-color">/where/you/store/templates/</em>test.ftlh</code>
         and parsing it. The <code class="inline-code">Template</code> instance stores the
@@ -63,7 +71,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/pgui_quickstart_merge.html b/docs/pgui_quickstart_merge.html
index 1cd094b..c3922b9 100644
--- a/docs/pgui_quickstart_merge.html
+++ b/docs/pgui_quickstart_merge.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/pgui_quickstart_merge.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="pgui.html"><span itemprop="name">Programmer&#39;s Guide</span></a></li><li  [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Programmer\'s Guide","Getting Started","Merging the template with the data-model"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_quickstart_gettemplate.html"><span>Previous</span></a><a class="paging-arrow next" href="pgui_quickstart_all.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="pgui_quickstart_merge" itemprop="headline">Merging the template with the data-model</h1>
@@ -50,8 +58,8 @@ ga('send', 'pageview');
         <code class="inline-code">Writer</code>. For the sake of simplicity here I write to
         the standard output:</p>
 
-<div class="code-wrapper"><pre class="code-block code-unspecified">Writer out = new OutputStreamWriter(System.out);
-temp.process(root, out);</pre></div><p>This will print to your terminal the output you have seen in the
+<pre class="code-block code-unspecified">Writer out = new OutputStreamWriter(System.out);
+temp.process(root, out);</pre><p>This will print to your terminal the output you have seen in the
         <a href="dgui_quickstart_basics.html#example.first">first example</a> of the Template
         Author&#39;s Guide.</p><p>Java I/O related notes: Depending on what <code class="inline-code">out</code>
         is, you may need to ensure that <code class="inline-code">out.close()</code> is
@@ -71,7 +79,7 @@ temp.process(root, out);</pre></div><p>This will print to your terminal the outp
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref.html b/docs/ref.html
index 0672d22..d36115f 100644
--- a/docs/ref.html
+++ b/docs/ref.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="pgui_misc_jythonwrapper.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-part" id="ref" itemprop="headline">Template Language Reference</h1>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins.html b/docs/ref_builtins.html
index 0f169d5..6f37d09 100644
--- a/docs/ref_builtins.html
+++ b/docs/ref_builtins.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_alphaidx.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-chapter" id="ref_builtins" itemprop="headline">Built-in Reference</h1>
@@ -47,7 +55,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_alphaidx.html b/docs/ref_builtins_alphaidx.html
index 7533e70..b8b0f33 100644
--- a/docs/ref_builtins_alphaidx.html
+++ b/docs/ref_builtins_alphaidx.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_alphaidx.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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>?builtins</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 = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Alphabetical index"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_string.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_alphaidx" itemprop="headline">Alphabetical index</h1>
@@ -541,7 +549,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_boolean.html b/docs/ref_builtins_boolean.html
index 4479238..e561a77 100644
--- a/docs/ref_builtins_boolean.html
+++ b/docs/ref_builtins_boolean.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_boolean.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Built-ins for booleans"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_date.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_sequence.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_boolean" itemprop="headline">Built-ins for booleans</h1>
@@ -195,7 +203,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign foo = true&gt;
+<pre class="code-block code-template">&lt;#assign foo = true&gt;
 ${foo?then(&#39;Y&#39;, &#39;N&#39;)}
 
 &lt;#assign foo = false&gt;
@@ -204,15 +212,15 @@ ${foo?then(&#39;Y&#39;, &#39;N&#39;)}
 &lt;#assign x = 10&gt;
 &lt;#assign y = 20&gt;
 &lt;#-- Prints 100 plus the maximum of x and y: --&gt;
-${100 + (x &gt; y)?then(x, y)}</pre></div>
+${100 + (x &gt; y)?then(x, y)}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Y
+<pre class="code-block code-output">Y
 
 N
 
-120</pre></div>
+120</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -231,7 +239,7 @@ N
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_date.html b/docs/ref_builtins_date.html
index e44fe10..d03d925 100644
--- a/docs/ref_builtins_date.html
+++ b/docs/ref_builtins_date.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_date.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Built-ins for date/time/date-time values"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_number.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_boolean.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_date" itemprop="headline">Built-ins for date/time/date-time values</h1>
@@ -95,28 +103,28 @@ value)</a></li><li><a class="page-menu-link" href="#ref_builtin_date_if_unknown"
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x = openingTime&gt; &lt;#-- no problem can occur here --&gt;
+<pre class="code-block code-template">&lt;#assign x = openingTime&gt; &lt;#-- no problem can occur here --&gt;
 ${openingTime?time} &lt;#-- without ?time it would fail --&gt;
 &lt;#-- For the sake of better understanding, consider this: --&gt;
 &lt;#assign openingTime = openingTime?time&gt;
-${openingTime} &lt;#-- this will work now --&gt;</pre></div>
+${openingTime} &lt;#-- this will work now --&gt;</pre>
 
           <p>These built-ins can also be used to convert date-time values
           to date or time. For example:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">Last updated: ${lastUpdated} &lt;#-- assume that lastUpdated is a date-time value --&gt;
+<pre class="code-block code-template">Last updated: ${lastUpdated} &lt;#-- assume that lastUpdated is a date-time value --&gt;
 Last updated date: ${lastUpdated?date}
-Last updated time: ${lastUpdated?time}</pre></div>
+Last updated time: ${lastUpdated?time}</pre>
 
           <p>will output something like:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Last updated: 04/25/2003 08:00:54 PM
+<pre class="code-block code-output">Last updated: 04/25/2003 08:00:54 PM
 Last updated date: 04/25/2003
-Last updated time: 08:00:54 PM</pre></div>
+Last updated time: 08:00:54 PM</pre>
 
           <p>If the left side of the <code class="inline-code">?</code> is string, then
           these built-ins <a href="ref_builtins_string.html#ref_builtin_string_date">convert
@@ -264,7 +272,7 @@ Last updated time: 08:00:54 PM</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign aDateTime = .now&gt;
+<pre class="code-block code-template">&lt;#assign aDateTime = .now&gt;
 &lt;#assign aDate = aDateTime?date&gt;
 &lt;#assign aTime = aDateTime?time&gt;
 
@@ -278,14 +286,14 @@ ${aTime?iso_utc_ms}
 ${aDateTime?iso_utc_m}
 
 Local time zone:
-${aDateTime?iso_local}</pre></div>
+${aDateTime?iso_local}</pre>
 
           <p>A possible output (depends on current time and time
           zone):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Basic formats:
+<pre class="code-block code-output">Basic formats:
 2011-05-16
 21:32:13Z
 2011-05-16T21:32:13Z
@@ -295,7 +303,7 @@ Different accuracies:
 2011-05-16T21:32Z
 
 Local time zone:
-2011-05-16T23:32:13+02:00</pre></div>
+2011-05-16T23:32:13+02:00</pre>
 
           <p>There is yet another group of <code class="inline-code">iso_...</code>
           built-in variants, where you omit the <code class="inline-code">local</code> or
@@ -304,7 +312,7 @@ Local time zone:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign aDateTime = .now&gt;
+<pre class="code-block code-template">&lt;#assign aDateTime = .now&gt;
 ${aDateTime?iso(&quot;UTC&quot;)}
 ${aDateTime?iso(&quot;GMT-02:30&quot;)}
 ${aDateTime?iso(&quot;Europe/Rome&quot;)}
@@ -312,21 +320,21 @@ ${aDateTime?iso(&quot;Europe/Rome&quot;)}
 The usual variations are supported:
 ${aDateTime?iso_m(&quot;GMT+02&quot;)}
 ${aDateTime?iso_m_nz(&quot;GMT+02&quot;)}
-${aDateTime?iso_nz(&quot;GMT+02&quot;)}</pre></div>
+${aDateTime?iso_nz(&quot;GMT+02&quot;)}</pre>
 
           <p>A possible output (depends on current time and time
           zone):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">2011-05-16T21:43:58Z
+<pre class="code-block code-output">2011-05-16T21:43:58Z
 2011-05-16T19:13:58-02:30
 2011-05-16T23:43:58+02:00
 
 The usual variations are supported:
 2011-05-16T23:43+02:00
 2011-05-16T23:43
-2011-05-16T23:43:58</pre></div>
+2011-05-16T23:43:58</pre>
 
           <p>If the time zone parameter can&#39;t be interpreted, the template
           processing will be terminated with error.</p>
@@ -407,7 +415,7 @@ The usual variations are supported:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Predefined format names: --&gt;
+<pre class="code-block code-template">&lt;#-- Predefined format names: --&gt;
 
 ${openingTime?string.short}
 ${openingTime?string.medium}
@@ -442,13 +450,13 @@ ${lastUpdated?string.xs_ms_nz}
 ${lastUpdated?string[&quot;dd.MM.yyyy, HH:mm&quot;]}
 ${lastUpdated?string[&quot;EEEE, MMMM dd, yyyy, hh:mm a &#39;(&#39;zzz&#39;)&#39;&quot;]}
 ${lastUpdated?string[&quot;EEE, MMM d, &#39;&#39;yy&quot;]}
-${lastUpdated?string.yyyy} &lt;#-- Same as ${lastUpdated?string[&quot;yyyy&quot;]} --&gt;</pre></div>
+${lastUpdated?string.yyyy} &lt;#-- Same as ${lastUpdated?string[&quot;yyyy&quot;]} --&gt;</pre>
 
           <p>will print something like this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">01:45 PM
+<pre class="code-block code-output">01:45 PM
 01:45:09 PM
 01:45:09 PM PST
 01:45:09 PM PST
@@ -478,7 +486,7 @@ Apr/20/2007 13:45
 08.04.2003 21:24
 Tuesday, April 08, 2003, 09:24 PM (PDT)
 Tue, Apr 8, &#39;03
-2003</pre></div>
+2003</pre>
 
           <p>Note that with custom formats like in
           <code class="inline-code">lastUpdated?string.@fileDate</code> above, templates can
@@ -538,7 +546,7 @@ Tue, Apr 8, &#39;03
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_expert.html b/docs/ref_builtins_expert.html
index e698bc8..d7f34f8 100644
--- a/docs/ref_builtins_expert.html
+++ b/docs/ref_builtins_expert.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_expert.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Seldom used and expert built-ins"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_type_independent.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_directives.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_expert" itemprop="headline">Seldom used and expert built-ins</h1>
@@ -85,7 +93,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#--
+<pre class="code-block code-template">&lt;#--
   &lt;@smileyInclude name /&gt; behaves like &lt;#include name&gt;, but prints a &quot;(:&quot; before the
   template, or prints &quot;):&quot; instead if the template is missing.
 
@@ -104,7 +112,7 @@ ga('send', 'pageview');
   &lt;#else&gt;
     ):
   &lt;/#if&gt;
-&lt;/#macro&gt;</pre></div>
+&lt;/#macro&gt;</pre>
         
           
 
@@ -363,17 +371,17 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x=[&quot;a&quot;, &quot;b&quot;, &quot;c&quot;]&gt;
+<pre class="code-block code-template">&lt;#assign x=[&quot;a&quot;, &quot;b&quot;, &quot;c&quot;]&gt;
 &lt;#assign templateSource = r&quot;&lt;#list x as y&gt;${y}&lt;/#list&gt;&quot;&gt;
 &lt;#-- Note: That r was needed so that the ${y} is not interpreted above --&gt;
 &lt;#assign inlineTemplate = templateSource?interpret&gt;
-&lt;@inlineTemplate /&gt;</pre></div>
+&lt;@inlineTemplate /&gt;</pre>
 
           <p>The output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">abc</pre></div>
+<pre class="code-block code-output">abc</pre>
 
           <p>As you can see, <code class="inline-code">inlineTemplate</code> is a
           user-defined directive that, when executed, runs the template whose
@@ -401,7 +409,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign inlineTemplate = [mailTemplateSource, &quot;mail_templates id=${mailTemplateId}&quot;]?interpret&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign inlineTemplate = [mailTemplateSource, &quot;mail_templates id=${mailTemplateId}&quot;]?interpret&gt;</pre>
 
           <p>As you can see, <code class="inline-code">interpret</code> can be applied on
           a sequence of two items, in which case the first item is the FTL
@@ -746,10 +754,10 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Creates an user-defined directive be calling the parameterless constructor of the class --&gt;
+<pre class="code-block code-template">&lt;#-- Creates an user-defined directive be calling the parameterless constructor of the class --&gt;
 &lt;#assign word_wrapp = &quot;com.acmee.freemarker.WordWrapperDirective&quot;?new()&gt;
 &lt;#-- Creates an user-defined directive be calling the constructor with one numerical argument --&gt;
-&lt;#assign word_wrapp_narrow = &quot;com.acmee.freemarker.WordWrapperDirective&quot;?new(40)&gt;</pre></div>
+&lt;#assign word_wrapp_narrow = &quot;com.acmee.freemarker.WordWrapperDirective&quot;?new(40)&gt;</pre>
 
           <p>For more information about how the constructor parameters are
           unwrapped and how overloaded constructor is chosen, read: <a href="pgui_misc_beanwrapper.html">Programmer&#39;s Guide/Miscellaneous/Bean wrapper</a></p>
@@ -801,18 +809,18 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${1305575275540?number_to_datetime}
+<pre class="code-block code-template">${1305575275540?number_to_datetime}
 ${1305575275540?number_to_date}
-${1305575275540?number_to_time}</pre></div>
+${1305575275540?number_to_time}</pre>
 
           <p>The output will be something like this (depending on the
           current locale and time zone):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">May 16, 2011 3:47:55 PM
+<pre class="code-block code-output">May 16, 2011 3:47:55 PM
 May 16, 2011
-3:47:55 PM</pre></div>
+3:47:55 PM</pre>
         
           
 
@@ -864,12 +872,12 @@ May 16, 2011
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Collect all the users into a sequence: --&gt;
+<pre class="code-block code-template">&lt;#-- Collect all the users into a sequence: --&gt;
 &lt;#assign usersSeq = users?sequence&gt;
 
 &lt;#list usersSeq as user&gt;...&lt;/#list&gt;
 Again:
-&lt;#list usersSeq as user&gt;...&lt;/#list&gt;</pre></div>
+&lt;#list usersSeq as user&gt;...&lt;/#list&gt;</pre>
 
           
             
@@ -934,24 +942,24 @@ Again:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro m a b c&gt;a=${a}, b=${b}, c=${c}&lt;/#macro&gt;</pre></div>
+<pre class="code-block code-template">&lt;#macro m a b c&gt;a=${a}, b=${b}, c=${c}&lt;/#macro&gt;</pre>
 
           <p>Normally you call it like:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@m a=1 b=2 c=3 /&gt;</pre></div>
+<pre class="code-block code-template">&lt;@m a=1 b=2 c=3 /&gt;</pre>
 
           <p>Below call does the same, assuming <code class="inline-code">dynArgs</code>
           is the hash <code class="inline-code">{&#39;a&#39;: 1, &#39;b&#39;: 2, &#39;c&#39;: 3}</code>:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@m?with_args(dynArgs) /&gt;</pre></div>
+<pre class="code-block code-template">&lt;@m?with_args(dynArgs) /&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">a=1, b=1, c=1</pre></div>
+<pre class="code-block code-output">a=1, b=1, c=1</pre>
 
           <p>Below call also does the same, but combines dynamic arguments
           from <code class="inline-code">dynArgsAB</code>, assumed to be <code class="inline-code">{&#39;a&#39;: 1,
@@ -960,11 +968,11 @@ Again:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@m?with_args(dynArgsAB) c=3 /&gt;</pre></div>
+<pre class="code-block code-template">&lt;@m?with_args(dynArgsAB) c=3 /&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">a=1, b=1, c=1</pre></div>
+<pre class="code-block code-output">a=1, b=1, c=1</pre>
 
           <p>To understand why this works, you need to realize that macros,
           custom directives, functions, and methods in FreeMarker are just
@@ -991,12 +999,12 @@ Again:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign mWithDefs = m?with_args({&#39;b&#39;: 22, &#39;c&#39;: 33})&gt;
-&lt;@myWithDefs a=1 c=&#39;overridden&#39;/&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign mWithDefs = m?with_args({&#39;b&#39;: 22, &#39;c&#39;: 33})&gt;
+&lt;@myWithDefs a=1 c=&#39;overridden&#39;/&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">a=1, b=22, c=overridden</pre></div>
+<pre class="code-block code-output">a=1, b=22, c=overridden</pre>
 
           <p>Above we have created a new macro based on the value of
           <code class="inline-code">m</code>, stored it in variable
@@ -1017,7 +1025,7 @@ Again:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#function f(a, b, c)&gt;&lt;#return &quot;a=${a}, b=${b}, c=${c}&quot;&gt;&lt;/#function&gt;
+<pre class="code-block code-template">&lt;#function f(a, b, c)&gt;&lt;#return &quot;a=${a}, b=${b}, c=${c}&quot;&gt;&lt;/#function&gt;
 &lt;#assign dynArgs=[1, 2, 3]&gt;
 
 ${f(1, 2, 3)}
@@ -1029,7 +1037,7 @@ or as:
 ${f?with_args([1])(2, 3)}
 
 &lt;#assign fWithOneAsFirstArg = f?with_args([1])&gt;
-${fWithOneAsFirstArg(2, 3)} &lt;#-- same as f(1, 2, 3) --&gt;</pre></div>
+${fWithOneAsFirstArg(2, 3)} &lt;#-- same as f(1, 2, 3) --&gt;</pre>
 
           <p>Note the double application of
           <code class="inline-code">(<em class="code-color">...</em>)</code> above, like in
@@ -1048,7 +1056,7 @@ ${fWithOneAsFirstArg(2, 3)} &lt;#-- same as f(1, 2, 3) --&gt;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro m a b c&gt;a=${a}, b=${b}, c=${c}&lt;/#macro&gt;
+<pre class="code-block code-template">&lt;#macro m a b c&gt;a=${a}, b=${b}, c=${c}&lt;/#macro&gt;
 
 &lt;#-- Called with named parameters: --&gt;
 &lt;@m a=1 b=2 c=3 /&gt;
@@ -1062,7 +1070,7 @@ Same as:
 &lt;@m?with_args([1, 2]) 3 /&gt;
 Same as:
 &lt;#-- Sequence with_args with named c parameter: --&gt;
-&lt;@m?with_args([1, 2]) c=3 /&gt;</pre></div>
+&lt;@m?with_args([1, 2]) c=3 /&gt;</pre>
 
           <p>To summarize, depending on the type of the value
           <code class="inline-code">with_args</code> is applied on, the type of argument to
@@ -1100,7 +1108,7 @@ Same as:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro m1 a b c&gt;
+<pre class="code-block code-template">&lt;#macro m1 a b c&gt;
   m1 does things with ${a}, ${b}, ${c}
 &lt;/#macro&gt;
 
@@ -1110,13 +1118,13 @@ Same as:
   &lt;@m1?with_args(.args) /&gt;
 &lt;/#macro&gt;
 
-&lt;@m2 a=1 b=2 c=3 /&gt;</pre></div>
+&lt;@m2 a=1 b=2 c=3 /&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  m2 does things with 1, 2, 3
+<pre class="code-block code-output">  m2 does things with 1, 2, 3
   Delegate to m1:
-  m1 does things with 1, 2, 3</pre></div>
+  m1 does things with 1, 2, 3</pre>
 
           <p>FreeMarker syntax allows using the name before the
           <code class="inline-code">?with_args(<em class="code-color">...</em>)</code> in the
@@ -1126,7 +1134,7 @@ Same as:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;@myMacro?with_args({&#39;a&#39;: 1})&gt;...&lt;/<strong>@myMacro</strong>&gt;</pre></div>
+<pre class="code-block code-template">&lt;@myMacro?with_args({&#39;a&#39;: 1})&gt;...&lt;/<strong>@myMacro</strong>&gt;</pre>
 
           <p>Note that as far as the order of arguments is concerned,
           arguments coming from
@@ -1161,7 +1169,7 @@ Same as:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#function f a b c d&gt;
+<pre class="code-block code-template">&lt;#function f a b c d&gt;
   &lt;#return &quot;a=${a}, b=${b}, c=${c}, d=${d}&quot;&gt;
 &lt;/#function&gt;
 
@@ -1171,15 +1179,15 @@ with_args:
 ${f?with_args(dynamicArgs)(1, 2)}
 
 with_args_last:
-${f?with_args_last(dynamicArgs)(1, 2)}</pre></div>
+${f?with_args_last(dynamicArgs)(1, 2)}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">with_args:
+<pre class="code-block code-output">with_args:
 a=3, b=4, c=1, d=2
 
 with_args_last:
-a=1, b=2, c=3, d=4</pre></div>
+a=1, b=2, c=3, d=4</pre>
 
           <p>In the case of name arguments, while the primary mean of
           identifying an argument is the its name, catch-all arguments
@@ -1187,7 +1195,7 @@ a=1, b=2, c=3, d=4</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro m a b others...&gt;
+<pre class="code-block code-template">&lt;#macro m a b others...&gt;
   a=${a}
   b=${b}
   others:
@@ -1202,11 +1210,11 @@ with_args:
 &lt;@m?with_args(dynamicArgs) a=1 b=2 c=3 d=4 /&gt;
 
 with_args_last:
-&lt;@m?with_args_last(dynamicArgs) a=1 b=2 c=3 d=4 /&gt;</pre></div>
+&lt;@m?with_args_last(dynamicArgs) a=1 b=2 c=3 d=4 /&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">with_args:
+<pre class="code-block code-output">with_args:
   a=1
   b=2
   others:
@@ -1222,7 +1230,7 @@ with_args_last:
     c = 3
     d = 4
     e = 5
-    f = 6</pre></div>
+    f = 6</pre>
 
           <p>If you specify a named parameter that are not catch-all, so
           they are declared in the <code class="inline-code">macro</code> tag (as
@@ -1233,7 +1241,7 @@ with_args_last:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro m a=0 b=0&gt;
+<pre class="code-block code-template">&lt;#macro m a=0 b=0&gt;
   &lt;#-- We use .args to demonstrate the ordering of a and b: --&gt;
   &lt;#list .args as k, v&gt;
     ${k} = ${v}
@@ -1246,17 +1254,17 @@ with_args:
 &lt;@m?with_args(dynamicArgs) a=1 /&gt;
 
 with_args_last:
-&lt;@m?with_args_last(dynamicArgs) a=1 /&gt;</pre></div>
+&lt;@m?with_args_last(dynamicArgs) a=1 /&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">with_args:
+<pre class="code-block code-output">with_args:
     a = 1
     b = 1
 
 with_args_last:
     a = 1
-    b = 1</pre></div>
+    b = 1</pre>
 
           <p>If both the macro or directive call, and the
           <code class="inline-code">with_args_last</code> argument specifies named catch-all
@@ -1266,7 +1274,7 @@ with_args_last:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#macro m others...&gt;
+<pre class="code-block code-template">&lt;#macro m others...&gt;
   &lt;#list others as k, v&gt;
     ${k} = ${v}
   &lt;/#list&gt;
@@ -1278,11 +1286,11 @@ with_args:
 &lt;@m?with_args(dynamicArgs) a=1 b=2 c=3 /&gt;
 
 with_args_last:
-&lt;@m?with_args_last(dynamicArgs) a=1 b=2 c=3 /&gt;</pre></div>
+&lt;@m?with_args_last(dynamicArgs) a=1 b=2 c=3 /&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">with_args:
+<pre class="code-block code-output">with_args:
 <strong>    b = 2
     d = 4
 </strong>    a = 1
@@ -1292,12 +1300,12 @@ with_args_last:
     a = 1
 <strong>    b = 2
 </strong>    c = 3
-<strong>    d = 4</strong></pre></div>
+<strong>    d = 4</strong></pre>
         <div class="bottom-pagers-wrapper"><div class="pagers bottom"><a class="paging-arrow previous" href="ref_builtins_type_independent.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_directives.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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_hash.html b/docs/ref_builtins_hash.html
index 44bdb39..50490b4 100644
--- a/docs/ref_builtins_hash.html
+++ b/docs/ref_builtins_hash.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_hash.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Built-ins for hashes"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_sequence.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_node.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_hash" itemprop="headline">Built-ins for hashes</h1>
@@ -58,15 +66,15 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign myHash = { &quot;name&quot;: &quot;mouse&quot;, &quot;price&quot;: 50 }&gt;
+<pre class="code-block code-template">&lt;#assign myHash = { &quot;name&quot;: &quot;mouse&quot;, &quot;price&quot;: 50 }&gt;
 &lt;#list myHash?keys as k&gt;
   ${k}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  name
-  price</pre></div>
+<pre class="code-block code-output">  name
+  price</pre>
 
           <p>Note that not all hashes support this (ask the programmer if a
           certain hash allows this or not).</p>
@@ -103,15 +111,15 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign myHash = { &quot;name&quot;: &quot;mouse&quot;, &quot;price&quot;: 50 }&gt;
+<pre class="code-block code-template">&lt;#assign myHash = { &quot;name&quot;: &quot;mouse&quot;, &quot;price&quot;: 50 }&gt;
 &lt;#list myHash?values as v&gt;
   ${v}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  mouse
-  50</pre></div>
+<pre class="code-block code-output">  mouse
+  50</pre>
 
           <p>Note that not all hashes support this (ask the programmer if a
           certain hash allows this or not).</p>
@@ -135,7 +143,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_loop_var.html b/docs/ref_builtins_loop_var.html
index 06d1526..daae3a3 100644
--- a/docs/ref_builtins_loop_var.html
+++ b/docs/ref_builtins_loop_var.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_loop_var.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Loop variable built-ins"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_node.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_type_independent.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_loop_var" itemprop="headline">Loop variable built-ins</h1>
@@ -57,32 +65,32 @@ ga('send', 'pageview');
         returns the 0-based index in the listable value we iterate
         through):</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Note: x is a loop variable --&gt;
+<pre class="code-block code-template">&lt;#-- Note: x is a loop variable --&gt;
 &lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as x&gt;
   ${x?index}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
-<div class="code-wrapper"><pre class="code-block code-output">0
+<pre class="code-block code-output">0
 1
-2</pre></div><p>When the <code class="inline-code">list</code> directive doesn&#39;t specify the
+2</pre><p>When the <code class="inline-code">list</code> directive doesn&#39;t specify the
         loop variable, these built-ins are used with the loop variable of the
         <code class="inline-code">items</code> directive:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;]&gt;
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;]&gt;
   &lt;ul&gt;
    &lt;#items as x&gt;
      &lt;li&gt;${x?index}&lt;/li&gt;
    &lt;/#items&gt;
   &lt;/ul&gt;
-&lt;/#list&gt;</pre></div><p>Loop variable built-ins only use the <em>name</em>
+&lt;/#list&gt;</pre><p>Loop variable built-ins only use the <em>name</em>
         of loop variable, so that they can identify the related ongoing
         iteration. They don&#39;t read the <em>value</em> of the loop
         variable. Hence, this is a parsing error:</p>
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as x&gt;
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as x&gt;
   &lt;#assign y = x&gt;
   ${y?index} &lt;#-- ERROR: y isn&#39;t a loop variable --&gt;
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
           
 
 
@@ -104,15 +112,15 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;
   ${i?counter}: ${i}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  1: a
+<pre class="code-block code-output">  1: a
   2: b
-  3: c</pre></div>
+  3: c</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -144,11 +152,11 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;${i?has_next?c} &lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;${i?has_next?c} &lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">true true false </pre></div>
+<pre class="code-block code-output">true true false </pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -195,15 +203,15 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;
   ${i?index}: ${i}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  0: a
+<pre class="code-block code-output">  0: a
   1: b
-  2: c</pre></div>
+  2: c</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -235,11 +243,11 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;] as i&gt;${i?is_even_item?c} &lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;] as i&gt;${i?is_even_item?c} &lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">false true false true</pre></div>
+<pre class="code-block code-output">false true false true</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -272,11 +280,11 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;${i?is_first?c} &lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;${i?is_first?c} &lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">true false false </pre></div>
+<pre class="code-block code-output">true false false </pre>
         
           
 
@@ -299,11 +307,11 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;${i?is_last?c} &lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;] as i&gt;${i?is_last?c} &lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">false false true</pre></div>
+<pre class="code-block code-output">false false true</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -351,11 +359,11 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;] as i&gt;${i?is_odd_item?c} &lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;] as i&gt;${i?is_odd_item?c} &lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">true false true false </pre></div>
+<pre class="code-block code-output">true false true false </pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -390,19 +398,19 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;, &#39;e&#39;, &#39;f&#39;, &#39;g&#39;] as i&gt;
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;, &#39;e&#39;, &#39;f&#39;, &#39;g&#39;] as i&gt;
   &lt;tr class=&quot;${i?item_cycle(&#39;row1&#39;, &#39;row2&#39;, &#39;row3&#39;)}&quot;&gt;${i}&lt;/tr&gt;
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;tr class=&quot;row1&quot;&gt;a&lt;/tr&gt;
+<pre class="code-block code-output">  &lt;tr class=&quot;row1&quot;&gt;a&lt;/tr&gt;
   &lt;tr class=&quot;row2&quot;&gt;b&lt;/tr&gt;
   &lt;tr class=&quot;row3&quot;&gt;c&lt;/tr&gt;
   &lt;tr class=&quot;row1&quot;&gt;d&lt;/tr&gt;
   &lt;tr class=&quot;row2&quot;&gt;e&lt;/tr&gt;
   &lt;tr class=&quot;row3&quot;&gt;f&lt;/tr&gt;
-  &lt;tr class=&quot;row1&quot;&gt;g&lt;/tr&gt;</pre></div>
+  &lt;tr class=&quot;row1&quot;&gt;g&lt;/tr&gt;</pre>
 
           <p>Some details:</p>
 
@@ -451,16 +459,16 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;] as i&gt;
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;] as i&gt;
   &lt;tr class=&quot;${i?item_parity}Row&quot;&gt;${i}&lt;/tr&gt;
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;tr class=&quot;oddRow&quot;&gt;a&lt;/tr&gt;
+<pre class="code-block code-output">  &lt;tr class=&quot;oddRow&quot;&gt;a&lt;/tr&gt;
   &lt;tr class=&quot;evenRow&quot;&gt;b&lt;/tr&gt;
   &lt;tr class=&quot;oddRow&quot;&gt;c&lt;/tr&gt;
-  &lt;tr class=&quot;evenRow&quot;&gt;d&lt;/tr&gt;</pre></div>
+  &lt;tr class=&quot;evenRow&quot;&gt;d&lt;/tr&gt;</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -496,16 +504,16 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;] as i&gt;
+<pre class="code-block code-template">&lt;#list [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;] as i&gt;
   &lt;tr class=&quot;row${i?item_parity_cap}&quot;&gt;${i}&lt;/tr&gt;
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  &lt;tr class=&quot;rowOdd&quot;&gt;a&lt;/tr&gt;
+<pre class="code-block code-output">  &lt;tr class=&quot;rowOdd&quot;&gt;a&lt;/tr&gt;
   &lt;tr class=&quot;rowEven&quot;&gt;b&lt;/tr&gt;
   &lt;tr class=&quot;rowOdd&quot;&gt;c&lt;/tr&gt;
-  &lt;tr class=&quot;rowEven&quot;&gt;d&lt;/tr&gt;</pre></div>
+  &lt;tr class=&quot;rowEven&quot;&gt;d&lt;/tr&gt;</pre>
 
             <div class="callout note">
     <strong class="callout-label">Note:</strong>
@@ -519,7 +527,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_node.html b/docs/ref_builtins_node.html
index 40f238f..581c2d3 100644
--- a/docs/ref_builtins_node.html
+++ b/docs/ref_builtins_node.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_node.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Built-ins for nodes (for XML)"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_hash.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_loop_var.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_node" itemprop="headline">Built-ins for nodes (for XML)</h1>
@@ -280,7 +288,7 @@ ga('send', 'pageview');
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_number.html b/docs/ref_builtins_number.html
index 1919e8d..d119df5 100644
--- a/docs/ref_builtins_number.html
+++ b/docs/ref_builtins_number.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_number.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Built-ins for numbers"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_string.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_date.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_number" itemprop="headline">Built-ins for numbers</h1>
@@ -215,13 +223,13 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#list 1..30 as n&gt;${n?lower_abc} &lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#list 1..30 as n&gt;${n?lower_abc} &lt;/#list&gt;</pre>
 
           <p>Prints:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">a b c d e f g h i j k l m n o p q r s t u v w x y z aa ab ac ad </pre></div>
+<pre class="code-block code-output">a b c d e f g h i j k l m n o p q r s t u v w x y z aa ab ac ad </pre>
 
           <p>See also: <a href="#ref_builtin_upper_abc"><code>upper_abc</code></a></p>
         
@@ -272,18 +280,18 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign testlist=[
+<pre class="code-block code-template">&lt;#assign testlist=[
   0, 1, -1, 0.5, 1.5, -0.5,
   -1.5, 0.25, -0.25, 1.75, -1.75]&gt;
 &lt;#list testlist as result&gt;
     ${result} ?floor=${result?floor} ?ceiling=${result?ceiling} ?round=${result?round}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           <p>Prints:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">    0 ?floor=0 ?ceiling=0 ?round=0
+<pre class="code-block code-output">    0 ?floor=0 ?ceiling=0 ?round=0
     1 ?floor=1 ?ceiling=1 ?round=1
     -1 ?floor=-1 ?ceiling=-1 ?round=-1
     0.5 ?floor=0 ?ceiling=1 ?round=1
@@ -293,7 +301,7 @@ ga('send', 'pageview');
     0.25 ?floor=0 ?ceiling=1 ?round=0
     -0.25 ?floor=-1 ?ceiling=0 ?round=0
     1.75 ?floor=1 ?ceiling=2 ?round=2
-    -1.75 ?floor=-2 ?ceiling=-1 ?round=-2</pre></div>
+    -1.75 ?floor=-2 ?ceiling=-1 ?round=-2</pre>
 
           <p>These built-ins may be useful in pagination operations and
           like. If you just want to <em>display</em> numbers in
@@ -335,24 +343,24 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x=42&gt;
+<pre class="code-block code-template">&lt;#assign x=42&gt;
 ${x}
 ${x?string}  &lt;#-- the same as ${x} --&gt;
 ${x?string.number}
 ${x?string.currency}
 ${x?string.percent}
-${x?string.computer}</pre></div>
+${x?string.computer}</pre>
 
           <p>If your locale is US English, this will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">42
+<pre class="code-block code-output">42
 42
 42
 $42.00
 4,200%
-42</pre></div>
+42</pre>
 
           <p>The output of first three expressions is identical because the
           first two expressions use the default format, which is
@@ -361,23 +369,23 @@ $42.00
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#setting number_format=&quot;currency&quot;&gt;
+<pre class="code-block code-template">&lt;#setting number_format=&quot;currency&quot;&gt;
 &lt;#assign x=42&gt;
 ${x}
 ${x?string}  &lt;#-- the same as ${x} --&gt;
 ${x?string.number}
 ${x?string.currency}
-${x?string.percent}</pre></div>
+${x?string.percent}</pre>
 
           <p>Will now output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">$42.00
+<pre class="code-block code-output">$42.00
 $42.00
 42
 $42.00
-4,200%</pre></div>
+4,200%</pre>
 
           <p>since the default number format was set to
           "currency".</p>
@@ -388,8 +396,8 @@ $42.00
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${x?string.@price}
-${x?string.@weight}</pre></div>
+<pre class="code-block code-template">${x?string.@price}
+${x?string.@weight}</pre>
 
           <p>where the custom format names were "price" and
           "weight". This way the templates can just refer to the
@@ -406,7 +414,7 @@ ${x?string.@weight}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x = 1.234&gt;
+<pre class="code-block code-template">&lt;#assign x = 1.234&gt;
 ${x?string[&quot;0&quot;]}
 ${x?string[&quot;0.#&quot;]}
 ${x?string[&quot;0.##&quot;]}
@@ -422,11 +430,11 @@ ${1.8?string[&quot;0&quot;]}
 ${1.5?string[&quot;0&quot;]} &lt;-- 1.5, rounded towards even neighbor
 ${2.5?string[&quot;0&quot;]} &lt;-- 2.5, rounded towards even neighbor
 
-${12345?string[&quot;0.##E0&quot;]}</pre></div>
+${12345?string[&quot;0.##E0&quot;]}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">1
+<pre class="code-block code-output">1
 1.2
 1.23
 1.234
@@ -441,7 +449,7 @@ ${12345?string[&quot;0.##E0&quot;]}</pre></div>
 2 &lt;-- 1.5, rounded towards even neighbor
 2 &lt;-- 2.5, rounded towards even neighbor
 
-1.23E4</pre></div>
+1.23E4</pre>
 
           <p>Note that as in FreeMarker <code class="inline-code">foo.bar</code> is
           equivalent with <code class="inline-code">foo[&quot;bar&quot;]</code>, you could also write
@@ -473,12 +481,12 @@ ${12345?string[&quot;0.##E0&quot;]}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#setting number_format=&quot;0.##&quot;&gt;
-${1.234}</pre></div>
+<pre class="code-block code-template">&lt;#setting number_format=&quot;0.##&quot;&gt;
+${1.234}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">1.23</pre></div>
+<pre class="code-block code-output">1.23</pre>
 
           <p>The default number format also can be specified outside the
           templates with the FreeMarker API (like with
@@ -489,16 +497,16 @@ ${1.234}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#setting number_format=&quot;,##0.00&quot;&gt;
+<pre class="code-block code-template">&lt;#setting number_format=&quot;,##0.00&quot;&gt;
 &lt;#setting locale=&quot;en_US&quot;&gt;
 US people write:     ${12345678}
 &lt;#setting locale=&quot;de_DE&quot;&gt;
-German people write: ${12345678}</pre></div>
+German people write: ${12345678}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">US people write:     12,345,678.00
-German people write: 12.345.678,00</pre></div>
+<pre class="code-block code-output">US people write:     12,345,678.00
+German people write: 12.345.678,00</pre>
 
           
             
@@ -529,13 +537,13 @@ German people write: 12.345.678,00</pre></div>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">Standard decimal format: ${10002.5?string[&quot;,000&quot;]}
-Extended decimal format: ${10002.5?string[&quot;,000<strong>;; roundingMode=halfUp groupingSeparator=_</strong>&quot;]}</pre></div>
+<pre class="code-block code-template">Standard decimal format: ${10002.5?string[&quot;,000&quot;]}
+Extended decimal format: ${10002.5?string[&quot;,000<strong>;; roundingMode=halfUp groupingSeparator=_</strong>&quot;]}</pre>
 
             
 
-<div class="code-wrapper"><pre class="code-block code-output">Standard decimal format: 10,002
-Extended decimal format: 10<strong>_</strong>00<strong>3</strong></pre></div>
+<pre class="code-block code-output">Standard decimal format: 10,002
+Extended decimal format: 10<strong>_</strong>00<strong>3</strong></pre>
 
               <div class="callout warning">
     <strong class="callout-label">Warning!</strong>
@@ -812,7 +820,7 @@ Extended decimal format: 10<strong>_</strong>00<strong>3</strong></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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_sequence.html b/docs/ref_builtins_sequence.html
index 5509a83..ca827f1 100644
--- a/docs/ref_builtins_sequence.html
+++ b/docs/ref_builtins_sequence.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_sequence.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Built-ins for sequences"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_boolean.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_hash.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_sequence" itemprop="headline">Built-ins for sequences</h1>
@@ -75,7 +83,7 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign seq = [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;, &#39;e&#39;, &#39;f&#39;, &#39;g&#39;, &#39;h&#39;, &#39;i&#39;, &#39;j&#39;]&gt;
+<pre class="code-block code-template">&lt;#assign seq = [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;, &#39;d&#39;, &#39;e&#39;, &#39;f&#39;, &#39;g&#39;, &#39;h&#39;, &#39;i&#39;, &#39;j&#39;]&gt;
 
 &lt;#list seq?chunk(4) as row&gt;
   &lt;#list row as cell&gt;${cell} &lt;/#list&gt;
@@ -83,13 +91,13 @@ ga('send', 'pageview');
 
 &lt;#list seq?chunk(4, &#39;-&#39;) as row&gt;
   &lt;#list row as cell&gt;${cell} &lt;/#list&gt;
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           <p>The output will be:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">
+<pre class="code-block code-output">
   a b c d
   e f g h
   i j
@@ -97,7 +105,7 @@ ga('send', 'pageview');
   a b c d
   e f g h
   i j - -
- </pre></div>
+ </pre>
 
           <p>This built in is mostly for outputting sequnces in
           tabular/columnar format. When used with HTML tables, the 2nd
@@ -134,21 +142,21 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign xs = [1, 2, -3, 4, -5, 6]&gt;
+<pre class="code-block code-template">&lt;#assign xs = [1, 2, -3, 4, -5, 6]&gt;
 
 Drop while positive:
 &lt;#list xs?drop_while(x -&gt; x &gt; 0) as x&gt;${x} &lt;/#list&gt;
 
 Filer for positives:
-&lt;#list xs?filter(x -&gt; x &gt; 0) as x&gt;${x} &lt;/#list&gt;</pre></div>
+&lt;#list xs?filter(x -&gt; x &gt; 0) as x&gt;${x} &lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Drop while positive:
+<pre class="code-block code-output">Drop while positive:
 -3 4 -5 6 
 
 Filer for positives:
-1 2 4 6 </pre></div>
+1 2 4 6 </pre>
 
           <p>As you can see, <code class="inline-code">drop_while</code> has stopped
           dropping the elements once it ran into the first element that didn&#39;t
@@ -183,18 +191,18 @@ Filer for positives:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign xs = [1, -2, 3, 4, -5]&gt;
+<pre class="code-block code-template">&lt;#assign xs = [1, -2, 3, 4, -5]&gt;
 Positives:
 &lt;#list xs?<strong>filter(x -&gt; x &gt; 0)</strong> as x&gt;${x} &lt;/#list&gt;
 Negatives:
-&lt;#list xs?<strong>filter(x -&gt; x &lt; 0)</strong> as x&gt;${x} &lt;/#list&gt;</pre></div>
+&lt;#list xs?<strong>filter(x -&gt; x &lt; 0)</strong> as x&gt;${x} &lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Positives:
+<pre class="code-block code-output">Positives:
 1 3 4 
 Negatives:
--2 -5 </pre></div>
+-2 -5 </pre>
 
           <p>This built-in has a single required parameter, the predicate
           (filter condition, what to keep). The predicate can be specified in
@@ -226,14 +234,14 @@ Negatives:
 
               
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#function negative(x)&gt;
+<pre class="code-block code-template">&lt;#function negative(x)&gt;
   &lt;#return x &lt; 0&gt;
 &lt;/#function&gt;
 
 <em>...</em>
 
 Negatives:
-&lt;#list xs<strong>?filter(negative)</strong> as x&gt;${x} &lt;/#list&gt;</pre></div>
+&lt;#list xs<strong>?filter(negative)</strong> as x&gt;${x} &lt;/#list&gt;</pre>
 
               <p>Note how we just referred to the function by name, and did
               not call it. Similarly, if you have a Java object called
@@ -263,9 +271,9 @@ Negatives:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign negatives = xs?filter(x -&gt; x &lt; 0)&gt;
+<pre class="code-block code-template">&lt;#assign negatives = xs?filter(x -&gt; x &lt; 0)&gt;
 Negatives:
-&lt;#list negatives as x&gt;${x} &lt;/#list&gt;</pre></div>
+&lt;#list negatives as x&gt;${x} &lt;/#list&gt;</pre>
 
           <p>Note however, that for a very long sequences, the above
           solution can consume significantly more memory. That&#39;s because
@@ -492,8 +500,8 @@ Negatives:
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Works: --&gt;
-&lt;#list hugeTable?filter(<em>predicate</em>) as row&gt;<em>nested content</em>&lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#-- Works: --&gt;
+&lt;#list hugeTable?filter(<em>predicate</em>) as row&gt;<em>nested content</em>&lt;/#list&gt;</pre>
 
             <p>This works fine, since <code class="inline-code">list</code> doesn&#39;t
             require collecting the result into the memory</p>
@@ -502,8 +510,8 @@ Negatives:
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Fails if hugeTable is not a sequence, just a collection: --&gt;
-&lt;#assign filteredHugeTable = hugeTable?filter(<em>predicate</em>)&gt;</pre></div>
+<pre class="code-block code-template">&lt;#-- Fails if hugeTable is not a sequence, just a collection: --&gt;
+&lt;#assign filteredHugeTable = hugeTable?filter(<em>predicate</em>)&gt;</pre>
 
             <p>This fails, as filtering can&#39;t be postponed beyond the
             containing directive (<code class="inline-code">assign</code>), so FreeMareker
@@ -515,8 +523,8 @@ Negatives:
 
             
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Works, but be sure filtredHugeTable fits into the memory: --&gt;
-&lt;#assign filteredHugeTable = hugeTable?filter(predicate)<strong>?sequence</strong>&gt;</pre></div>
+<pre class="code-block code-template">&lt;#-- Works, but be sure filtredHugeTable fits into the memory: --&gt;
+&lt;#assign filteredHugeTable = hugeTable?filter(predicate)<strong>?sequence</strong>&gt;</pre>
 
             <p>Naturally, applying the <code class="inline-code">sequence</code> built-in
             allows all sequence operations, such as
@@ -604,14 +612,14 @@ Negatives:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign colors = [&quot;red&quot;, &quot;green&quot;, &quot;blue&quot;]&gt;
-${colors?join(&quot;, &quot;)}</pre></div>
+<pre class="code-block code-template">&lt;#assign colors = [&quot;red&quot;, &quot;green&quot;, &quot;blue&quot;]&gt;
+${colors?join(&quot;, &quot;)}</pre>
 
           <p>will output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">red, green, blue</pre></div>
+<pre class="code-block code-output">red, green, blue</pre>
 
           <p>Sequence items that are not strings will be converted to
           string with the same conversion rules as of
@@ -645,21 +653,21 @@ ${colors?join(&quot;, &quot;)}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${colors?join(&quot;, &quot;, &quot;-&quot;)}
+<pre class="code-block code-template">${colors?join(&quot;, &quot;, &quot;-&quot;)}
 ${[]?join(&quot;, &quot;, &quot;-&quot;)}
 
 ${colors?join(&quot;, &quot;, &quot;-&quot;, &quot;.&quot;)}
-${[]?join(&quot;, &quot;, &quot;-&quot;, &quot;.&quot;)}</pre></div>
+${[]?join(&quot;, &quot;, &quot;-&quot;, &quot;.&quot;)}</pre>
 
           <p>will output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">red, green, blue
+<pre class="code-block code-output">red, green, blue
 -
 
 red, green, blue.
--</pre></div>
+-</pre>
 
           <p class="programmers-note">Sequences coming from Java might contain
           <code class="inline-code">null</code> values. Those values will be ignored by this
@@ -696,7 +704,7 @@ red, green, blue.
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign userNames = users?map(user -&gt; user.name)&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign userNames = users?map(user -&gt; user.name)&gt;</pre>
 
           <p>The parameter work like the parameter of the with <a href="#ref_builtin_filter"><code>filter</code>
           built-in</a> (so see there), except that the
@@ -735,15 +743,15 @@ red, green, blue.
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${[1, 2, 3]?min}
+<pre class="code-block code-template">${[1, 2, 3]?min}
 ${[1, 2, 3]?max}
-${[]?min!&#39;-&#39;}</pre></div>
+${[]?min!&#39;-&#39;}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">1
+<pre class="code-block code-output">1
 3
--</pre></div>
+-</pre>
         
           
 
@@ -783,20 +791,20 @@ ${[]?min!&#39;-&#39;}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign x = [&quot;red&quot;, 16, &quot;blue&quot;, &quot;cyan&quot;]&gt;
+<pre class="code-block code-template">&lt;#assign x = [&quot;red&quot;, 16, &quot;blue&quot;, &quot;cyan&quot;]&gt;
 &quot;blue&quot;: ${x?seq_contains(&quot;blue&quot;)?string(&quot;yes&quot;, &quot;no&quot;)}
 &quot;yellow&quot;: ${x?seq_contains(&quot;yellow&quot;)?string(&quot;yes&quot;, &quot;no&quot;)}
 16: ${x?seq_contains(16)?string(&quot;yes&quot;, &quot;no&quot;)}
-&quot;16&quot;: ${x?seq_contains(&quot;16&quot;)?string(&quot;yes&quot;, &quot;no&quot;)}</pre></div>
+&quot;16&quot;: ${x?seq_contains(&quot;16&quot;)?string(&quot;yes&quot;, &quot;no&quot;)}</pre>
 
           <p>The output will be:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">&quot;blue&quot;: yes
+<pre class="code-block code-output">&quot;blue&quot;: yes
 &quot;yellow&quot;: no
 16: yes
-&quot;16&quot;: no</pre></div>
+&quot;16&quot;: no</pre>
 
           <p>To find the value the built-in uses FreeMarker&#39;s comparison
           rules (as if you was using <a href="dgui_template_exp.html#dgui_template_exp_comparison"><code>==</code>
@@ -844,18 +852,18 @@ ${[]?min!&#39;-&#39;}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign colors = [&quot;red&quot;, &quot;green&quot;, &quot;blue&quot;]&gt;
+<pre class="code-block code-template">&lt;#assign colors = [&quot;red&quot;, &quot;green&quot;, &quot;blue&quot;]&gt;
 ${colors?seq_index_of(&quot;blue&quot;)}
 ${colors?seq_index_of(&quot;red&quot;)}
-${colors?seq_index_of(&quot;purple&quot;)}</pre></div>
+${colors?seq_index_of(&quot;purple&quot;)}</pre>
 
           <p>will output this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">2
+<pre class="code-block code-output">2
 0
--1</pre></div>
+-1</pre>
 
           <p>To find the value the built-in uses FreeMarker&#39;s comparison
           rules (as if you was using <a href="dgui_template_exp.html#dgui_template_exp_comparison"><code>==</code>
@@ -877,7 +885,7 @@ ${colors?seq_index_of(&quot;purple&quot;)}</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign names = [&quot;Joe&quot;, &quot;Fred&quot;, &quot;Joe&quot;, &quot;Susan&quot;]&gt;
+<pre class="code-block code-template">&lt;#assign names = [&quot;Joe&quot;, &quot;Fred&quot;, &quot;Joe&quot;, &quot;Susan&quot;]&gt;
 No 2nd param: ${names?seq_index_of(&quot;Joe&quot;)}
 -2: ${names?seq_index_of(&quot;Joe&quot;, -2)}
 -1: ${names?seq_index_of(&quot;Joe&quot;, -1)}
@@ -885,20 +893,20 @@ No 2nd param: ${names?seq_index_of(&quot;Joe&quot;)}
  1: ${names?seq_index_of(&quot;Joe&quot;, 1)}
  2: ${names?seq_index_of(&quot;Joe&quot;, 2)}
  3: ${names?seq_index_of(&quot;Joe&quot;, 3)}
- 4: ${names?seq_index_of(&quot;Joe&quot;, 4)}</pre></div>
+ 4: ${names?seq_index_of(&quot;Joe&quot;, 4)}</pre>
 
           <p>will output this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">No 2nd param: 0
+<pre class="code-block code-output">No 2nd param: 0
 -2: 0
 -1: 0
  0: 0
  1: 2
  2: 2
  3: -1
- 4: -1</pre></div>
+ 4: -1</pre>
         
           
 
@@ -936,7 +944,7 @@ No 2nd param: ${names?seq_index_of(&quot;Joe&quot;)}
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign names = [&quot;Joe&quot;, &quot;Fred&quot;, &quot;Joe&quot;, &quot;Susan&quot;]&gt;
+<pre class="code-block code-template">&lt;#assign names = [&quot;Joe&quot;, &quot;Fred&quot;, &quot;Joe&quot;, &quot;Susan&quot;]&gt;
 No 2nd param: ${names?seq_last_index_of(&quot;Joe&quot;)}
 -2: ${names?seq_last_index_of(&quot;Joe&quot;, -2)}
 -1: ${names?seq_last_index_of(&quot;Joe&quot;, -1)}
@@ -944,20 +952,20 @@ No 2nd param: ${names?seq_last_index_of(&quot;Joe&quot;)}
  1: ${names?seq_last_index_of(&quot;Joe&quot;, 1)}
  2: ${names?seq_last_index_of(&quot;Joe&quot;, 2)}
  3: ${names?seq_last_index_of(&quot;Joe&quot;, 3)}
- 4: ${names?seq_last_index_of(&quot;Joe&quot;, 4)}</pre></div>
+ 4: ${names?seq_last_index_of(&quot;Joe&quot;, 4)}</pre>
 
           <p>will output this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">No 2nd param: 2
+<pre class="code-block code-output">No 2nd param: 2
 -2: -1
 -1: -1
  0: 0
  1: 0
  2: 2
  3: 2
- 4: 2</pre></div>
+ 4: 2</pre>
         
           
 
@@ -996,14 +1004,14 @@ No 2nd param: ${names?seq_last_index_of(&quot;Joe&quot;)}
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign ls = [&quot;whale&quot;, &quot;Barbara&quot;, &quot;zeppelin&quot;, &quot;aardvark&quot;, &quot;beetroot&quot;]?sort&gt;
-&lt;#list ls as i&gt;${i} &lt;/#list&gt;</pre></div>
+<pre class="code-block code-template">&lt;#assign ls = [&quot;whale&quot;, &quot;Barbara&quot;, &quot;zeppelin&quot;, &quot;aardvark&quot;, &quot;beetroot&quot;]?sort&gt;
+&lt;#list ls as i&gt;${i} &lt;/#list&gt;</pre>
 
           <p>will print (with US locale at least):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">aardvark Barbara beetroot whale zeppelin</pre></div>
+<pre class="code-block code-output">aardvark Barbara beetroot whale zeppelin</pre>
         
           
 
@@ -1026,7 +1034,7 @@ No 2nd param: ${names?seq_last_index_of(&quot;Joe&quot;)}
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign ls = [
+<pre class="code-block code-template">&lt;#assign ls = [
   {&quot;name&quot;:&quot;whale&quot;, &quot;weight&quot;:2000},
   {&quot;name&quot;:&quot;Barbara&quot;, &quot;weight&quot;:53},
   {&quot;name&quot;:&quot;zeppelin&quot;, &quot;weight&quot;:-200},
@@ -1041,13 +1049,13 @@ Order by name:
 Order by weight:
 &lt;#list ls?sort_by(&quot;weight&quot;) as i&gt;
 - ${i.name}: ${i.weight}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           <p>will print (with US locale at least):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Order by name:
+<pre class="code-block code-output">Order by name:
 - aardvark: 30
 - Barbara: 53
 - beetroot: 0.3
@@ -1059,7 +1067,7 @@ Order by weight:
 - beetroot: 0.3
 - aardvark: 30
 - Barbara: 53
-- whale: 2000</pre></div>
+- whale: 2000</pre>
 
           <p>If the subvariable that you want to use for the sorting is on
           a deeper level (that is, if it is a subvariable of a subvariable and
@@ -1069,23 +1077,23 @@ Order by weight:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign members = [
+<pre class="code-block code-template">&lt;#assign members = [
     {&quot;name&quot;: {&quot;first&quot;: &quot;Joe&quot;, &quot;last&quot;: &quot;Smith&quot;}, &quot;age&quot;: 40},
     {&quot;name&quot;: {&quot;first&quot;: &quot;Fred&quot;, &quot;last&quot;: &quot;Crooger&quot;}, &quot;age&quot;: 35},
     {&quot;name&quot;: {&quot;first&quot;: &quot;Amanda&quot;, &quot;last&quot;: &quot;Fox&quot;}, &quot;age&quot;: 25}]&gt;
 Sorted by name.last:
 &lt;#list members?sort_by([&#39;name&#39;, &#39;last&#39;]) as m&gt;
 - ${m.name.last}, ${m.name.first}: ${m.age} years old
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           <p>will print (with US locale at least):</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Sorted by name.last:
+<pre class="code-block code-output">Sorted by name.last:
 - Crooger, Fred: 35 years old
 - Fox, Amanda: 25 years old
-- Smith, Joe: 40 years old</pre></div>
+- Smith, Joe: 40 years old</pre>
         
           
 
@@ -1108,21 +1116,21 @@ Sorted by name.last:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign xs = [1, 2, -3, 4, -5, 6]&gt;
+<pre class="code-block code-template">&lt;#assign xs = [1, 2, -3, 4, -5, 6]&gt;
 
 Take while positive:
 &lt;#list xs<strong>?take_while</strong>(x -&gt; x &gt; 0) as x&gt;${x} &lt;/#list&gt;
 
 Filer for positives:
-&lt;#list xs?filter(x -&gt; x &gt; 0) as x&gt;${x} &lt;/#list&gt;</pre></div>
+&lt;#list xs?filter(x -&gt; x &gt; 0) as x&gt;${x} &lt;/#list&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Take while positive:
+<pre class="code-block code-output">Take while positive:
 1 2 
 
 Filer for positives:
-1 2 4 6 </pre></div>
+1 2 4 6 </pre>
 
           <p>As you can see, <code class="inline-code">take_while</code> has stopped at
           the first number that didn&#39;t match the predicate (<code class="inline-code">x &gt;
@@ -1135,7 +1143,7 @@ Filer for positives:
     </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="https://freemarker.apache.org/">What is FreeMarker?</a></li><li><a href="https://freemarker.apache.org/freemarkerdownload.html">Download</a></li><li><a href="app_versions.html">Version history</a></li><li><a href="https://freemarker.apache.org/history.html">About us</a></li><li><a itemprop="license" href="app_li [...]
 Last generated:
-<time itemprop="dateModified" datetime="2020-05-23T20:09:37Z" title="Saturday, May 23, 2020 8:09:37 PM GMT">2020-05-23 20:09:37 GMT</time>, for Freemarker 2.3.30 </p>
+<time itemprop="dateModified" datetime="2020-07-15T17:00:00Z" title="Wednesday, July 15, 2020 at 5:00:00 PM Greenwich Mean Time">2020-07-15 17:00:00 GMT</time>, for Freemarker 2.3.30 </p>
 <p class="copyright">
 © <span itemprop="copyrightYear">1999</span>–2020
 <a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="https://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </p>
diff --git a/docs/ref_builtins_string.html b/docs/ref_builtins_string.html
index 4168a5f..de764e9 100644
--- a/docs/ref_builtins_string.html
+++ b/docs/ref_builtins_string.html
@@ -14,7 +14,7 @@
 <link rel="canonical" href="https://freemarker.apache.org/docs/ref_builtins_string.html">
 <link rel="icon" href="favicon.png" type="image/png">
 <link rel="stylesheet" type="text/css" href="https://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?1590264577448">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1594832400000">
 <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),
@@ -30,14 +30,22 @@ ga('send', 'pageview');
     <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="https://freemarker.apache.org" role="banner">            <img itemprop="image" src="logo.png" alt="FreeMarker">
-</a><ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</sp [...]
+  <div class="oldBrowserWarning" style="display: block">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+  <![endif]-->  <div class="oldBrowserWarning">
+    Unsupported web browser - Use a modern browser to view this website!
+  </div>
+<div class="header-top-bg"><div class="site-width header-top"><div id="hamburger-menu" role="button"></div>          <div class="logo">
+<a href="https://freemarker.apache.org" role="banner"><img itemprop="image" src="logo.png" alt="FreeMarker"></a>          </div>
+<ul class="tabs"><li><a href="https://freemarker.apache.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="https://freemarker.apache.org/contribute.html" title="Contribute"><span>Contribute</span></a></li><li><a class="tab icon-bug" href="https://issues.apache.org/jira/browse/FREEMARKER/" title="Report a Bug"><span>Report a Bug</span>< [...]
+<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="ref.html"><span itemprop="name">Template Language Reference</span></a></li> [...]
+<div class="bookmarks" title="Bookmarks"><span class="sr-only">Bookmarks:</span><ul><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 cla [...]
       <div class="content-wrapper">
   <div id="table-of-contents-wrapper" class="col-left">
       <script>var breadcrumb = ["Apache FreeMarker Manual","Template Language Reference","Built-in Reference","Built-ins for strings"];</script>
-      <script src="toc.js?1590264577448"></script>
-      <script src="docgen-resources/main.min.js?1590264577448"></script>
+      <script src="toc.js?1594832400000"></script>
+      <script src="docgen-resources/main.min.js?1594832400000"></script>
   </div>
 <div class="col-right"><div class="page-content"><div class="page-title"><div class="pagers top"><a class="paging-arrow previous" href="ref_builtins_alphaidx.html"><span>Previous</span></a><a class="paging-arrow next" href="ref_builtins_number.html"><span>Next</span></a></div><div class="title-wrapper">
 <h1 class="content-header header-section1" id="ref_builtins_string" itemprop="headline">Built-ins for strings</h1>
@@ -92,17 +100,17 @@ ga('send', 'pageview');
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;  green mouse&quot;?cap_first}
+<pre class="code-block code-template">${&quot;  green mouse&quot;?cap_first}
 ${&quot;GreEN mouse&quot;?cap_first}
-${&quot;- green mouse&quot;?cap_first}</pre></div>
+${&quot;- green mouse&quot;?cap_first}</pre>
 
           <p>The output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  Green mouse
+<pre class="code-block code-output">  Green mouse
 GreEN mouse
-- green mouse</pre></div>
+- green mouse</pre>
 
           <p>In the case of <code class="inline-code">&quot;- green mouse&quot;</code>, the first
           word is the <code class="inline-code">-</code>.</p>
@@ -122,15 +130,15 @@ GreEN mouse
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;  green  mouse&quot;?capitalize}
-${&quot;GreEN mouse&quot;?capitalize}</pre></div>
+<pre class="code-block code-template">${&quot;  green  mouse&quot;?capitalize}
+${&quot;GreEN mouse&quot;?capitalize}</pre>
 
           <p>The output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  Green Mouse
-Green Mouse</pre></div>
+<pre class="code-block code-output">  Green Mouse
+Green Mouse</pre>
         
           
 
@@ -166,13 +174,13 @@ Green Mouse</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if &quot;piceous&quot;?contains(&quot;ice&quot;)&gt;It contains &quot;ice&quot;&lt;/#if&gt;</pre></div>
+<pre class="code-block code-template">&lt;#if &quot;piceous&quot;?contains(&quot;ice&quot;)&gt;It contains &quot;ice&quot;&lt;/#if&gt;</pre>
 
           <p>This will output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">It contains &quot;ice&quot;</pre></div>
+<pre class="code-block code-output">It contains &quot;ice&quot;</pre>
         
           
 
@@ -218,14 +226,14 @@ Green Mouse</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- The date_format, time_format and datetime_format settings must match this format! --&gt;
+<pre class="code-block code-template">&lt;#-- The date_format, time_format and datetime_format settings must match this format! --&gt;
 &lt;#assign someDate = &quot;Oct 25, 1995&quot;?date&gt;
 &lt;#assign someTime = &quot;3:05:30 PM&quot;?time&gt;
 &lt;#assign someDatetime = &quot;Oct 25, 1995 03:05:00 PM&quot;?datetime&gt;
 
 &lt;#-- Changing the setting value changes the expected format: --&gt;
 &lt;#setting datetime_format=&quot;iso&quot;&gt;
-&lt;#assign someDatetime = &quot;1995-10-25T15:05&quot;?datetime&gt;</pre></div>
+&lt;#assign someDatetime = &quot;1995-10-25T15:05&quot;?datetime&gt;</pre>
 
           <p>You can also specify the format explicitly like
           <code class="inline-code">?datetime.<em class="code-color">format</em></code> (and
@@ -242,7 +250,7 @@ Green Mouse</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Parsing XML Schema xs:date, xs:time and xs:dateTime values: --&gt;
+<pre class="code-block code-template">&lt;#-- Parsing XML Schema xs:date, xs:time and xs:dateTime values: --&gt;
 &lt;#assign someDate = &quot;1995-10-25&quot;?date.xs&gt;
 &lt;#assign someTime = &quot;15:05:30&quot;?time.xs&gt;
 &lt;#assign someDatetime = &quot;1995-10-25T15:05:00&quot;?datetime.xs&gt;
@@ -257,7 +265,7 @@ Green Mouse</pre></div>
 &lt;#assign someDatetime = &quot;1995-10-25 03:05 PM&quot;?datetime(&quot;yyyy-MM-dd hh:mm a&quot;)&gt;
 
 &lt;#-- Parsing with custom date formats: --&gt;
-&lt;#assign someDatetime = &quot;October/25/1995 03:05 PM&quot;?datetime.@worklog&gt;</pre></div>
+&lt;#assign someDatetime = &quot;October/25/1995 03:05 PM&quot;?datetime.@worklog&gt;</pre>
 
           <p>To prevent misunderstandings, the left-hand value need not be
           a string literal. For example, when you read data from XML DOM (from
@@ -381,30 +389,30 @@ Green Mouse</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#ftl output_format=&quot;HTML&quot; <strong>auto_esc=false</strong>&gt;
+<pre class="code-block code-template">&lt;#ftl output_format=&quot;HTML&quot; <strong>auto_esc=false</strong>&gt;
 &lt;#assign s = &quot;R&amp;D&quot;&gt;
 ${s}
-${s?esc}</pre></div>
+${s?esc}</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">R&amp;D
-R&amp;amp;D</pre></div>
+<pre class="code-block code-output">R&amp;D
+R&amp;amp;D</pre>
 
           <p>In templates, where auto-escaping is on, using it is
           redundant:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#ftl output_format=&quot;HTML&quot;&gt;
+<pre class="code-block code-template">&lt;#ftl output_format=&quot;HTML&quot;&gt;
 &lt;#assign s = &quot;R&amp;D&quot;&gt;
 ${s}
-${s?esc} &lt;#-- ?esc is redundant here --&gt;</pre></div>
+${s?esc} &lt;#-- ?esc is redundant here --&gt;</pre>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">R&amp;amp;D
-R&amp;amp;D</pre></div>
+<pre class="code-block code-output">R&amp;amp;D
+R&amp;amp;D</pre>
 
           <p>This built-in works by converting the string value to a <a href="dgui_misc_autoescaping.html#dgui_misc_autoescaping_movalues">markup output
           value</a>, by escaping the string with the current output format,
@@ -505,7 +513,7 @@ R&amp;amp;D</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;input type=text name=user value=<strong>&quot;</strong>${user?html}<strong>&quot;</strong>&gt;</pre></div>
+<pre class="code-block code-template">&lt;input type=text name=user value=<strong>&quot;</strong>${user?html}<strong>&quot;</strong>&gt;</pre>
 
             <div class="callout warning">
     <strong class="callout-label">Warning!</strong>
@@ -574,14 +582,14 @@ R&amp;amp;D</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign beanName = &#39;The &quot;foo&quot; bean.&#39;&gt;
-String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
+<pre class="code-block code-template">&lt;#assign beanName = &#39;The &quot;foo&quot; bean.&#39;&gt;
+String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre>
 
           <p>will output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">String BEAN_NAME = &quot;The \&quot;foo\&quot; bean.&quot;;</pre></div>
+<pre class="code-block code-output">String BEAN_NAME = &quot;The \&quot;foo\&quot; bean.&quot;;</pre>
         
           
 
@@ -615,18 +623,18 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#assign user = &quot;Big Joe&#39;s \&quot;right hand\&quot;&quot;&gt;
+<pre class="code-block code-template">&lt;#assign user = &quot;Big Joe&#39;s \&quot;right hand\&quot;&quot;&gt;
 &lt;script&gt;
   alert(&quot;Welcome ${user?js_string}!&quot;);
-&lt;/script&gt;</pre></div>
+&lt;/script&gt;</pre>
 
           <p>will output:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">&lt;script&gt;
+<pre class="code-block code-output">&lt;script&gt;
   alert(&quot;Welcome Big Joe\&#39;s \&quot;right hand\&quot;!&quot;);
-&lt;/script&gt;</pre></div>
+&lt;/script&gt;</pre>
 
           <p>The exact escaping rules are:</p>
 
@@ -733,13 +741,13 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;abcdefgh&quot;?keep_after(&quot;de&quot;)}</pre></div>
+<pre class="code-block code-template">${&quot;abcdefgh&quot;?keep_after(&quot;de&quot;)}</pre>
 
           <p>will print</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">fgh</pre></div>
+<pre class="code-block code-output">fgh</pre>
 
           <p>If the parameter string is not found, it will return an empty
           string. If the parameter string is a 0-length string, it will return
@@ -750,13 +758,13 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;foo : bar&quot;?keep_after(r&quot;\s*:\s*&quot;, &quot;r&quot;)}</pre></div>
+<pre class="code-block code-template">${&quot;foo : bar&quot;?keep_after(r&quot;\s*:\s*&quot;, &quot;r&quot;)}</pre>
 
           <p>will print</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">bar</pre></div>
+<pre class="code-block code-output">bar</pre>
         
           
 
@@ -780,13 +788,13 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;foo.bar.txt&quot;?keep_after_last(&quot;.&quot;)}</pre></div>
+<pre class="code-block code-template">${&quot;foo.bar.txt&quot;?keep_after_last(&quot;.&quot;)}</pre>
 
           <p>will print</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">txt</pre></div>
+<pre class="code-block code-output">txt</pre>
 
           <p>while with <code class="inline-code">keep_after</code> you would get
           <code class="inline-code">bar.txt</code>.</p>
@@ -812,13 +820,13 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;abcdef&quot;?keep_before(&quot;de&quot;)}</pre></div>
+<pre class="code-block code-template">${&quot;abcdef&quot;?keep_before(&quot;de&quot;)}</pre>
 
           <p>will print</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">abc</pre></div>
+<pre class="code-block code-output">abc</pre>
 
           <p>If the parameter string is not found, it will return the
           original string unchanged. If the parameter string is a 0-length
@@ -829,13 +837,13 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;foo : bar&quot;?keep_before(r&quot;\s*:\s*&quot;, &quot;r&quot;)}</pre></div>
+<pre class="code-block code-template">${&quot;foo : bar&quot;?keep_before(r&quot;\s*:\s*&quot;, &quot;r&quot;)}</pre>
 
           <p>will print</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">foo</pre></div>
+<pre class="code-block code-output">foo</pre>
         
           
 
@@ -859,13 +867,13 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">${&quot;foo.bar.txt&quot;?keep_before_last(&quot;.&quot;)}</pre></div>
+<pre class="code-block code-template">${&quot;foo.bar.txt&quot;?keep_before_last(&quot;.&quot;)}</pre>
 
           <p>will print</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">foo.bar</pre></div>
+<pre class="code-block code-output">foo.bar</pre>
 
           <p>while with <code class="inline-code">keep_before</code> you would get
           <code class="inline-code">foo</code>.</p>
@@ -923,7 +931,7 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">[${&quot;&quot;?left_pad(5)}]
+<pre class="code-block code-template">[${&quot;&quot;?left_pad(5)}]
 [${&quot;a&quot;?left_pad(5)}]
 [${&quot;ab&quot;?left_pad(5)}]
 [${&quot;abc&quot;?left_pad(5)}]
@@ -931,13 +939,13 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 [${&quot;abcde&quot;?left_pad(5)}]
 [${&quot;abcdef&quot;?left_pad(5)}]
 [${&quot;abcdefg&quot;?left_pad(5)}]
-[${&quot;abcdefgh&quot;?left_pad(5)}]</pre></div>
+[${&quot;abcdefgh&quot;?left_pad(5)}]</pre>
 
           <p>will output this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">[     ]
+<pre class="code-block code-output">[     ]
 [    a]
 [   ab]
 [  abc]
@@ -945,7 +953,7 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 [abcde]
 [abcdef]
 [abcdefg]
-[abcdefgh]</pre></div>
+[abcdefgh]</pre>
 
           <p>If it&#39;s used with 2 parameters, then the 1st parameter means
           the same as if you were using the built-in with only 1 parameter,
@@ -954,23 +962,23 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">[${&quot;&quot;?left_pad(5, &quot;-&quot;)}]
+<pre class="code-block code-template">[${&quot;&quot;?left_pad(5, &quot;-&quot;)}]
 [${&quot;a&quot;?left_pad(5, &quot;-&quot;)}]
 [${&quot;ab&quot;?left_pad(5, &quot;-&quot;)}]
 [${&quot;abc&quot;?left_pad(5, &quot;-&quot;)}]
 [${&quot;abcd&quot;?left_pad(5, &quot;-&quot;)}]
-[${&quot;abcde&quot;?left_pad(5, &quot;-&quot;)}]</pre></div>
+[${&quot;abcde&quot;?left_pad(5, &quot;-&quot;)}]</pre>
 
           <p>will output this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">[-----]
+<pre class="code-block code-output">[-----]
 [----a]
 [---ab]
 [--abc]
 [-abcd]
-[abcde]</pre></div>
+[abcde]</pre>
 
           <p>The 2nd parameter can be a string whose length is greater than
           1. Then the string will be inserted periodically, for
@@ -978,21 +986,21 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">[${&quot;&quot;?left_pad(8, &quot;.oO&quot;)}]
+<pre class="code-block code-template">[${&quot;&quot;?left_pad(8, &quot;.oO&quot;)}]
 [${&quot;a&quot;?left_pad(8, &quot;.oO&quot;)}]
 [${&quot;ab&quot;?left_pad(8, &quot;.oO&quot;)}]
 [${&quot;abc&quot;?left_pad(8, &quot;.oO&quot;)}]
-[${&quot;abcd&quot;?left_pad(8, &quot;.oO&quot;)}]</pre></div>
+[${&quot;abcd&quot;?left_pad(8, &quot;.oO&quot;)}]</pre>
 
           <p>will output this:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">[.oO.oO.o]
+<pre class="code-block code-output">[.oO.oO.o]
 [.oO.oO.a]
 [.oO.oOab]
 [.oO.oabc]
-[.oO.abcd]</pre></div>
+[.oO.abcd]</pre>
 
           <p>The 2nd parameter must be a string value, and it must be at
           least 1 character long.</p>
@@ -1058,25 +1066,25 @@ String BEAN_NAME = &quot;${beanName?j_string}&quot;;</pre></div>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#if &quot;fxo&quot;?matches(&quot;f.?o&quot;)&gt;Matches.&lt;#else&gt;Does not match.&lt;/#if&gt;
+<pre class="code-block code-template">&lt;#if &quot;fxo&quot;?matches(&quot;f.?o&quot;)&gt;Matches.&lt;#else&gt;Does not match.&lt;/#if&gt;
 
 &lt;#assign res = &quot;foo bar fyo&quot;?matches(&quot;f.?o&quot;)&gt;
 &lt;#if res&gt;Matches.&lt;#else&gt;Does not match.&lt;/#if&gt;
 Matching sub-strings:
 &lt;#list res as m&gt;
 - ${m}
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           <p>will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">Matches.
+<pre class="code-block code-output">Matches.
 
 Does not match.
 Matching sub-strings:
 - foo
-- fyo</pre></div>
+- fyo</pre>
 
           <p>If the regular expression contains groups (parentheses), then
           you can access them with the <code class="inline-code">groups</code>
@@ -1084,7 +1092,7 @@ Matching sub-strings:
 
           
 
-<div class="code-wrapper"><pre class="code-block code-template">&lt;#-- Entire input match --&gt;
+<pre class="code-block code-template">&lt;#-- Entire input match --&gt;
 &lt;#assign res = &quot;John Doe&quot;?matches(r&quot;(\w+) (\w+)&quot;)&gt;
 &lt;#if res&gt; &lt;#-- Must not try to access groups if there was no match! --&gt;
   First name: ${res?groups[1]}
@@ -1095,17 +1103,17 @@ Matching sub-strings:
 &lt;#assign res = &quot;aa/rx; ab/r;&quot;?matches(&quot;(.+?)/*(.+?);&quot;)&gt;
 &lt;#list res as m&gt;
   - &quot;${m}&quot; is &quot;${m?groups[1]}&quot; per &quot;${m?groups[2]}&quot;
-&lt;/#list&gt;</pre></div>
+&lt;/#list&gt;</pre>
 
           <p>This will print:</p>
 
           
 
-<div class="code-wrapper"><pre class="code-block code-output">  First name: John
+<pre class="code-block code-output">  First name: John
   Second name: Doe
 
   - &quot;aa/rx;&quot; is &quot;a&quot; per &quot;a/rx&quot;
-  - &quot; ab/r;&quot; is &quot; &quot; per &quot;ab/r&quot;</pre></div>
+  - &quot; ab/r;&quot; is &quot; &quot; per &quot;ab/r&quot;</pre>
 
           <p>Notes regarding the behavior of the <code class="inline-code">groups</code>
           built-in:</p>
@@ -1176,15 +1184,15 @@ Matching sub-strings:
 
           
 
... 8068 lines suppressed ...