You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/01/06 22:15:44 UTC
incubator-freemarker-site git commit: - Added to Committer how-to:
Closing GitHub PR requests without merging
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/asf-site 2ceb349d2 -> e3d8b3861
- Added to Committer how-to: Closing GitHub PR requests without merging
- Github replaced with GitHub everywhere
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/e3d8b386
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/e3d8b386
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/e3d8b386
Branch: refs/heads/asf-site
Commit: e3d8b38615b5bb4a738fbbdf69032b93f84bd71e
Parents: 2ceb349
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 23:15:44 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 23:15:44 2017 +0100
----------------------------------------------------------------------
committer-howto.html | 50 +++++++++++++++++++++++++++++++++++++-------
contribute.html | 2 +-
editors.html | 4 ++--
freemarkerdownload.html | 2 +-
history.html | 2 +-
index.html | 2 +-
mailing-lists.html | 2 +-
poweredBy.html | 2 +-
sourcecode.html | 2 +-
toc.js | 10 ++++++++-
10 files changed, 60 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/committer-howto.html
----------------------------------------------------------------------
diff --git a/committer-howto.html b/committer-howto.html
index f63c5c6..89a84ad 100644
--- a/committer-howto.html
+++ b/committer-howto.html
@@ -42,7 +42,7 @@ ga('send', 'pageview');
<h1 class="content-header header-section1" id="committer-howto" itemprop="headline">Committer how-to</h1>
</div></div><div class="page-menu">
<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="#making-releases" data-menu-target="making-releases">Making releases</a></li><li><a class="page-menu-link" href="#updating-homepage" data-menu-target="updating-homepage">Updating the FreeMarker home page</a></li><li><a class="page-menu-link" href="#edit-docbook" data-menu-target="edit-docbook">Regarding editing the Manual and the Site DocBook</a></li></ul> </div><p><em>This page applies to Committers only, not to usual
+<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-releases" data-menu-target="making-releases">Making releases</a></li><li><a class="page-menu-link" href="#updating-homepage" data-menu-target="updating-homepage">Updating the FreeMarker home page</a></li><li><a class="page-menu-link" href="#edit-docbook" data-menu-target="edit-docbook">Regarding editing the Manual and the Site DocBook</a></li></ul> </div><p><em>This page applies to Committers only, not to usual
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
contribute, anyone can fork and send pull requests on Github; see more
@@ -55,7 +55,7 @@ ga('send', 'pageview');
<p>A Committer can commit directly into the Apache Git repository
- of FreeMarker, and so preferably doesn't use Github pull requests.
+ of FreeMarker, and so preferably doesn't use GitHub pull requests.
(See <a href="sourcecode.html">the repositories and branches
here</a>.)</p>
@@ -78,10 +78,10 @@ ga('send', 'pageview');
-<h2 class="content-header header-section2" id="merging-pull-request">Merging in pull requests from Github</h2>
+<h2 class="content-header header-section2" id="merging-pull-request">Merging in pull requests from GitHub</h2>
- <p>Pull requests from Github are merged in by Committers. Before
+ <p>Pull requests from GitHub are merged in by Committers. Before
accepting a pull request, ensure that:</p>
<ul>
@@ -106,14 +106,14 @@ ga('send', 'pageview');
<ul>
<li>
<p><code class="inline-code"> <em class="code-color"><PROJECT></em>
- </code> is usually
+ </code>is usually
<code class="inline-code">incubator-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>
+ </code>is the pull request number that GitHub shows prominently
+ after a "#"</p>
</li>
</ul>
@@ -132,6 +132,40 @@ ga('send', 'pageview');
+<h2 class="content-header header-section2" id="close-pull-request-without-merging">Closing GitHub pull requests without merging</h2>
+
+
+
+
+<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">incubator-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>
+
+
+
+
+
<h2 class="content-header header-section2" id="making-releases">Making releases</h2>
@@ -542,7 +576,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="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/contribute.html
----------------------------------------------------------------------
diff --git a/contribute.html b/contribute.html
index e4b04e5..b49d7d6 100644
--- a/contribute.html
+++ b/contribute.html
@@ -218,7 +218,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="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/editors.html
----------------------------------------------------------------------
diff --git a/editors.html b/editors.html
index 188b089..625dc75 100644
--- a/editors.html
+++ b/editors.html
@@ -190,7 +190,7 @@ ga('send', 'pageview');
<td><a href="https://github.com/freemarker/FreeMarker.tmbundle">Install
- from Github Project</a></td>
+ from GitHub Project</a></td>
</tr>
@@ -230,7 +230,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="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/freemarkerdownload.html
----------------------------------------------------------------------
diff --git a/freemarkerdownload.html b/freemarkerdownload.html
index 49d4e8d..93aa1bb 100644
--- a/freemarkerdownload.html
+++ b/freemarkerdownload.html
@@ -217,7 +217,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="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/history.html
----------------------------------------------------------------------
diff --git a/history.html b/history.html
index cec7efb..fe34576 100644
--- a/history.html
+++ b/history.html
@@ -132,7 +132,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index a57290d..c207c3e 100644
--- a/index.html
+++ b/index.html
@@ -132,7 +132,7 @@ ga('send', 'pageview');
</div>
<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/mailing-lists.html
----------------------------------------------------------------------
diff --git a/mailing-lists.html b/mailing-lists.html
index 471db6f..e20f28d 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -91,7 +91,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="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/poweredBy.html
----------------------------------------------------------------------
diff --git a/poweredBy.html b/poweredBy.html
index 2a36041..d8d43eb 100644
--- a/poweredBy.html
+++ b/poweredBy.html
@@ -638,7 +638,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="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/sourcecode.html
----------------------------------------------------------------------
diff --git a/sourcecode.html b/sourcecode.html
index da762ee..e121b6e 100644
--- a/sourcecode.html
+++ b/sourcecode.html
@@ -102,7 +102,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="column-header">Handy stuff</h3><ul><li><a href="http://freemarker-online.kenshoo.com/">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/apach
e/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="http://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="http://stackoverflow.com/questions/ask?tags=freemarker">Stack Overflow</a></li></ul><a class="xxe" href="http://www.xmlmind.com/xmleditor/" rel="nofollow" title="Edited with XMLMind XML Editor"><span>Edited with XMLMind XML Editor</span></a></div></div><div class="footer-bottom"> <p class="last-generated">
Last generated:
-<time itemprop="dateModified" datetime="2017-01-06T19:48:50Z" title="Friday, January 6, 2017 7:48:50 PM GMT">2017-01-06 19:48:50 GMT</time> </p>
+<time itemprop="dateModified" datetime="2017-01-06T22:13:20Z" title="Friday, January 6, 2017 10:13:20 PM GMT">2017-01-06 22:13:20 GMT</time> </p>
<p class="copyright">
� <span itemprop="copyrightYear">1999</span>\u20132017
<a itemtype="http://schema.org/Organization" itemprop="copyrightHolder" href="http://freemarker.org">The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e3d8b386/toc.js
----------------------------------------------------------------------
diff --git a/toc.js b/toc.js
index c21bcda..3690980 100644
--- a/toc.js
+++ b/toc.js
@@ -172,7 +172,7 @@ var toc = {
}
,
{
-"title": "Merging in pull requests from Github",
+"title": "Merging in pull requests from GitHub",
"url": "committer-howto.html#merging-pull-request",
"isFile": false,
"children": [
@@ -180,6 +180,14 @@ var toc = {
}
,
{
+"title": "Closing GitHub pull requests without merging",
+"url": "committer-howto.html#close-pull-request-without-merging",
+"isFile": false,
+"children": [
+]
+}
+,
+{
"title": "Making releases",
"url": "committer-howto.html#making-releases",
"isFile": false,