Added "License" link to ASF "licenes" to the menu, as requested by https://www.apache.org/foundation/marks/pmcs#navigation
Rephrased Project History section a bit, to make it even cleaner that it's not the history of ASF...
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index c5b68d5..dd477dc 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -2103,49 +2103,17 @@
<para/>
</section>
+ <section>
+ <title><olink targetdoc="asfLicense">License</olink></title>
+
+ <para/>
+ </section>
+
<section xml:id="history">
<title>Project history</title>
- <para>Development history, key contributors:</para>
-
- <itemizedlist>
- <listitem>
- <para>Later 1999, FreeMarker 1 has appeared on SourceForge.net. It
- was originally written by Benjamin Geer and Mike Bayer. They defined
- the basic syntax, and more importantly, the philosophy of the tool
- that is carried on in FreeMarker 2. Significant contributions to
- FreeMarker 1 were made by Nicholas Cull, Holger Arendt and
- others.</para>
- </listitem>
-
- <listitem>
- <para>In early 2002, Jonathan Revusky rewrote the core
- (parser/compiler) code using a popular parser generator tool,
- JavaCC. This was really the basis of FreeMarker 2, which, though was
- initially largely backward compatible with FreeMarker 1, is
- virtually a complete rewrite. <link
- xlink:href="http://www.szegedi.org/">Attila Szegedi</link> has made
- significant contributions to the FreeMarker 2. Besides refactoring
- and optimizing some of the core API's, Attila is the main author of
- the date/time support, <literal>freemarker.ext.*</literal> packages
- responsible for JavaBeans, Jython, and XML mappings, as well as for
- HTTP servlet, JSP and Ant integration. Dániel Dékány is the main
- author of the documentation, and has influenced many new features of
- FreeMarker 2, and has helped in maintenance work. Many ideas and
- feedback were provided by the various participants on the
- freemarker-devel and freemarker-user mailing lists, like <link
- xlink:href="http://sixlegs.com/">Chris Nokleberg</link>, <link
- xlink:href="http://stephan.notatoaster.org/">Stephan Mueller</link>,
- and many others.</para>
- </listitem>
-
- <listitem>
- <para>Since 2011, Dániel Dékány does most of the maintenance work
- and new features.</para>
- </listitem>
- </itemizedlist>
-
- <para>Legal history:</para>
+ <para>FreeMarker wasn't started at the Apache Software Foundation;
+ here's the legal history of the project:</para>
<itemizedlist>
<listitem>
@@ -2205,6 +2173,45 @@
by the ASF.</emphasis></para>
</listitem>
</itemizedlist>
+
+ <para>Development history, key contributors:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Later 1999, FreeMarker 1 has appeared on SourceForge.net. It
+ was originally written by Benjamin Geer and Mike Bayer. They defined
+ the basic syntax, and more importantly, the philosophy of the tool
+ that is carried on in FreeMarker 2. Significant contributions to
+ FreeMarker 1 were made by Nicholas Cull, Holger Arendt and
+ others.</para>
+ </listitem>
+
+ <listitem>
+ <para>In early 2002, Jonathan Revusky rewrote the core
+ (parser/compiler) code using a popular parser generator tool,
+ JavaCC. This was really the basis of FreeMarker 2, which, though was
+ initially largely backward compatible with FreeMarker 1, is
+ virtually a complete rewrite. <link
+ xlink:href="http://www.szegedi.org/">Attila Szegedi</link> has made
+ significant contributions to the FreeMarker 2. Besides refactoring
+ and optimizing some of the core API's, Attila is the main author of
+ the date/time support, <literal>freemarker.ext.*</literal> packages
+ responsible for JavaBeans, Jython, and XML mappings, as well as for
+ HTTP servlet, JSP and Ant integration. Dániel Dékány is the main
+ author of the documentation, and has influenced many new features of
+ FreeMarker 2, and has helped in maintenance work. Many ideas and
+ feedback were provided by the various participants on the
+ freemarker-devel and freemarker-user mailing lists, like <link
+ xlink:href="http://sixlegs.com/">Chris Nokleberg</link>, <link
+ xlink:href="http://stephan.notatoaster.org/">Stephan Mueller</link>,
+ and many others.</para>
+ </listitem>
+
+ <listitem>
+ <para>Since 2011, Dániel Dékány does most of the maintenance work
+ and new features.</para>
+ </listitem>
+ </itemizedlist>
</section>
</chapter>
</book>
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index f66a437..1c98942 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -93,6 +93,7 @@
asfThanks: "http://www.apache.org/foundation/thanks.html"
asfHome: "http://www.apache.org/"
asfIncubator: "http://incubator.apache.org/"
+ asfLicense: "http://www.apache.org/licenses/"
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"
