Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site 309d0b6f9 -> 84a2861fe
Some additions to how-to / making releases 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/84a2861f Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/84a2861f Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/84a2861f Branch: refs/heads/asf-site Commit: 84a2861feee140ba8cb69bece819785e8ff1e4e3 Parents: 309d0b6 Author: ddekany <ddek...@apache.org> Authored: Sat Sep 30 12:18:41 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Sat Sep 30 12:18:41 2017 +0200 ---------------------------------------------------------------------- committer-howto.html | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/84a2861f/committer-howto.html ---------------------------------------------------------------------- diff --git a/committer-howto.html b/committer-howto.html index 5456009..af7dc0d 100644 --- a/committer-howto.html +++ b/committer-howto.html @@ -223,7 +223,9 @@ ga('send', 'pageview'); <li> <p>In the 2.3.x branch, we release two products, the normal and the GAE (Google App Engine) version. Hence when executing the - release steps, you do many of them twice.</p> + release steps, you do many of them twice. Changes are made into + the 2.3-gae branch, and then they are merged into the 2.3 branch + (unless a change only applies to 2.3).</p> </li> </ul> @@ -232,8 +234,23 @@ ga('send', 'pageview'); <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> + date.</p> + </li> + + <li> + <p>Ensure that the version number in the title and version + history of the Manual is up to date. Also the release date in the + Manual in the version history has to be updated. That's tricky as + you can't know it exactly, yet you can't change it when the actual + release is about to be done, as that would change the release + artifacts that were voted upon. So write the current date and + "+ release process" after it; that's how it will be + in the released artifacts.</p> + </li> + + <li> + <p>Ensure that all changes in the 2.3-gae branch were merged + into the 2.3 branch.</p> </li> <li> @@ -468,7 +485,9 @@ ga('send', 'pageview'); </li> <li> - <p>Upload the new Manual</p> + <p>Upload the new Manual (the online version, that is, the + one made with <code class="inline-code">ant + manualFreemarkerOrg</code>)</p> </li> </ul> </li> @@ -678,7 +697,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://try.freemarker.org/";>Try template online</a></li><li><a href="docs/dgui_template_exp.html#exp_cheatsheet">Expressions cheatsheet</a></li><li><a href="docs/ref_directive_alphaidx.html">#directives</a></li><li><a href="docs/ref_builtins_alphaidx.html">?built_ins</a></li><li><a href="docs/ref_specvar.html">.special_vars</a></li></ul></div><div class="column"><h3 class="column-header">Community</h3><ul><li><a href="https://github.com/apache/incubator -freemarker">FreeMarker on Github</a></li><li><a href="https://twitter.com/freemarker";>Follow us on Twitter</a></li><li><a href="https://issues.apache.org/jira/browse/FREEMARKER/";>Report a bug</a></li><li><a href="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-09-20T16:54:06Z" title="Wednesday, September 20, 2017 4:54:06 PM GMT">2017-09-20 16:54:06 GMT</time> </p> +<time itemprop="dateModified" datetime="2017-09-30T10:10:03Z" title="Saturday, September 30, 2017 10:10:03 AM GMT">2017-09-30 10:10:03 GMT</time> </p> <p class="copyright"> © <span itemprop="copyrightYear">1999</span>â2017 <a itemtype="http://schema.org/Organization"; itemprop="copyrightHolder" href="http://apache.org/";>The Apache Software Foundation</a>. Apache FreeMarker, FreeMarker, Apache Incubator, Apache, the Apache FreeMarker logo are trademarks of The Apache Software Foundation. </p>
