Added a "Foundation" section to the menu that helps finding ASF related things. Moved all things over from Miscellaneous to Community.
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/52a6c604 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/52a6c604 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/52a6c604 Branch: refs/heads/master Commit: 52a6c60495e74fd53ff6e83592e5b76ae8d70187 Parents: 424f3c1 Author: ddekany <[email protected]> Authored: Sat Nov 11 19:55:42 2017 +0100 Committer: ddekany <[email protected]> Committed: Sat Nov 11 19:55:42 2017 +0100 ---------------------------------------------------------------------- src/main/docgen/book.xml | 171 +++++++++++++++++++++----------------- src/main/docgen/docgen.cjson | 3 + 2 files changed, 98 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/52a6c604/src/main/docgen/book.xml ---------------------------------------------------------------------- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index e29e3a2..c5b68d5 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -573,6 +573,88 @@ two freemarker.jar-s and unpredictable behavior! <para/> </section> + <section xml:id="sourcecode"> + <title>Source code (Git)</title> + + <para>The key project repositories are at the Apache Software + Foundation, as part of the <link + xlink:href="http://incubator.apache.org/";>Apache Incubation</link> + effort. These Apache repositories are mirrored back to GitHub + (read-only), which is practical for sending patches via usual GitHub + forking and pull requests. The key repositories are:</para> + + <itemizedlist> + <listitem> + <para><literal>freemarker</literal>: The engine itself (i.e., + <literal>freemarker.jar</literal>) and the documentation. URL: + <olink targetdoc="gitFreemarker"/>. GitHub mirror: <olink + targetdoc="githubMirrorFreemarker"/>. Relevant branches (as of + 2015-09-04):</para> + + <itemizedlist> + <listitem> + <para><literal>2.3-gae</literal>: FreeMarker 2.3.x Google App + Engine compliant variant. <emphasis role="bold">Develop here by + default!</emphasis> This is where most developments are + committed, and are then merged into the other two branches + below.</para> + </listitem> + + <listitem> + <para><literal>2.3</literal>: FreeMarker 2.3.x, + <quote>normal</quote> variant (this is what most users use). We + hardly ever commit into this directly, instead changes are + coming from<literal>2.3-gae</literal> via merging.</para> + </listitem> + + <listitem> + <para><literal>3</literal>: FreeMarker 3.x.x. The next + generation of FreeMarker, heavily under development. <link + xlink:href="https://cwiki.apache.org/confluence/display/FREEMARKER/FreeMarker+3";>More + about FreeMarker 3...</link></para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> + <para><literal>freemarker-site</literal>: Web site + (freemarker.apache.org) contents. URL: <olink targetdoc="gitSite"/>. + GitHub mirror: <olink targetdoc="githubMirrorSite"/>. Relevant + branches: <literal>master</literal></para> + </listitem> + + <listitem> + <para><literal>freemarker-docgen</literal>: DocBook transformation + used for generating both the FreeMarker Manual and the Web site. + URL: <olink targetdoc="gitDocgen"/>. GitHub mirror: <olink + targetdoc="githubMirrorDocgen"/>. Relevant branches: + <literal>master</literal></para> + </listitem> + + <listitem> + <para><literal>freemarker-online-tester</literal>: The service + behind <olink targetdoc="onlineTemplateTester"/>. URL: <olink + targetdoc="gitOnlineTester"/>. GitHub mirror: <olink + targetdoc="githubMirrorOnlineTester"/>. Relevant branches: + <literal>master</literal></para> + </listitem> + </itemizedlist> + + <para>There are some other FreeMarker-related repositories, such FMPP + and Tutorials, which you can only find on the <olink + targetdoc="githubProjectOld">old GitHub project</olink> page, as they + aren't part of the ongoing Apache Incubation effort.</para> + + <para><emphasis>Disclaimer: Apache FreeMarker is an effort undergoing + incubation at The Apache Software Foundation (ASF). Incubation is + required of all newly accepted projects until a further review indicates + that the infrastructure, communications, and decision making process + have stabilized in a manner consistent with other successful ASF + projects. While incubation status is not necessarily a reflection of the + completeness or stability of the code, it does indicate that the project + has yet to be fully endorsed by the ASF.</emphasis></para> + </section> + <section> <title><olink targetdoc="twitter">Get news on Twitter</olink></title> @@ -2000,88 +2082,25 @@ two freemarker.jar-s and unpredictable behavior! </chapter> <chapter> - <title>Miscellaneous</title> + <title>Foundation</title> - <section xml:id="sourcecode"> - <title>Source code (Git)</title> - - <para>The key project repositories are at the Apache Software - Foundation, as part of the <link - xlink:href="http://incubator.apache.org/";>Apache Incubation</link> - effort. These Apache repositories are mirrored back to GitHub - (read-only), which is practical for sending patches via usual GitHub - forking and pull requests. The key repositories are:</para> - - <itemizedlist> - <listitem> - <para><literal>freemarker</literal>: The engine itself (i.e., - <literal>freemarker.jar</literal>) and the documentation. URL: - <olink targetdoc="gitFreemarker"/>. GitHub mirror: <olink - targetdoc="githubMirrorFreemarker"/>. Relevant branches (as of - 2015-09-04):</para> - - <itemizedlist> - <listitem> - <para><literal>2.3-gae</literal>: FreeMarker 2.3.x Google App - Engine compliant variant. <emphasis role="bold">Develop here by - default!</emphasis> This is where most developments are - committed, and are then merged into the other two branches - below.</para> - </listitem> - - <listitem> - <para><literal>2.3</literal>: FreeMarker 2.3.x, - <quote>normal</quote> variant (this is what most users use). We - hardly ever commit into this directly, instead changes are - coming from<literal>2.3-gae</literal> via merging.</para> - </listitem> - - <listitem> - <para><literal>3</literal>: FreeMarker 3.x.x. The next - generation of FreeMarker, heavily under development. <link - xlink:href="https://cwiki.apache.org/confluence/display/FREEMARKER/FreeMarker+3";>More - about FreeMarker 3...</link></para> - </listitem> - </itemizedlist> - </listitem> + <section> + <title><olink targetdoc="asfHome">Apache Software + Foundation</olink></title> - <listitem> - <para><literal>freemarker-site</literal>: Web site - (freemarker.apache.org) contents. URL: <olink targetdoc="gitSite"/>. - GitHub mirror: <olink targetdoc="githubMirrorSite"/>. Relevant - branches: <literal>master</literal></para> - </listitem> + <para/> + </section> - <listitem> - <para><literal>freemarker-docgen</literal>: DocBook transformation - used for generating both the FreeMarker Manual and the Web site. - URL: <olink targetdoc="gitDocgen"/>. GitHub mirror: <olink - targetdoc="githubMirrorDocgen"/>. Relevant branches: - <literal>master</literal></para> - </listitem> + <section> + <title><olink targetdoc="asfSponsorship">Sponsorship</olink></title> - <listitem> - <para><literal>freemarker-online-tester</literal>: The service - behind <olink targetdoc="onlineTemplateTester"/>. URL: <olink - targetdoc="gitOnlineTester"/>. GitHub mirror: <olink - targetdoc="githubMirrorOnlineTester"/>. Relevant branches: - <literal>master</literal></para> - </listitem> - </itemizedlist> + <para/> + </section> - <para>There are some other FreeMarker-related repositories, such FMPP - and Tutorials, which you can only find on the <olink - targetdoc="githubProjectOld">old GitHub project</olink> page, as they - aren't part of the ongoing Apache Incubation effort.</para> + <section> + <title><olink targetdoc="asfThanks">Thanks</olink></title> - <para><emphasis>Disclaimer: Apache FreeMarker is an effort undergoing - incubation at The Apache Software Foundation (ASF). Incubation is - required of all newly accepted projects until a further review indicates - that the infrastructure, communications, and decision making process - have stabilized in a manner consistent with other successful ASF - projects. While incubation status is not necessarily a reflection of the - completeness or stability of the code, it does indicate that the project - has yet to be fully endorsed by the ASF.</emphasis></para> + <para/> </section> <section xml:id="history"> http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/52a6c604/src/main/docgen/docgen.cjson ---------------------------------------------------------------------- diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson index e665b44..c458100 100644 --- a/src/main/docgen/docgen.cjson +++ b/src/main/docgen/docgen.cjson @@ -89,6 +89,9 @@ olinks: { newBugReport: "https://issues.apache.org/jira/browse/FREEMARKER/"; oldBugTracker: "https://sourceforge.net/p/freemarker/bugs/"; newStackOverflowQuestion: "https://stackoverflow.com/questions/ask?tags=freemarker"; + asfSponsorship: "http://www.apache.org/foundation/sponsorship.html"; + asfThanks: "http://www.apache.org/foundation/thanks.html"; + asfHome: "http://www.apache.org/"; emacsPluginDownload: "https://sourceforge.net/projects/freemarker/files/editor-plugins/ftl.el/download"; kwritePluginDownload: "https://sourceforge.net/projects/freemarker/files/editor-plugins/kwriteftl.tar.gz/download";
