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 2019/08/01 22:35:27 UTC
[freemarker-site] branch asf-site updated: Some updates to how Git
(since Gitbox) operates. Some typo fixes.
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/freemarker-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new fc36e35 Some updates to how Git (since Gitbox) operates. Some typo fixes.
fc36e35 is described below
commit fc36e35ee083e41d8ddc036380accbc9692a06d1
Author: ddekany <dd...@apache.org>
AuthorDate: Fri Aug 2 00:35:18 2019 +0200
Some updates to how Git (since Gitbox) operates. Some typo fixes.
---
committer-howto.html | 88 ++++++++++++++++++++++++++++++------
contribute.html | 12 ++---
editors.html | 8 ++--
file-to-file-transformer-tools.html | 8 ++--
freemarkerdownload.html | 8 ++--
history.html | 8 ++--
index.html | 8 ++--
mailing-lists.html | 8 ++--
poweredBy.html | 10 ++--
report-security-vulnerabilities.html | 8 ++--
sourcecode.html | 19 ++++----
11 files changed, 123 insertions(+), 62 deletions(-)
diff --git a/committer-howto.html b/committer-howto.html
index e3c5091..661fde9 100644
--- a/committer-howto.html
+++ b/committer-howto.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -50,7 +50,7 @@ ga('send', 'pageview');
<div class="page-menu-title">Page Contents</div>
<ul><li><a class="page-menu-link" href="#git-commit-policy" data-menu-target="git-commit-policy">Git commit policies</a></li><li><a class="page-menu-link" href="#merging-pull-request" data-menu-target="merging-pull-request">Merging in pull requests from GitHub</a></li><li><a class="page-menu-link" href="#close-pull-request-without-merging" data-menu-target="close-pull-request-without-merging">Closing GitHub pull requests without merging</a></li><li><a class="page-menu-link" href="#making [...]
contributors.</em> A Committer is a person with extra rights who
- receives his status via invitation. You don't need to be a Committer to
+ receives his or her status via invitation. You don't need to be a Committer to
contribute, anyone can fork and send pull requests on Github; see more
on <a href="contribute.html">the page for contributors</a>.</p>
@@ -111,17 +111,42 @@ ga('send', 'pageview');
</li>
</ul>
- <p>To merge the pull request, the merge button on Github should
- work (since we have migrated to gitbox - earlier it was more
- complicated).</p>
-
<p>The commit comment should automatically describe that it's a
merge and where it was merged from. After that you may also want to
- add a summary of what the merged branch does.</p>
+ add a summary of what the merged branch does. In general, pull request
+ merge commits should adhere to the same policies that Committers use
+ to commit directly into the Apache git repository.</p>
+
+ <p>To do the actual merging, if your Apache and Github accounts are
+ linked (see how on the <a href="https://gitbox.apache.org/">ASF Writable Git Services
+ homepage</a>), the Merge (and Close) button on Github should appear
+ and work.</p>
+
+ <p>If you can't/don't want to use Github, use this command on your
+ clone of the Apache repo (not the Github repo) (need to be tested if
+ it still works after the migration to Gitbox):</p>
+
+
+
+<div class="code-wrapper"><pre class="code-block code-default">git pull --no-ff https://github.com/apache/<PROJECT> refs/pull/<PR_NUMBER>/head</pre></div>
+
+ <p>Where:</p>
+
+ <ul>
+ <li>
+ <p><code class="inline-code"> <em class="code-color"><PROJECT></em>
+ </code>is usually <code class="inline-code">freemarker</code></p>
+ </li>
+
+ <li>
+ <p><code class="inline-code"> <em class="code-color"><PR_NUMBER></em>
+ </code>is the pull request number that GitHub shows prominently
+ after a "#"</p>
+ </li>
+ </ul>
- <p>In general, pull request merge commits should adhere to the same
- policies that Committers use to commit directly into the Apache git
- repository.</p>
+ <p>Pushing such a merge commit to the ASF repo will automatically
+ close the pull request on Github.</p>
@@ -130,8 +155,41 @@ ga('send', 'pageview');
<h2 class="content-header header-section2" id="close-pull-request-without-merging">Closing GitHub pull requests without merging</h2>
- <p>Yet again the github buttons for this should work. You should
- state the reason of closing in the closing comment.</p>
+ <p>You should state the reason of closing in the closing
+ comment.</p>
+
+ <p>Yet again, if your Apache and Github accounts are linked, the
+ Close button on Github should appear and work.</p>
+
+ <p>Without linked accounts, we used this command on the clone of
+ the Apache repo (but apparently it doesn't work on non-master branch
+ anymore):</p>
+
+
+
+<div class="code-wrapper"><pre class="code-block code-default">git commit --allow-empty -m "closes apache/<PROJECT>#<PR_NUMBER>: <WHY>"</pre></div>
+
+ <p>Where:</p>
+
+ <ul>
+ <li>
+ <p><code class="inline-code"> <em class="code-color"><PROJECT></em>
+ </code>is usually <code class="inline-code">freemarker</code></p>
+ </li>
+
+ <li>
+ <p><code class="inline-code"> <em class="code-color"><PR_NUMBER></em>
+ </code>is the pull request number that GitHub shows prominently
+ after a "#"</p>
+ </li>
+
+ <li>
+ <p><code class="inline-code"> <em class="code-color"><WHY></em>
+ </code>is the reason of the closing. For clarity, you may want
+ to end it with "Closed PR without merging." or
+ something similar.</p>
+ </li>
+ </ul>
@@ -671,7 +729,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/contribute.html b/contribute.html
index ca650d1..af4c6df 100644
--- a/contribute.html
+++ b/contribute.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -48,7 +48,7 @@ ga('send', 'pageview');
<h1 class="content-header header-section1" id="contribute" itemprop="headline">Contributors wanted!</h1>
</div></div><div class="page-menu">
<div class="page-menu-title">Page Contents</div>
-<ul><li><a class="page-menu-link" href="#how-to-contribute" data-menu-target="how-to-contribute">How do I contribute?</a></li><li><a class="page-menu-link" href="#what-to-contribute" data-menu-target="what-to-contribute">What should I contribute?</a></li></ul> </div><p>As it's the case with many opens source projects, FreeMarker
+<ul><li><a class="page-menu-link" href="#how-to-contribute" data-menu-target="how-to-contribute">How do I contribute?</a></li><li><a class="page-menu-link" href="#what-to-contribute" data-menu-target="what-to-contribute">What should I contribute?</a></li></ul> </div><p>As it's the case with many open source projects, FreeMarker
doesn't have and never had a payed staff, nor a backing corporate entity
who finances it otherwise. It's ran by volunteers since it started in
1999. So we are always looking for people to help FreeMarker to
@@ -134,7 +134,7 @@ ga('send', 'pageview');
<ul>
<li>
- <p>FreeMarker Spring MVC integration. Someone who know both
+ <p>FreeMarker Spring MVC integration. Someone who knows both
well should keep an eye on this, improving it where
necessary.</p>
</li>
@@ -231,7 +231,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/editors.html b/editors.html
index cb70c44..b467434 100644
--- a/editors.html
+++ b/editors.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -221,7 +221,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/file-to-file-transformer-tools.html b/file-to-file-transformer-tools.html
index 852d416..531200a 100644
--- a/file-to-file-transformer-tools.html
+++ b/file-to-file-transformer-tools.html
@@ -14,7 +14,7 @@
<link rel="canonical" href="https://freemarker.apache.org/file-to-file-transformer-tools.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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<div class="content-wrapper">
<div id="table-of-contents-wrapper" class="col-left">
<script>var breadcrumb = ["Apache FreeMarker™","Tooling","File-to-file transformers"];</script>
- <script src="toc.js?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -84,7 +84,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/freemarkerdownload.html b/freemarkerdownload.html
index 8ab567e..4a63d5a 100644
--- a/freemarkerdownload.html
+++ b/freemarkerdownload.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -207,7 +207,7 @@ 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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/history.html b/history.html
index 9652971..1f83979 100644
--- a/history.html
+++ b/history.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<div class="content-wrapper">
<div id="table-of-contents-wrapper" class="col-left">
<script>var breadcrumb = ["Apache FreeMarker™","Community","Project history"];</script>
- <script src="toc.js?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -134,7 +134,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/index.html b/index.html
index ebee21c..118b0f8 100644
--- a/index.html
+++ b/index.html
@@ -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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -38,8 +38,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -128,7 +128,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/mailing-lists.html b/mailing-lists.html
index 6bba146..f50ad18 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -96,7 +96,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/poweredBy.html b/poweredBy.html
index e537c93..7bcdb58 100644
--- a/poweredBy.html
+++ b/poweredBy.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -568,7 +568,7 @@ ga('send', 'pageview');
<td>DriveNow - A car rental website that allows customers to
book rental cars from major suppliers at discounted last minute
rates. Datacodex have developed a site DriveNow that utilises
- FreeMarker for it's view layer inside it's framework,
+ FreeMarker for its view layer inside its framework,
WebWork2.</td>
</tr>
@@ -656,7 +656,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/report-security-vulnerabilities.html b/report-security-vulnerabilities.html
index b217604..0763283 100644
--- a/report-security-vulnerabilities.html
+++ b/report-security-vulnerabilities.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -58,7 +58,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>
diff --git a/sourcecode.html b/sourcecode.html
index 2a3a495..f76f303 100644
--- a/sourcecode.html
+++ b/sourcecode.html
@@ -14,7 +14,7 @@
<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="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?1547749584842">
+<link rel="stylesheet" type="text/css" href="docgen-resources/docgen.min.css?1564698672290">
<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),
@@ -36,8 +36,8 @@ ga('send', 'pageview');
<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?1547749584842"></script>
- <script src="docgen-resources/main.min.js?1547749584842"></script>
+ <script src="toc.js?1564698672290"></script>
+ <script src="docgen-resources/main.min.js?1564698672290"></script>
<div class="side-toc-logos">
<div class="side-toc-logo">
<a href="https://www.apache.org/events/current-event.html" target="_blank"><img src="https://www.apache.org/events/current-event-234x60.png" alt="Apache Incubator" /></a>
@@ -46,10 +46,13 @@ ga('send', 'pageview');
</div>
<div class="col-right"><div class="page-content"><div class="page-title"><div class="title-wrapper">
<h1 class="content-header header-section1" id="sourcecode" itemprop="headline">Source code (Git)</h1>
-</div></div><p>The project repositories are at the Apache Software Foundation.
- These Apache repositories are also accessible through GitHub, which is
- practical for sending patches via usual GitHub forking and pull
- requests.</p><p>The key repositories are:</p><ul>
+</div></div><p>The project repositories are at the Apache Software Foundation
+ (see <a href="https://gitbox.apache.org/">ASF Writable Git
+ Services homepage</a>), and are also mirrored on Github. Using the
+ Github repo is certainly the easiest for most. For those with direct
+ write access to source code, note that the Github repo is writable (not
+ just a read-only mirror anymore), as far as your Apache account and
+ Github accounts are linked.</p><p>The key repositories are:</p><ul>
<li>
<p><code class="inline-code">freemarker</code>: The engine itself (i.e.,
<code class="inline-code">freemarker.jar</code>) and the documentation. URL:
@@ -105,7 +108,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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=" [...]
Last generated:
-<time itemprop="dateModified" datetime="2019-01-17T18:26:24Z" title="Thursday, January 17, 2019 6:26:24 PM GMT">2019-01-17 18:26:24 GMT</time> </p>
+<time itemprop="dateModified" datetime="2019-08-01T22:31:12Z" title="Thursday, August 1, 2019 10:31:12 PM GMT">2019-08-01 22:31:12 GMT</time> </p>
<p class="copyright">
© <span itemprop="copyrightYear">1999</span>–2019
<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>