http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui.html
----------------------------------------------------------------------
diff --git a/docs/dgui.html b/docs/dgui.html
index 51d1b57..16cc0ab 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -51,9 +46,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_datamodel.html
----------------------------------------------------------------------
diff --git a/docs/dgui_datamodel.html b/docs/dgui_datamodel.html
index 2f3dc86..848c6c1 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -51,9 +46,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_datamodel_basics.html
----------------------------------------------------------------------
diff --git a/docs/dgui_datamodel_basics.html b/docs/dgui_datamodel_basics.html
index 714f82e..0a2de21 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -227,9 +222,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_datamodel_types.html
----------------------------------------------------------------------
diff --git a/docs/dgui_datamodel_types.html b/docs/dgui_datamodel_types.html
index d96b8e3..93ff803 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -518,9 +513,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_misc.html
----------------------------------------------------------------------
diff --git a/docs/dgui_misc.html b/docs/dgui_misc.html
index 4bfc789..19e640a 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -51,9 +46,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_misc_alternativesyntax.html
----------------------------------------------------------------------
diff --git a/docs/dgui_misc_alternativesyntax.html 
b/docs/dgui_misc_alternativesyntax.html
index f7dce8a..264ffe2 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,50 +35,93 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
-</div></div>  <div class="callout note">
+</div></div><div class="page-menu">
+<div class="page-menu-title">Page Contents</div>
+<ul><li><a class="page-menu-link" href="#dgui_misc_alternativesyntax_tag" 
data-menu-target="dgui_misc_alternativesyntax_tag">Square bracket tag 
syntax</a></li><li><a class="page-menu-link" 
href="#dgui_misc_alternativesyntax_interpolation" 
data-menu-target="dgui_misc_alternativesyntax_interpolation">Square bracket 
interpolation syntax</a></li></ul> </div><p>Sometimes the generated content 
uses symbols that clashes with
+        the default FreeMarker syntax (typically,
+        <code class="inline-code">${<em class="code-color">...</em>}</code>-s 
that FreeMarker
+        should print as is, without interpretation), or you use some tool that
+        is confused by the default FreeMarker syntax (typically by
+        <code class="inline-code">&lt;</code> and <code 
class="inline-code">&gt;</code>). While usually
+        there are tricks to work those cases around (like you can use
+        <code class="inline-code">${&#39;$&#39;}{x}</code> to print <code 
class="inline-code">${x}</code> as is) ,
+        they are often too inconvenient. Thus, the interpolation syntax can be
+        configured to be like <code class="inline-code">[=x]</code> instead of
+        <code class="inline-code">${x}</code>. Also, independently of that, 
the FreeMarker
+        tag syntax can be configured to use <code 
class="inline-code">[]</code>, like in
+        <code class="inline-code">[#if x]<em 
class="code-color">...</em>[/#if]</code>.</p>  <div class="callout note">
     <strong class="callout-label">Note:</strong>
 
-          <p>This feature exists since FreeMarker 2.3.4.</p>
+          <p>While both the "tag syntax" and
+          "interpolation syntax" can be configured to use square
+          brackets, they are totally independent configuration settings. Thus,
+          the overall syntax can be like <code class="inline-code">[#if 
x]${y}[/#if]</code>,
+          or like <code class="inline-code">&lt;#if 
x&gt;[=y]&lt;/#if&gt;</code> as
+          well.</p>
           </div>
-<p>FreeMarker supports an alternative syntax, where
-        <code class="inline-code">[</code> and <code 
class="inline-code">]</code> is used instead of
-        <code class="inline-code">&lt;</code> and <code 
class="inline-code">&gt;</code> in FreeMarker
-        directives and comments, for example:</p><ul>
-          <li>
-            Calling predefined directive: <code class="inline-code">[#list 
animals as
-            animal]<em class="code-color">...</em>[/#list]</code>
-          </li>
-
-          <li>
-            Calling user-defined directive: <code class="inline-code">[@myMacro
-            /]</code>
-          </li>
-
-          <li>
-            Comment: <code class="inline-code">[#-- the comment --]</code>
-          </li>
-        </ul><p>To use the alternative syntax instead of the default one, start
-        the template with the <a 
href="ref_directive_ftl.html"><code>ftl</code> directive</a>
-        using the alternative syntax. If you don&#39;t know what is the
-        <code class="inline-code">ftl</code> directive, just start the 
template with
-        <code class="inline-code">[#ftl]</code>, and remember that it should 
be the very
-        first thing in the file (except that <a 
href="gloss.html#gloss.whiteSpace">white-space</a> can precede it). For
-        example, this is how the last example of the <a 
href="dgui_quickstart_template.html">Getting Started</a> looks with
-        the alternative syntax (assuming it&#39;s a complete template, not 
just a
-        fragment):</p>
-
-<div class="code-wrapper"><pre class="code-block 
code-template"><strong>[#ftl]</strong>
-&lt;p&gt;We have these animals:
+
+          
+
+
+
+<h2 class="content-header header-section2" 
id="dgui_misc_alternativesyntax_tag">Square bracket tag syntax</h2>
+
+
+            <div class="callout note">
+    <strong class="callout-label">Note:</strong>
+
+            <p>This section is about the <em>tag</em> syntax,
+            not the <a 
href="#dgui_misc_alternativesyntax_interpolation"><em>interpolation</em>
+            syntax</a>. Don&#39;t confuse the two, they are independent.</p>
+            </div>
+
+
+            <div class="callout note">
+    <strong class="callout-label">Note:</strong>
+
+            <p>This feature exists since FreeMarker 2.3.4.</p>
+            </div>
+
+
+          <p>FreeMarker supports an alternative tag syntax, where
+          <code class="inline-code">[</code> and <code 
class="inline-code">]</code> is used instead of
+          <code class="inline-code">&lt;</code> and <code 
class="inline-code">&gt;</code> in FreeMarker
+          directives and comments, for example:</p>
+
+          <ul>
+            <li>
+              Calling predefined directive: <code class="inline-code">[#list 
animals as
+              animal]<em class="code-color">...</em>[/#list]</code>
+            </li>
+
+            <li>
+              Calling user-defined directive: <code 
class="inline-code">[@myMacro
+              /]</code>
+            </li>
+
+            <li>
+              Comment: <code class="inline-code">[#-- the comment --]</code>
+            </li>
+          </ul>
+
+          <p>To use square tag syntax instead of the default one, the
+          programmers should configure FreeMarker so <span 
class="marked-for-programmers">(see
+          <code class="inline-code">Configuraton.setTagSyntax</code>, or the
+          <code class="inline-code">tag_syntax</code> setting)</span>. 
However, the tag
+          syntax can also be enforced in the template, with the <a 
href="ref_directive_ftl.html"><code>ftl</code> directive</a>
+          (see later).</p>
+
+          <p>For example, this is how the last example of the <a 
href="dgui_quickstart_template.html">Getting Started</a> looks with
+          the alternative syntax:</p>
+
+          
+
+<div class="code-wrapper"><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>
@@ -89,36 +132,117 @@ 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><p>The alternative (square bracket) and the default 
(angle bracket)
-        syntax are mutually exclusive within a template. That is, either the
-        whole template uses alternative syntax, or the whole template uses the
-        default syntax. If the template uses alternative syntax, things like
-        <code class="inline-code">&lt;#if <em 
class="code-color">...</em>&gt;</code> are
-        count as static text, not as FTL tags. Similarly, if the template uses
-        the default syntax, things like <code class="inline-code">[#if
-        <em class="code-color">...</em>]</code> count as static text, not as
-        FTL tags.</p><p>If you start the file with <code 
class="inline-code">[#ftl
-        <em class="code-color">...</em>]</code> (where the
-        <code class="inline-code"><em class="code-color">...</em></code> 
stands for the
-        optional parameters; of course <code class="inline-code">[#ftl]</code> 
works too)
-        the file will surely use the alternative (square bracket) syntax. If
-        you start the file with <code class="inline-code">&lt;#ftl
-        <em class="code-color">...</em>&gt;</code> the file will surely use
-        the normal (angle bracket) syntax. If there is no
-        <code class="inline-code">ftl</code> directive in the file, then the 
programmer
-        decides what the syntax will be by configuring FreeMarker <span 
class="marked-for-programmers">(programmers see
-        <code class="inline-code">Configuration.setTagSyntax(int)</code> in 
the API
-        javadocs)</span>. Most probably the programmers use the factory
-        default however. The factory default in 2.3.x is using the normal
-        syntax. The factory default in 2.4.x will be auto-detection, which
-        means that the first FreeMarker tag determines the syntax (it can be
-        anything, not just <code class="inline-code">ftl</code>).</p><div 
class="bottom-pagers-wrapper"><div class="pagers bottom"><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></div></div>      </div>
+&lt;/table&gt;</pre></div>
+
+          <p>The square bracket and the default (angle bracket) syntax are
+          mutually exclusive within a template; they can&#39;t be mixed. If the
+          template uses square bracket tag syntax, then things like
+          <code class="inline-code">&lt;#if <em 
class="code-color">...</em>&gt;</code> will
+          be just static text, not FTL tags. Similarly, if the template uses
+          the angle brackets tag syntax, things like <code 
class="inline-code">[#if
+          <em class="code-color">...</em>]</code> are static text, not FTL
+          tags.</p>
+
+          <p>If you start the file with <code class="inline-code">[#ftl
+          <em class="code-color">...</em>]</code> (where the
+          <code class="inline-code"><em class="code-color">...</em></code> 
stands for the
+          optional parameters; of course <code 
class="inline-code">[#ftl]</code> works too)
+          the file will use square bracket <em>tag</em> syntax
+          regardless of the configuration settings (but that does
+          <em>not</em> change the interpolation syntax to
+          <code class="inline-code">[=...]</code>). Similarly, if you start 
the file with
+          <code class="inline-code">&lt;#ftl <em 
class="code-color">...</em>&gt;</code> the
+          file will use the normal (angle bracket) tag syntax. If there is no
+          <code class="inline-code">ftl</code> directive in the file, then the 
programmer
+          decides what the tag <em>syntax</em> will be by
+          configuring FreeMarker <span 
class="marked-for-programmers">(programmers
+          see <code class="inline-code">Configuration.setTagSyntax(int)</code> 
in the API
+          javadocs)</span>. Most probably the programmers use the factory
+          default.</p>
+        
+          
+
+
+
+<h2 class="content-header header-section2" 
id="dgui_misc_alternativesyntax_interpolation">Square bracket interpolation 
syntax</h2>
+
+
+            <div class="callout note">
+    <strong class="callout-label">Note:</strong>
+
+            <p>This section is about the <em>interpolation</em>
+            syntax, not the <a 
href="#dgui_misc_alternativesyntax_tag"><em>tag</em>
+            syntax</a>. Don&#39;t confuse the two, they are independent.</p>
+            </div>
+
+
+            <div class="callout note">
+    <strong class="callout-label">Note:</strong>
+
+            <p>This feature exists since FreeMarker 2.3.28</p>
+            </div>
+
+
+          <p>In this case instead of
+          <code class="inline-code">${<em 
class="code-color">expression</em>}</code> (and the
+          deprecated
+          <code class="inline-code">#{<em 
class="code-color">expression</em>}</code>) you
+          write <code class="inline-code">[=<em 
class="code-color">expression</em>]</code>.
+          This syntax is activated by the programmers from the configuration
+          <span class="marked-for-programmers">(see
+          <code 
class="inline-code">Configuration.setInterpolationSyntax</code> in the Java
+          API)</span>; unlike the tag syntax, it can&#39;t be specified inside
+          the template. It can be used both together with, and without the
+          <a href="#dgui_misc_alternativesyntax_tag">square bracket
+          <em>tag</em> syntax</a>, as they are technically
+          unrelated, but it&#39;s probably more aesthetic to use square bracket
+          tag syntax when you use square bracket interpolation syntax:</p>
+
+          
+
+<div class="code-wrapper"><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.
+--]
+&lt;p&gt;We have these animals:
+&lt;table border=1&gt;
+  &lt;tr&gt;&lt;th&gt;Name&lt;th&gt;Price
+  [#list animals as animal]
+  &lt;tr&gt;
+    &lt;td&gt;
+      [#if animal.size == &quot;large&quot;]&lt;b&gt;[/#if]
+      <strong>[=animal.name]</strong>
+      [#if animal.size == &quot;large&quot;]&lt;/b&gt;[/#if]
+    &lt;td&gt;<strong>[=animal.price]</strong> Euros
+  [/#list]
+&lt;/table&gt;</pre></div>
+
+          <p>When square bracket interpolation syntax is used,
+          <code class="inline-code">${<em 
class="code-color">expression</em>}</code> and
+          <code class="inline-code">#{<em 
class="code-color">expression</em>}</code> in the
+          template will be just static text, which is printed as is. This is
+          mostly useful if you generate output that should contain those
+          (especially
+          <code class="inline-code">${<em 
class="code-color">expression</em>}</code> is
+          frequent), such as when generating JSP files.</p>
+
+          <p>There&#39;s also a third tag syntax, "dollar", where
+          only the interpolation syntax is
+          <code class="inline-code">${<em 
class="code-color">expression</em>}</code>, and the
+          deprecated
+          <code class="inline-code">#{<em 
class="code-color">expression</em>}</code> is just
+          static text. (The one where
+          <code class="inline-code">#{<em 
class="code-color">expression</em>}</code> is still
+          an interpolation is called the "legacy" interpolation
+          syntax, and is the default for backward compatibility.)</p>
+        <div class="bottom-pagers-wrapper"><div class="pagers bottom"><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></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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_misc_autoescaping.html
----------------------------------------------------------------------
diff --git a/docs/dgui_misc_autoescaping.html b/docs/dgui_misc_autoescaping.html
index 099dd64..9b2743e 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -715,9 +710,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_misc_namespace.html
----------------------------------------------------------------------
diff --git a/docs/dgui_misc_namespace.html b/docs/dgui_misc_namespace.html
index e911595..991314e 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -312,9 +307,9 @@ ot...@example.com, ot...@example.com, 
ot...@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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_misc_userdefdir.html
----------------------------------------------------------------------
diff --git a/docs/dgui_misc_userdefdir.html b/docs/dgui_misc_userdefdir.html
index 9eb6b39..042f806 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -551,9 +546,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_misc_var.html
----------------------------------------------------------------------
diff --git a/docs/dgui_misc_var.html b/docs/dgui_misc_var.html
index 4daa95b..ed2608e 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -194,9 +189,9 @@ ${.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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_misc_whitespace.html
----------------------------------------------------------------------
diff --git a/docs/dgui_misc_whitespace.html b/docs/dgui_misc_whitespace.html
index d5c2e4c..72bb5e7 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -293,9 +288,9 @@ That&#39;s all.</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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_quickstart.html
----------------------------------------------------------------------
diff --git a/docs/dgui_quickstart.html b/docs/dgui_quickstart.html
index 4923eee..ba786dd 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -54,9 +49,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_quickstart_basics.html
----------------------------------------------------------------------
diff --git a/docs/dgui_quickstart_basics.html b/docs/dgui_quickstart_basics.html
index 68e758c..0141f1d 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -59,10 +54,11 @@ ga('send', 'pageview');
 &lt;/body&gt;
 &lt;/html&gt;</pre></div><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 you cannot use
-        static HTML. Instead, you can use a <strong>template</strong> of the 
desired output. The template is
-        the same as the static HTML would be, except that it contains some
-        instructions to FreeMarker that makes it dynamic:</p>
+        a database. Because this data changes, you cannot use static HTML.
+        Instead, you can use a <strong>template</strong> of
+        the desired output. The template is the same as the static HTML would
+        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;
 &lt;head&gt;
@@ -135,9 +131,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

http://git-wip-us.apache.org/repos/asf/freemarker-site/blob/e3ae7133/docs/dgui_quickstart_datamodel.html
----------------------------------------------------------------------
diff --git a/docs/dgui_quickstart_datamodel.html 
b/docs/dgui_quickstart_datamodel.html
index 87994b0..e20856c 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?1510568240191">
+<link rel="stylesheet" type="text/css" 
href="docgen-resources/docgen.min.css?1522915944172">
 <script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -35,13 +35,8 @@ ga('send', 'pageview');
       <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?1510568240191"></script>
-      <script src="docgen-resources/main.min.js?1510568240191"></script>
-      <div class="side-toc-logos">
-          <div class="side-toc-logo">
-            <a href="http://incubator.apache.org/"; target="_blank"><img 
src="apache-incubator.png" alt="Apache Incubator" /></a>
-          </div>
-      </div>
+      <script src="toc.js?1522915944172"></script>
+      <script src="docgen-resources/main.min.js?1522915944172"></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>
@@ -196,9 +191,9 @@ 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_license.html">License</a></li></ul></div><div 
class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a 
href="http://try.freemarker.org/";>Try template online</a></li><li><a 
href="dgui_template_exp.html#exp_cheatsheet">Expressions 
cheatsheet</a></li><li><a 
href="ref_directive_alphaidx.html">#directives</a></li><li><a 
href="ref_builtins_alphaidx.html">?built_ins</a></li><li><a 
href="ref_specvar.html">.special_vars</a></li></ul></div><div 
class="column"><h3 class="column-header">Community</h3><u
 l><li><a href="https://github.com/freemarker/freemarker";>FreeMarker on 
Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on 
Twitter</a></li><li><a 
href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a 
bug</a></li><li><a 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Ask a 
question</a></li><li><a 
href="https://freemarker.apache.org/mailing-lists.html";>Mailing 
lists</a></li></ul></div></div><div class="col-right"><ul 
class="social-icons"><li><a class="github" 
href="https://github.com/freemarker/freemarker";>Github</a></li><li><a 
class="twitter" href="https://twitter.com/freemarker";>Twitter</a></li><li><a 
class="stack-overflow" 
href="https://stackoverflow.com/questions/ask?tags=freemarker";>Stack 
Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/"; 
rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind 
XML Editor</span></a></div></div><div class="footer-bottom"> <p 
class="last-generated">
 Last generated:
-<time itemprop="dateModified" datetime="2017-11-13T10:17:20Z" title="Monday, 
November 13, 2017 10:17:20 AM GMT">2017-11-13 10:17:20 GMT</time>, for 
Freemarker 2.3.27 </p>
+<time itemprop="dateModified" datetime="2018-04-05T08:12:24Z" title="Thursday, 
April 5, 2018 8:12:24 AM GMT">2018-04-05 08:12:24 GMT</time>, for Freemarker 
2.3.28 </p>
 <p class="copyright">
-© <span itemprop="copyrightYear">1999</span>–2017
+© <span itemprop="copyrightYear">1999</span>–2018
 <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>
 </div></div></div></body>
 </html>

Reply via email to