You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/11/12 17:26:35 UTC
incubator-freemarker-site git commit: Additional trademark related
things.
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/asf-site d81271467 -> 965dfe4f3
Additional trademark related things.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/965dfe4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/965dfe4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/965dfe4f
Branch: refs/heads/asf-site
Commit: 965dfe4f3d9b26b739f8a6312ef68bc2802b973b
Parents: d812714
Author: ddekany <dd...@apache.org>
Authored: Sun Nov 12 18:26:28 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Nov 12 18:26:28 2017 +0100
----------------------------------------------------------------------
committer-howto.html | 18 +++++++++---------
contribute.html | 18 +++++++++---------
editors.html | 18 +++++++++---------
freemarkerdownload.html | 18 +++++++++---------
history.html | 18 +++++++++---------
index.html | 22 +++++++++++-----------
mailing-lists.html | 18 +++++++++---------
poweredBy.html | 18 +++++++++---------
report-security-vulnerabilities.html | 18 +++++++++---------
sourcecode.html | 18 +++++++++---------
toc.js | 4 ++--
11 files changed, 94 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/965dfe4f/committer-howto.html
----------------------------------------------------------------------
diff --git a/committer-howto.html b/committer-howto.html
index 6b69c8d..762558d 100644
--- a/committer-howto.html
+++ b/committer-howto.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-section">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Committer how-to - Apache FreeMarker</title>
+<title>Committer how-to - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Committer how-to">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/committer-howto.html">
<link rel="canonical" href="https://freemarker.apache.org/committer-howto.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Community","Committer how-to"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Community","Committer how-to"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -729,9 +729,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/contribute.html
----------------------------------------------------------------------
diff --git a/contribute.html b/contribute.html
index 91f8952..9c76acb 100644
--- a/contribute.html
+++ b/contribute.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-section">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Contributors wanted! - Apache FreeMarker</title>
+<title>Contributors wanted! - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Contributors wanted!">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/contribute.html">
<link rel="canonical" href="https://freemarker.apache.org/contribute.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Community","Contributors wanted!"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Community","Contributors wanted!"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -225,9 +225,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/editors.html
----------------------------------------------------------------------
diff --git a/editors.html b/editors.html
index 41d44a0..78ac5ec 100644
--- a/editors.html
+++ b/editors.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-section">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Editor and IDE plugins - Apache FreeMarker</title>
+<title>Editor and IDE plugins - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Editor and IDE plugins">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/editors.html">
<link rel="canonical" href="https://freemarker.apache.org/editors.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Tooling","Editor and IDE plugins"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Tooling","Editor and IDE plugins"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -247,9 +247,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/freemarkerdownload.html
----------------------------------------------------------------------
diff --git a/freemarkerdownload.html b/freemarkerdownload.html
index 4edfe97..ed0659d 100644
--- a/freemarkerdownload.html
+++ b/freemarkerdownload.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-chapter">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Download / Maven - Apache FreeMarker</title>
+<title>Download / Maven - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Download / Maven">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/freemarkerdownload.html">
<link rel="canonical" href="https://freemarker.apache.org/freemarkerdownload.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Download / Maven"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Download / Maven"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -226,9 +226,9 @@ two freemarker.jar-s and unpredictable behavior!
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/history.html
----------------------------------------------------------------------
diff --git a/history.html b/history.html
index 189a94a..029f9ab 100644
--- a/history.html
+++ b/history.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-section">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Project history - Apache FreeMarker</title>
+<title>Project history - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Project history">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/history.html">
<link rel="canonical" href="https://freemarker.apache.org/history.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Foundation","Project history"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Foundation","Project history"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -138,9 +138,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 30814bd..a9e6a89 100644
--- a/index.html
+++ b/index.html
@@ -7,8 +7,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
-<meta property="og:title" content="What is Apache FreeMarker?">
+<meta property="og:site_name" content="Apache FreeMarker™">
+<meta property="og:title" content="What is Apache FreeMarker™?">
<meta name="description" content="Java template engine; generates HTML web pages, e-mails, configuration files, source code, etc. from template files and the data your application provides.">
<meta name="og:description" content="Java template engine; generates HTML web pages, e-mails, configuration files, source code, etc. from template files and the data your application provides.">
<meta property="og:locale" content="en_US">
@@ -16,7 +16,7 @@
<link rel="canonical" href="https://freemarker.apache.org/index.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -28,7 +28,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -36,9 +36,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","What is Apache FreeMarker?"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","What is Apache FreeMarker™?"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -46,8 +46,8 @@ ga('send', 'pageview');
</div>
</div>
<div class="col-right"><div class="page-content"><div class="page-title"><div class="title-wrapper">
-<h1 class="content-header header-chapter" id="what-is-freemarker" itemprop="headline">What is Apache FreeMarker?</h1>
-</div></div><p>Apache FreeMarker is a <em>template engine</em>: a Java
+<h1 class="content-header header-chapter" id="what-is-freemarker" itemprop="headline">What is Apache FreeMarker™?</h1>
+</div></div><p>Apache FreeMarker™ is a <em>template engine</em>: a Java
library to generate text output (HTML web pages, e-mails, configuration
files, source code, etc.) based on templates and changing data. Templates
are written in the FreeMarker Template Language (FTL), which is a simple,
@@ -137,9 +137,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/mailing-lists.html
----------------------------------------------------------------------
diff --git a/mailing-lists.html b/mailing-lists.html
index 32be226..1b582d3 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-section">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Discuss on mailing lists - Apache FreeMarker</title>
+<title>Discuss on mailing lists - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Discuss on mailing lists">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/mailing-lists.html">
<link rel="canonical" href="https://freemarker.apache.org/mailing-lists.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Community","Discuss on mailing lists"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Community","Discuss on mailing lists"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -96,9 +96,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/poweredBy.html
----------------------------------------------------------------------
diff --git a/poweredBy.html b/poweredBy.html
index 61be0a8..86a9db5 100644
--- a/poweredBy.html
+++ b/poweredBy.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-section">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Who uses FreeMarker? - Apache FreeMarker</title>
+<title>Who uses FreeMarker? - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Who uses FreeMarker?">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/poweredBy.html">
<link rel="canonical" href="https://freemarker.apache.org/poweredBy.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Community","Who uses FreeMarker?"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Community","Who uses FreeMarker?"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -643,9 +643,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/report-security-vulnerabilities.html
----------------------------------------------------------------------
diff --git a/report-security-vulnerabilities.html b/report-security-vulnerabilities.html
index 0dd5fcd..7ea7664 100644
--- a/report-security-vulnerabilities.html
+++ b/report-security-vulnerabilities.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-section">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Report security vulnerability - Apache FreeMarker</title>
+<title>Report security vulnerability - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Report security vulnerability">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/report-security-vulnerabilities.html">
<link rel="canonical" href="https://freemarker.apache.org/report-security-vulnerabilities.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Community","Report security vulnerability"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Community","Report security vulnerability"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -57,9 +57,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/sourcecode.html
----------------------------------------------------------------------
diff --git a/sourcecode.html b/sourcecode.html
index 43ef342..5a26175 100644
--- a/sourcecode.html
+++ b/sourcecode.html
@@ -3,18 +3,18 @@
<html lang="en" class="page-type-section">
<head prefix="og: http://ogp.me/ns#">
<meta charset="utf-8">
-<title>Source code (Git) - Apache FreeMarker</title>
+<title>Source code (Git) - Apache FreeMarker™</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="format-detection" content="telephone=no">
-<meta property="og:site_name" content="Apache FreeMarker">
+<meta property="og:site_name" content="Apache FreeMarker™">
<meta property="og:title" content="Source code (Git)">
<meta property="og:locale" content="en_US">
<meta property="og:url" content="https://freemarker.apache.org/sourcecode.html">
<link rel="canonical" href="https://freemarker.apache.org/sourcecode.html">
<link rel="icon" href="favicon.png" type="image/png">
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Roboto:500,700,400,300|Droid+Sans+Mono">
-<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510444731187">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1510507474480">
<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),
@@ -26,7 +26,7 @@ ga('send', 'pageview');
</head>
<body itemscope itemtype="https://schema.org/Code">
<meta itemprop="url" content="https://freemarker.apache.org/">
- <meta itemprop="name" content="Apache FreeMarker">
+ <meta itemprop="name" content="Apache FreeMarker™">
<!--[if lte IE 9]>
<div style="background-color: #C00; color: #fff; padding: 12px 24px;">Please use a modern browser to view this website.</div>
@@ -34,9 +34,9 @@ ga('send', 'pageview');
</a><ul class="tabs"><li class="current"><a href="index.html">Home</a></li><li><a href="docs/index.html">Manual</a></li><li><a class="external" href="docs/api/index.html">Java API</a></li></ul><ul class="secondary-tabs"><li><a class="tab icon-heart" href="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></a></li><li><a class="tab icon-download" href="freemarkerdownload.html" title="Download"><span>Download</span></a></li></ul></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","Community","Source code (Git)"];</script>
- <script src="toc.js?1510444731187"></script>
- <script src="docgen-resources/main.min.js?1510444731187"></script>
+ <script>var breadcrumb = ["Apache FreeMarker™","Community","Source code (Git)"];</script>
+ <script src="toc.js?1510507474480"></script>
+ <script src="docgen-resources/main.min.js?1510507474480"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="http://incubator.apache.org/" target="_blank"><img src="images/apache-incubator.png" alt="Apache Incubator" /></a>
@@ -112,9 +112,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="index.html">What is FreeMarker?</a></li><li><a href="freemarkerdownload.html">Download</a></li><li><a href="docs/app_versions.html">Version history</a></li><li><a href="history.html">About us</a></li><li><a itemprop="license" href="docs/app_license.html">License</a></li></ul></div><div class="column"><h3 class="column-header">Handy stuff</h3><ul><li><a href="http://try.freemarker.org/">Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator
-freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker">Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/">Report a bug</a></li><li><a href="https://stackoverflow.com/questions/ask?tags=freemarker">Ask a question</a></li><li><a href="mailing-lists.html">Mailing lists</a></li></ul></div></div><div class="col-right"><ul class="social-icons"><li><a class="github" href="https://github.com/apache/incubator-freemarker">GitHub</a></li><li><a class="twitter" href="https://twitter.com/freemarker">Twitter</a></li><li><a class="stack-overflow" href="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-11T23:58:51Z" title="Saturday, November 11, 2017 11:58:51 PM GMT">2017-11-11 23:58:51 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-11-12T17:24:34Z" title="Sunday, November 12, 2017 5:24:34 PM GMT">2017-11-12 17:24:34 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2017
-<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
+<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://apache.org/">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. 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/incubator-freemarker-site/blob/965dfe4f/toc.js
----------------------------------------------------------------------
diff --git a/toc.js b/toc.js
index 9d47535..59da8e0 100644
--- a/toc.js
+++ b/toc.js
@@ -1,11 +1,11 @@
var toc = {
-"title": "Apache FreeMarker",
+"title": "Apache FreeMarker™",
"url": null,
"isFile": true,
"children": [
{
-"title": "What is Apache FreeMarker?",
+"title": "What is Apache FreeMarker™?",
"url": "index.html",
"isFile": true,
"children": [