Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site 2a507a819 -> d40e4b497
Added preface to the "Contributors wanted!" page. Turned on page ToC on it, also one the Comitter how-to page. 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/d40e4b49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/d40e4b49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/d40e4b49 Branch: refs/heads/asf-site Commit: d40e4b4971375d6f3464e6638f5fd81075fbe4d0 Parents: 2a507a8 Author: ddekany <[email protected]> Authored: Thu Jan 5 11:36:49 2017 +0100 Committer: ddekany <[email protected]> Committed: Thu Jan 5 11:36:49 2017 +0100 ---------------------------------------------------------------------- committer-howto.html | 87 ++++++++++++-- contribute.html | 281 +++++++++++++++++++++++-------------------- editors.html | 2 +- freemarkerdownload.html | 2 +- history.html | 2 +- index.html | 2 +- mailing-lists.html | 2 +- poweredBy.html | 2 +- sourcecode.html | 2 +- toc.js | 54 +++++++++ 10 files changed, 290 insertions(+), 146 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/committer-howto.html ---------------------------------------------------------------------- diff --git a/committer-howto.html b/committer-howto.html index 1493367..aedce77 100644 --- a/committer-howto.html +++ b/committer-howto.html @@ -39,7 +39,9 @@ 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="committer-howto" itemprop="headline">Committer how-to</h1> -</div></div><p><em>This page applies to Committers only, not to usual +</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 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 @@ -48,7 +50,7 @@ ga('send', 'pageview'); -<h2 class="content-header header-simplesect" id="autoid_27">Git commit policies</h2> +<h2 class="content-header header-section2" id="git-commit-policy">Git commit policies</h2> <p>A Committer can commit directly into the Apache Git repository @@ -75,7 +77,7 @@ ga('send', 'pageview'); -<h2 class="content-header header-simplesect" id="autoid_28">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 @@ -102,14 +104,15 @@ ga('send', 'pageview'); <ul> <li> - <p><code class="inline-code"><em class="code-color"><PROJECT></em></code> - is usually <code class="inline-code">incubator-freemarker</code></p> + <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> + <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> @@ -128,7 +131,7 @@ ga('send', 'pageview'); -<h2 class="content-header header-simplesect" id="autoid_29">Making releases</h2> +<h2 class="content-header header-section2" id="making-releases">Making releases</h2> <p>For each release, one of the Committers plays the role of @@ -470,10 +473,74 @@ ga('send', 'pageview'); </ul> </li> </ol></div> + + + + + +<h2 class="content-header header-section2" id="updating-homepage">Updating the FreeMarker home page</h2> + + + <p>The content of the home page can be changed by committing it + into the <code class="inline-code">asf-site</code> branch of the + <code class="inline-code">freemarker-site</code> repository. However, you shouldn't + directly edit the content of most HTML files there, as pretty much all + of them are generated, and then is just manually copied over there. + The generated pieces are:</p> + + <ul> + <li> + <p>The contents of the <code class="inline-code">docs/api</code> is generated + from the <code class="inline-code">freemarker</code> project, by issuing + <code class="inline-code">ant javadoc</code> there (not in the + <code class="inline-code">site</code> project). So to change the content, you + should edit the documentation comments in the java files.</p> + </li> + + <li> + <p>The contents of <code class="inline-code">docs/</code> is generated from + the <code class="inline-code">freemarker</code> project, by issuing <code class="inline-code">ant + manualFreemarkerOrg</code>. So to change the content, you + should edit + <code class="inline-code"><em class="code-color"><freemarker-project></em>/src/manual/en_US/book.xml</code>.</p> + </li> + + <li> + <p>Most other content is generated from the + <code class="inline-code">site</code> project, by issuing + <code class="inline-code">ant</code>. So to change the content, you should edit + <code class="inline-code"><em class="code-color"><site-project></em>/src/docgen/book.xml</code>.</p> + </li> + </ul> + + <p>After you commit into the <code class="inline-code">asf-site</code> branch of + the <code class="inline-code">freemarker-site</code> repository, it will + automatically appear on the web site, with some small delay (a few + seconds usually). If it doesn't, that's probably because of a known + infrastructural glitch, where for too big commits this synchronization + doesn't happen. In such case, commit some small change to trigger + synchronization again.</p> + + + + + +<h2 class="content-header header-section2" id="edit-docbook">Regarding editing the Manual and the Site DocBook</h2> + + + <p>Both the site and the Manual is generated from the XML files + (DocBook format) by the custom Ant task defined in the + <code class="inline-code">docgen</code> project + (<code class="inline-code">freemarker-docgen</code> repository). That project also + provides an XMLMind XML Editor (XXE for short) addon for editing these + files. For more guide lines see + <code class="inline-code">src/manual/en_US/docgen-help/editors-readme.txt</code> in + the <code class="inline-code">freemarker</code> repository. About the same guide + lines apply to the site DocBook as well.</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="2017-01-05T07:36:29Z" title="Thursday, January 5, 2017 7:36:29 AM GMT">2017-01-05 07:36:29 GMT</time></span></p> <p class="copyright"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/contribute.html ---------------------------------------------------------------------- diff --git a/contribute.html b/contribute.html index a63c332..77538c8 100644 --- a/contribute.html +++ b/contribute.html @@ -39,138 +39,18 @@ 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="contribute" itemprop="headline">Contributors wanted!</h1> -</div></div><p>Usually, contributors come because they want to fix/improve a - certain thing. But if you just want to help in general, here are some - topics that are not (that) hard to jump into and are considered to be - important:</p><ul> - <li> - <p>Improve tooling:</p> - - <ul> - <li> - <p>Eclipse plugin. Either help improving the JBoss Tools - "FreeMarker IDE" (<a href="https://issues.jboss.org/browse/JBIDE-20512?jql=project%20%3D%20JBIDE%20AND%20status%20in%20%28Open%2C%20%22Coding%20In%20Progress%22%2C%20Reopened%2C%20%22Pull%20Request%20Sent%22%29%20AND%20component%20%3D%20freemarker";>see - open issues</a>), or if you have serious ambitions, even - start your own!</p> - </li> - - <li> - <p>IntelliJ plugin. Check how well it works (like support for - recent FreeMarker features), try to find a way to contribute - where needed.</p> - </li> - - <li> - <p>Plugin or syntax highlighter for you favorite editor - (Notepad++, jEdit, VIM, etc.) that actually covers FTL - reasonably well, and is legally properly contributed to the - project.</p> - </li> - - <li> - <p>Online editor, syntax highlighter. This might means - FreeMarker support for CodeMirror. This, among others, would be - useful in the <a href="http://freemarker-online.kenshoo.com/";>online - template tester</a>.</p> - </li> - </ul> - </li> - - <li> - <p>Improve framework integration:</p> - - <ul> - <li> - <p>FreeMarker Spring MVC integration. Someone who know both - well should keep an eye on this, improving it where - necessary.</p> - </li> - - <li> - <p>FreeMarker Struts integration. Same as with Spring - MVC.</p> - </li> - </ul> - </li> - - <li> - <p>Android support. This is related to the next two points - too</p> - </li> - - <li> - <p>Bean introspection without - <code class="inline-code">javax.bean.Introspector</code> (or in additionally to - it). FreeMarker relies on this class for maximum conformance to the - JavaBeans specs., however, its limitations start to hurt too much: - It doesn't work on Android, it doesn't support Java 8 default - methods, and it's not lenient enough in many cases (<code class="inline-code">Boolean - isXxx</code> doesn't work, <code class="inline-code">xFoo</code> is not a - possible property name of <code class="inline-code">getXFoo</code>, etc.), it - doesn't work with static methods - (<code class="inline-code">BeansWrapper.staticModels</code>).</p> - </li> - - <li> - <p>Support for Java 8 date/time API-s (this is actually certainly - a difficult one)</p> - </li> - - <li> - <p><code class="inline-code">javax.script</code> (JSR-223) support</p> - </li> - - <li> - <p>Write <code class="inline-code">TemplateLoader</code> that loads from - database (<code class="inline-code">DataSource</code>)</p> - </li> - - <li> - <p>Migrate build from Ant to Gradle. Or for Docgen an Site, Maven - is certainly a good fit.</p> - </li> - - <li> - <p>Performance tests, to spot performance regressions.</p> - </li> - </ul><p>Continuous activities that are always welcome:</p><ul> - <li> - <p>Spotting mistakes in commits; more eyes see more</p> - </li> - - <li> - <p>Trying to break new features before they are released (finding - bugs)</p> - </li> - - <li> - <p>Improve JUnit coverage where it's due</p> - </li> - - <li> - <p>Fixing typos in the documentation (includes JavaDoc!)</p> - </li> - - <li> - <p>Help users. This mostly means monitoring FreeMarker related - questions on Stack Overflow.</p> - </li> - - <li> - <p>Pick a bug from the bug tracker, and squash it.</p> - </li> - - <li> - <p>Recommend using FreeMarker to others when there's a fitting - task</p> - </li> - </ul><p>Last not least, FreeMarker needs long standing/returning - contributors who tackle deeper issues.</p> +</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 + 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 + advance!</p> -<h2 class="content-header header-simplesect" id="autoid_26">What to do if I want to contribute</h2> +<h2 class="content-header header-section2" id="how-to-contribute">How do I contribute?</h2> <p>First you should <a href="mailing-lists.html">subsrcribe to the @@ -190,10 +70,153 @@ ga('send', 'pageview'); <p>For more generic guidelines, see <a href="http://www.apache.org/foundation/getinvolved.html";>how to contribute to Apache projects</a>.</p> + + + + + +<h2 class="content-header header-section2" id="what-to-contribute">What should I contribute?</h2> + + + <p>Usually, contributors come because they want to fix/improve a + certain thing. But if you just want to help in general, here are some + topics that are not (that) hard to jump into and are considered to be + important:</p> + + <ul> + <li> + <p>Improve tooling:</p> + + <ul> + <li> + <p>Eclipse plugin. Either help improving the JBoss Tools + "FreeMarker IDE" (<a href="https://issues.jboss.org/browse/JBIDE-20512?jql=project%20%3D%20JBIDE%20AND%20status%20in%20%28Open%2C%20%22Coding%20In%20Progress%22%2C%20Reopened%2C%20%22Pull%20Request%20Sent%22%29%20AND%20component%20%3D%20freemarker";>see + open issues</a>), or if you have serious ambitions, even + start your own!</p> + </li> + + <li> + <p>IntelliJ plugin. Check how well it works (like support + for recent FreeMarker features), try to find a way to + contribute where needed.</p> + </li> + + <li> + <p>Plugin or syntax highlighter for you favorite editor + (Notepad++, jEdit, VIM, etc.) that actually covers FTL + reasonably well, and is legally properly contributed to the + project.</p> + </li> + + <li> + <p>Online editor, syntax highlighter. This might means + FreeMarker support for CodeMirror. This, among others, would + be useful in the <a href="http://freemarker-online.kenshoo.com/";>online template + tester</a>.</p> + </li> + </ul> + </li> + + <li> + <p>Improve framework integration:</p> + + <ul> + <li> + <p>FreeMarker Spring MVC integration. Someone who know both + well should keep an eye on this, improving it where + necessary.</p> + </li> + + <li> + <p>FreeMarker Struts integration. Same as with Spring + MVC.</p> + </li> + </ul> + </li> + + <li> + <p>Android support. This is related to the next two points + too</p> + </li> + + <li> + <p>Bean introspection without + <code class="inline-code">javax.bean.Introspector</code> (or in additionally to + it). FreeMarker relies on this class for maximum conformance to + the JavaBeans specs., however, its limitations start to hurt too + much: It doesn't work on Android, it doesn't support Java 8 + default methods, and it's not lenient enough in many cases + (<code class="inline-code">Boolean isXxx</code> doesn't work, + <code class="inline-code">xFoo</code> is not a possible property name of + <code class="inline-code">getXFoo</code>, etc.), it doesn't work with static + methods (<code class="inline-code">BeansWrapper.staticModels</code>).</p> + </li> + + <li> + <p>Support for Java 8 date/time API-s (this is actually + certainly a difficult one)</p> + </li> + + <li> + <p><code class="inline-code">javax.script</code> (JSR-223) support</p> + </li> + + <li> + <p>Write <code class="inline-code">TemplateLoader</code> that loads from + database (<code class="inline-code">DataSource</code>)</p> + </li> + + <li> + <p>Migrate build from Ant to Gradle. Or for Docgen an Site, + Maven is certainly a good fit.</p> + </li> + + <li> + <p>Performance tests, to spot performance regressions.</p> + </li> + </ul> + + <p>Continuous activities that are always welcome:</p> + + <ul> + <li> + <p>Spotting mistakes in commits; more eyes see more</p> + </li> + + <li> + <p>Trying to break new features before they are released + (finding bugs)</p> + </li> + + <li> + <p>Improve JUnit coverage where it's due</p> + </li> + + <li> + <p>Fixing typos in the documentation (includes JavaDoc!)</p> + </li> + + <li> + <p>Help users. This mostly means monitoring FreeMarker related + questions on Stack Overflow.</p> + </li> + + <li> + <p>Pick a bug from the bug tracker, and squash it.</p> + </li> + + <li> + <p>Recommend using FreeMarker to others when there's a fitting + task</p> + </li> + </ul> + + <p>Last not least, FreeMarker needs long standing/returning + contributors who tackle deeper issues.</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="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"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/editors.html ---------------------------------------------------------------------- diff --git a/editors.html b/editors.html index d2c863d..25498a1 100644 --- a/editors.html +++ b/editors.html @@ -228,7 +228,7 @@ 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="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"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/freemarkerdownload.html ---------------------------------------------------------------------- diff --git a/freemarkerdownload.html b/freemarkerdownload.html index 3cdece6..ac28e8a 100644 --- a/freemarkerdownload.html +++ b/freemarkerdownload.html @@ -215,7 +215,7 @@ 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="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"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/history.html ---------------------------------------------------------------------- diff --git a/history.html b/history.html index e637e83..66c813b 100644 --- a/history.html +++ b/history.html @@ -130,7 +130,7 @@ 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="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"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index f827688..7d854cb 100644 --- a/index.html +++ b/index.html @@ -130,7 +130,7 @@ 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="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"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/mailing-lists.html ---------------------------------------------------------------------- diff --git a/mailing-lists.html b/mailing-lists.html index 502e0d6..c9c634b 100644 --- a/mailing-lists.html +++ b/mailing-lists.html @@ -89,7 +89,7 @@ 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="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"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/poweredBy.html ---------------------------------------------------------------------- diff --git a/poweredBy.html b/poweredBy.html index aad01dc..486bf1f 100644 --- a/poweredBy.html +++ b/poweredBy.html @@ -636,7 +636,7 @@ 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="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"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/sourcecode.html ---------------------------------------------------------------------- diff --git a/sourcecode.html b/sourcecode.html index bee1eaf..0b22504 100644 --- a/sourcecode.html +++ b/sourcecode.html @@ -100,7 +100,7 @@ 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="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"> +<time itemprop="dateModified" datetime="2017-01-05T10:35:05Z" title="Thursday, January 5, 2017 10:35:05 AM GMT">2017-01-05 10:35:05 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> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d40e4b49/toc.js ---------------------------------------------------------------------- diff --git a/toc.js b/toc.js index 0cd66dc..1bfc066 100644 --- a/toc.js +++ b/toc.js @@ -140,6 +140,21 @@ var toc = { "url": "contribute.html", "isFile": true, "children": [ +{ +"title": "How do I contribute?", +"url": "contribute.html#how-to-contribute", +"isFile": false, +"children": [ +] +} +, +{ +"title": "What should I contribute?", +"url": "contribute.html#what-to-contribute", +"isFile": false, +"children": [ +] +} ] } , @@ -148,6 +163,45 @@ var toc = { "url": "committer-howto.html", "isFile": true, "children": [ +{ +"title": "Git commit policies", +"url": "committer-howto.html#git-commit-policy", +"isFile": false, +"children": [ +] +} +, +{ +"title": "Merging in pull requests from Github", +"url": "committer-howto.html#merging-pull-request", +"isFile": false, +"children": [ +] +} +, +{ +"title": "Making releases", +"url": "committer-howto.html#making-releases", +"isFile": false, +"children": [ +] +} +, +{ +"title": "Updating the FreeMarker home page", +"url": "committer-howto.html#updating-homepage", +"isFile": false, +"children": [ +] +} +, +{ +"title": "Regarding editing the Manual and the Site DocBook", +"url": "committer-howto.html#edit-docbook", +"isFile": false, +"children": [ +] +} ] } ]
