Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site d420c895b -> c39852776
Added Committer how-to page. This includes the step-by-step instructions for making releases too. 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/c3985277 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/c3985277 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/c3985277 Branch: refs/heads/asf-site Commit: c39852776b0b27db00eea95add58b2a66b8c88ab Parents: d420c89 Author: ddekany <[email protected]> Authored: Thu Jan 5 01:17:55 2017 +0100 Committer: ddekany <[email protected]> Committed: Thu Jan 5 01:17:55 2017 +0100 ---------------------------------------------------------------------- committer-howto.html | 477 +++++++++++++++++++++++++++++++++++++++++++ contribute.html | 26 ++- editors.html | 4 +- freemarkerdownload.html | 4 +- history.html | 4 +- index.html | 4 +- mailing-lists.html | 4 +- poweredBy.html | 4 +- sitemap.xml | 3 + sourcecode.html | 4 +- toc.js | 20 +- 11 files changed, 523 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/committer-howto.html ---------------------------------------------------------------------- diff --git a/committer-howto.html b/committer-howto.html new file mode 100644 index 0000000..fe78fb7 --- /dev/null +++ b/committer-howto.html @@ -0,0 +1,477 @@ +<!doctype html> +<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> +<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="Committer how-to"> +<meta property="og:locale" content="en_US"> +<meta property="og:url" content="http://freemarker.org/committer-howto.html";> +<link rel="canonical" href="http://freemarker.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"> +<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), +m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) +})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); +ga('create', 'UA-55420501-1', 'auto'); +ga('send', 'pageview'); +</script> +</head> +<body itemscope itemtype="https://schema.org/Code";> + <meta itemprop="url" content="http://freemarker.org/";> + <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> + <![endif]--><div class="header-top-bg"><div class="site-width header-top"><a class="logo" href="http://freemarker.org"; role="banner"> <img itemprop="image" src="logo.png" alt="FreeMarker"> +</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"></script> + <script src="docgen-resources/main.min.js"></script> + </div> +<div class="col-right"><div class="page-content"><div class="page-title"><div class="title-wrapper"> +<h1 class="content-header header-section1" id="committer-howto" itemprop="headline">Committer how-to</h1> +</div></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 + on <a href="contribute.html">the page for contributors</a>.</p> + + + + +<h2 class="content-header header-simplesect" id="autoid_27">Git commit policies</h2> + + + <p>A Committer can commit directly into the Apache Git repository + of FreeMarker, and so preferably doesn't use Github pull requests. + (See <a href="sourcecode.html">the repositories and branches + here</a>.)</p> + + <p>A Committer has the technical permissions to commit directly + into the "main" branch (or branches), and (s)he is + expected to use that wisely. Depending on the complexity of the + feature, the number of active Committers in the time period, and + whether the feature is expected to be disputed by the community, (s)he + may should work in a feature branch instead. If the feature is + finished and disputes were resolved (on some way described by Apache + policies), it can be merged back into the "main" + branch.</p> + + <p>All commits should have helpful comments; don't afraid of + writing long descriptions. If the commit is related to a Jira issue, + the comment should start with the Jira issue identifier, like + "FREEMARKER-16: ..."</p> + + + + + +<h2 class="content-header header-simplesect" id="autoid_28">Merging in pull requests from Github</h2> + + + <p>Pull requests from Github are merged in by Committers. Before + accepting a pull request, ensure that:</p> + + <ul> + <li> + <p>The contributor has a CLA at Apache (see on <a href="http://people.apache.org/";>http://people.apache.org/</a>)</p> + </li> + + <li> + <p>The contributor has used the proper branch of the project + (it's sometimes looked over)</p> + </li> + </ul> + + <p>To merge the pull request:</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">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</p> + </li> + </ul> + + <p>The commit comment should automatically describe that it's a + merge and if from where. After that you may also want to add a summary + of what the merged branch does.</p> + + <p>In general, pull request merge commits should adhere to the same + policies as if the Committer who commits directly into the Apache git + repository.</p> + + <p>Pushing the merge commit to the ASF repo will automatically + close the pull request on Github.</p> + + + + + +<h2 class="content-header header-simplesect" id="autoid_29">Making releases</h2> + + + <p>For each release, a release engineer is appointed among the + Committers. The release engineer should follow the procedure here, and + (s)he should update this page where (s)he has to deviate from + it.</p> + + <p>For general info about making releases, please read <a href="http://www.apache.org/legal/release-policy#archived";>http://www.apache.org/legal/release-policy</a> + and <a href="http://incubator.apache.org/guides/releasemanagement.html";>http://incubator.apache.org/guides/releasemanagement.html</a>. + The FreeMarker-specific additions to those are:</p> + + <ul> + <li> + <p>Releases with non-trivial changes should have at least one + Release Candidate (RC01) release, which is legally a normal + release (not just a internal/developer one), and is promoted for + at least 1 month on our web page. These are there differences to a + final release:</p> + + <ul> + <li> + <p>RC-s aren't released to the Maven Central + Repository</p> + </li> + + <li> + <p>RC documentation (Manual + JavaDoc) is only published + under + http://freemarker.org/builds/<em>X.X.X</em>-rc<em>X</em>/</p> + </li> + </ul> + </li> + + <li> + <p>Releases should have both an src and bin tar.gz + (downloadable from the Apache Software Foundation, as + usual)</p> + </li> + + <li> + <p>The same two artifacts should also be released (uploaded for + download) on <a href="https://sourceforge.net/projects/freemarker/";>https://sourceforge.net/projects/freemarker/</a>. + We add a note there to the indicate that the canonical download is + the one from Apache.</p> + </li> + + <li> + <p>Releases should have a usual jar artifact, an src artifact + and javadoc artifact either in the Apache Maven staging reposotory + (for RC-s), or in the Maven Central Repository (for + finals).</p> + </li> + </ul> + + <p>The steps of making a release:</p> + + <div class="orderedlist"><ol type="1"> + <li> + <p>Check that <code class="inline-code">version.properties</code> is up to + date. Also that the version number in the title and version + history of the Manual are up to date.</p> + </li> + + <li> + <p><code class="inline-code">ant dist</code></p> + </li> + + <li> + <p><code class="inline-code">ant rat</code>, check output</p> + </li> + + <li> + <p>Ensure this is up to date: + https://dist.apache.org/repos/dist/<em>{dev,release}</em>/incubator/freemarker/KEY</p> + </li> + + <li> + <p>SVN commit the release files into the proper subdirectory of + https://dist.apache.org/repos/<strong>dist</strong>/dev/incubator/freemarker. Note that + this is "dev/", not "release/"!</p> + </li> + + <li> + <p>Upload to ASF Nexus staging</p> + + <div class="orderedlist"><ol type="1"> + <li> + <p>If your Maven <code class="inline-code">settings-security.xml</code> + is relocated to an encrypted storage (recommended), mount it, + otherwise you will get 401 error when uploading.</p> + </li> + + <li> + <p><code class="inline-code">ant maven-dist</code></p> + </li> + + <li> + <p>Go to <a href="http://repository.apache.org/";>http://repository.apache.org/</a>, + log in, chose "Staging Repositories", find and + click the repository just created. Check the upload files + manually (on the "Content" tab). Then + "Close" the repository. Press + "Refresh" until it's successfully + "closed".</p> + </li> + </ol></div> + </li> + + <li> + <p>Upload the release documentation under + http://freemarker.org/builds/<em>X.X.X</em>-voting/documentation/ + (see + https://git-wip-us.apache.org/repos/asf/incubator-freemarker-site.git, + "asf-site" branch). The change log will be a link + pointing to a page inside this.</p> + </li> + + <li> + <p>Voting on the FreeMarker developer list (the podling project + list)</p> + + <div class="orderedlist"><ol type="1"> + <li> + <p>Start a thread on the FreeMarker developer mailing list + with subject "[VOTE] Release Apache FreeMarker + <em>X.X.X</em> (incubating)". You + should use an earlier release vote mail as a template.</p> + </li> + + <li> + <p>Needs at least 3 binding +1, majority win, and minimum + 72 hours (but see Apache policies)</p> + </li> + + <li> + <p>Post "[RESULT][VOTE]" mail to the + FreeMarker developer list. Again, you should use an earlier + release vote result mail as a template.</p> + </li> + + <li> + <p>If it was a failed vote, after fixing the issues, the + release process restarts with a different dist.apache.org + URL-s (add an attempt number to the directory for + example)</p> + </li> + </ol></div> + </li> + + <li> + <p>If the voting on the the FreeMarker developer list has + passed, start similar "[VOTE]" thread on + general@incubator</p> + + <div class="orderedlist"><ol type="1"> + <li> + <p>Use an earlier FreeMarker release vote mail as the + template. Some notes:</p> + + <ul> + <li> + <p>Use your apache.org e-mail address as the + sender</p> + </li> + + <li> + <p>Include short project description</p> + </li> + + <li> + <p>Link the FreeMarker developer mailing list + "[RESULT][VOTE]" mail</p> + </li> + + <li> + <p>Link artifacts. The src artifact is the release + that's voted upon. The bin is for convenience only.</p> + </li> + + <li> + <p>Include and link via the Git commit + <em>hash</em></p> + </li> + + <li> + <p>Link the change log (page under + http://freemarker.org/builds/<em>X.X.X</em>/)</p> + </li> + + <li> + <p>Specify Maven staging coordinates</p> + </li> + </ul> + </li> + + <li> + <p>Needs at least 3 binding +1, majority wins, at least 72 + hours has passed</p> + </li> + + <li> + <p>Post "[RESULT][VOTE]" to general@incubator. + Use an earlier such mail as template. Some notes:</p> + + <ul> + <li> + <p>Use your apache.org e-mail address as the + sender</p> + </li> + + <li> + <p>Include short project description</p> + </li> + </ul> + </li> + + <li> + <p>If it was a failed vote, after fixing the issues, the + release process restarts with a different dist.apache.org + URL-s (add an attempt number to the directory for + example)</p> + </li> + </ol></div> + </li> + + <li> + <p>Copy the release files over from + https://dist.apache.org/repos/dist/<strong>dev</strong>/incubator/freemarker into the proper + subdirectory of https://dist.apache.org/repos/dist/<strong>release</strong>/incubator/freemarker and commit + them. (Of course get rid of any voting attempt numbers in the + directory names.) Now they should appear under <a href="http://www.apache.org/dist/incubator/freemarker/";>http://www.apache.org/dist/incubator/freemarker/</a>.</p> + </li> + + <li> + <p>Go to <a href="https://repository.apache.org/";>https://repository.apache.org/</a> + and find the staging repository that belongs to the voted version. + Select it, press "Release" at the top. Now the + repository should appear under <a href="https://repository.apache.org/content/repositories/releases/org/freemarker/";>https://repository.apache.org/content/repositories/releases/org/freemarker/</a> + Later (like hours later) it will appear in the Maven Central + Repository too.</p> + </li> + + <li> + <p>Wait 24 hours so that the mirrors get synced. Check <a href="http://www.apache.org/dist/incubator/freemarker/";>http://www.apache.org/dist/incubator/freemarker/</a> + and <a href="http://archive.apache.org/dist/";>http://archive.apache.org/dist/</a>. + Check Maven Central repository too (in the case of non-RC + releases).</p> + </li> + + <li> + <p>Delete the non-latest release of each maintained branch from + http://www.apache.org/dist/incubator/freemarker/ (Old ones are + automatically available on http://archive.apache.org/dist/)</p> + </li> + + <li> + <p>Tag the release on Git (see earlier tags for the tag name + format). Be careful not to tag a commit made since the voting has + succeeded.</p> + </li> + + <li> + <p>Update http://freemarker.org:</p> + + <ul> + <li> + <p>Add the release to the download section.</p> + </li> + + <li> + <p>Upload latest JavaDoc</p> + </li> + + <li> + <p>Update release date in the Manual, regenerate it.</p> + </li> + + <li> + <p>Upload the new Manual</p> + </li> + </ul> + </li> + + <li> + <p>Update other web pages:</p> + + <ul> + <li> + <p>Release on sourceforge.net. The README.md should note + that it's for convenience only, and point to the official + download page.</p> + </li> + + <li> + <p>Update Apache project status page:</p> + + <div class="orderedlist"><ol type="1"> + <li> + <p>Update and commit: + https://svn.apache.org/repos/asf/incubator/public/trunk/content/projects/freemarker.xml</p> + </li> + + <li> + <p>Republish: + https://cms.apache.org/incubator/publish</p> + </li> + </ol></div> + </li> + + <li> + <p>Update <a href="https://en.wikipedia.org/wiki/FreeMarker";>https://en.wikipedia.org/wiki/FreeMarker</a></p> + </li> + </ul> + </li> + + <li> + <p>Announce:</p> + + <ul> + <li> + <p>On the FreeMarker developer list</p> + </li> + + <li> + <p>On [email protected] (see <a href="https://lists.apache.org/[email protected]";>https://lists.apache.org/[email protected]</a> + for examples).</p> + </li> + + <li> + <p>On <a href="https://twitter.com/freemarker";>https://twitter.com/freemarker</a></p> + </li> + + <li> + <p>On the old FreeMarker mailing lists: freemarker-user, + freemarker-devel, freemarker-announce</p> + </li> + </ul> + </li> + </ol></div> + </div></div> </div> + </div> +<div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 +<a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> +</div></div></div></body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/contribute.html ---------------------------------------------------------------------- diff --git a/contribute.html b/contribute.html index e091824..a63c332 100644 --- a/contribute.html +++ b/contribute.html @@ -174,23 +174,27 @@ ga('send', 'pageview'); <p>First you should <a href="mailing-lists.html">subsrcribe to the - developer mailing list</a> to discuss what you plant to do. If you - are going to contribute to the engine itself, you will need an <a href="http://www.apache.org/dev/new-committers-guide.html#cla";>Individual - Contributor License Agreement (ICLA) or Corporate CLA at the Apache - Software Foundation</a>.</p> + developer mailing list</a> to discuss what you plant to do.</p> + + <p>Then, fork the project on Github, and start working on the + appropriate branch (see <a href="sourcecode.html">the repositories + and branches here</a>). See the <code class="inline-code">README</code> file in + it for more information about building and IDE setup. When your + contribution is ready, send a pull request on Github. Then we can + still iterate over it until it becomes good enough for merging.</p> - <p>Of course, you will also want to check the project out from the - source code repository, and build it. See here <a href="sourcecode.html">what to check out</a>. After checking - something out, see the <code class="inline-code">README</code> file in it for more - information about building and IDE setup.</p> + <p>Note that you will need an <a href="http://www.apache.org/dev/new-committers-guide.html#cla";>Individual + Contributor License Agreement (ICLA) or Corporate CLA at the Apache + Software Foundation</a>, or else we can't merge in your + contribution.</p> - <p>Also, for more generic guidelines, see <a href="http://www.apache.org/foundation/getinvolved.html";>how to + <p>For more generic guidelines, see <a href="http://www.apache.org/foundation/getinvolved.html";>how to contribute to Apache projects</a>.</p> </div></div> </div> </div> <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: -<time itemprop="dateModified" datetime="2016-08-11T19:12:54Z" title="Thursday, August 11, 2016 7:12:54 PM GMT">2016-08-11 19:12:54 GMT</time></span></p> <p class="copyright"> -© <span itemprop="copyrightYear">1999</span>â2016 +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> </div></div></div></body> </html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/editors.html ---------------------------------------------------------------------- diff --git a/editors.html b/editors.html index bf7220c..d2c863d 100644 --- a/editors.html +++ b/editors.html @@ -228,8 +228,8 @@ ga('send', 'pageview'); FreeMarker out-of-the-box.</p></div></div> </div> </div> <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: -<time itemprop="dateModified" datetime="2016-09-22T18:07:23Z" title="Thursday, September 22, 2016 6:07:23 PM GMT">2016-09-22 18:07:23 GMT</time></span></p> <p class="copyright"> -© <span itemprop="copyrightYear">1999</span>â2016 +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> </div></div></div></body> </html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/freemarkerdownload.html ---------------------------------------------------------------------- diff --git a/freemarkerdownload.html b/freemarkerdownload.html index 9933380..3cdece6 100644 --- a/freemarkerdownload.html +++ b/freemarkerdownload.html @@ -215,8 +215,8 @@ two freemarker.jar-s and unpredictable behavior! </div></div> </div> </div> <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: -<time itemprop="dateModified" datetime="2016-08-11T19:12:54Z" title="Thursday, August 11, 2016 7:12:54 PM GMT">2016-08-11 19:12:54 GMT</time></span></p> <p class="copyright"> -© <span itemprop="copyrightYear">1999</span>â2016 +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> </div></div></div></body> </html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/history.html ---------------------------------------------------------------------- diff --git a/history.html b/history.html index fb06859..e637e83 100644 --- a/history.html +++ b/history.html @@ -130,8 +130,8 @@ ga('send', 'pageview'); </ul></div></div> </div> </div> <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: -<time itemprop="dateModified" datetime="2016-08-11T19:12:54Z" title="Thursday, August 11, 2016 7:12:54 PM GMT">2016-08-11 19:12:54 GMT</time></span></p> <p class="copyright"> -© <span itemprop="copyrightYear">1999</span>â2016 +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> </div></div></div></body> </html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index d3203da..f827688 100644 --- a/index.html +++ b/index.html @@ -130,8 +130,8 @@ ga('send', 'pageview'); </div></div> </div> </div> <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: -<time itemprop="dateModified" datetime="2016-08-11T19:12:54Z" title="Thursday, August 11, 2016 7:12:54 PM GMT">2016-08-11 19:12:54 GMT</time></span></p> <p class="copyright"> -© <span itemprop="copyrightYear">1999</span>â2016 +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> </div></div></div></body> </html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/mailing-lists.html ---------------------------------------------------------------------- diff --git a/mailing-lists.html b/mailing-lists.html index ef771bd..502e0d6 100644 --- a/mailing-lists.html +++ b/mailing-lists.html @@ -89,8 +89,8 @@ ga('send', 'pageview'); </div></div> </div> </div> <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: -<time itemprop="dateModified" datetime="2016-08-11T19:12:54Z" title="Thursday, August 11, 2016 7:12:54 PM GMT">2016-08-11 19:12:54 GMT</time></span></p> <p class="copyright"> -© <span itemprop="copyrightYear">1999</span>â2016 +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> </div></div></div></body> </html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/poweredBy.html ---------------------------------------------------------------------- diff --git a/poweredBy.html b/poweredBy.html index 7e62ef5..aad01dc 100644 --- a/poweredBy.html +++ b/poweredBy.html @@ -636,8 +636,8 @@ ga('send', 'pageview'); </div></div> </div> </div> <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: -<time itemprop="dateModified" datetime="2016-08-11T19:12:54Z" title="Thursday, August 11, 2016 7:12:54 PM GMT">2016-08-11 19:12:54 GMT</time></span></p> <p class="copyright"> -© <span itemprop="copyrightYear">1999</span>â2016 +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> </div></div></div></body> </html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/sitemap.xml ---------------------------------------------------------------------- diff --git a/sitemap.xml b/sitemap.xml index 14e6431..8f1e856 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -25,6 +25,9 @@ <loc>http://freemarker.org/contribute.html</loc> </url> <url> + <loc>http://freemarker.org/committer-howto.html</loc> + </url> + <url> <loc>http://freemarker.org/sourcecode.html</loc> </url> <url> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/sourcecode.html ---------------------------------------------------------------------- diff --git a/sourcecode.html b/sourcecode.html index 9e7123e..bee1eaf 100644 --- a/sourcecode.html +++ b/sourcecode.html @@ -100,8 +100,8 @@ ga('send', 'pageview'); has yet to be fully endorsed by the ASF.</em></p></div></div> </div> </div> <div class="site-footer"><div class="site-width"><div class="footer-top"><div class="col-left sitemap"><div class="column"><h3 class="column-header">Overview</h3><ul><li><a href="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><span class="last-updated"> Last generated: -<time itemprop="dateModified" datetime="2016-08-11T19:12:54Z" title="Thursday, August 11, 2016 7:12:54 PM GMT">2016-08-11 19:12:54 GMT</time></span></p> <p class="copyright"> -© <span itemprop="copyrightYear">1999</span>â2016 +<time itemprop="dateModified" datetime="2017-01-05T00:16:19Z" title="Thursday, January 5, 2017 12:16:19 AM GMT">2017-01-05 00:16:19 GMT</time></span></p> <p class="copyright"> +© <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://freemarker.org";>The Apache Software Foundation</a>. All rights reserved. </p> </div></div></div></body> </html> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/c3985277/toc.js ---------------------------------------------------------------------- diff --git a/toc.js b/toc.js index 67e5be4..0cd66dc 100644 --- a/toc.js +++ b/toc.js @@ -142,6 +142,14 @@ var toc = { "children": [ ] } +, +{ +"title": "Committer how-to", +"url": "committer-howto.html", +"isFile": true, +"children": [ +] +} ] } , @@ -151,24 +159,24 @@ var toc = { "isFile": true, "children": [ { -"title": "Sourceforge.net project\n page", -"url": "https://sourceforge.net/projects/freemarker/";, +"title": "Source code (Git)", +"url": "sourcecode.html", "isFile": true, "children": [ ] } , { -"title": "Source code (Git)", -"url": "sourcecode.html", +"title": "Project history", +"url": "history.html", "isFile": true, "children": [ ] } , { -"title": "Project history", -"url": "history.html", +"title": "Sourceforge.net (old)\n project page", +"url": "https://sourceforge.net/projects/freemarker/";, "isFile": true, "children": [ ]
