Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae c73965188 -> 32b7be401
The "sponsored by" part was missing from the incubation disclaimer. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/32b7be40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/32b7be40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/32b7be40 Branch: refs/heads/2.3-gae Commit: 32b7be4011a594fdfe064d47765188fa3aefabe2 Parents: c739651 Author: ddekany <[email protected]> Authored: Fri Jul 1 20:40:30 2016 +0200 Committer: ddekany <[email protected]> Committed: Fri Jul 1 20:40:30 2016 +0200 ---------------------------------------------------------------------- DISCLAIMER | 16 ++++++------ src/dist/bin/documentation/index.html | 2 +- src/manual/en_US/book.xml | 41 ++++++++++++++++-------------- 3 files changed, 31 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/32b7be40/DISCLAIMER ---------------------------------------------------------------------- diff --git a/DISCLAIMER b/DISCLAIMER index b56f1c4..569ba05 100644 --- a/DISCLAIMER +++ b/DISCLAIMER @@ -1,8 +1,8 @@ -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. +Apache FreeMarker is an effort undergoing incubation at The Apache Software +Foundation (ASF), sponsored by the Apache Incubator. 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. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/32b7be40/src/dist/bin/documentation/index.html ---------------------------------------------------------------------- diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html index 5e31bc4..cc5ce08 100644 --- a/src/dist/bin/documentation/index.html +++ b/src/dist/bin/documentation/index.html @@ -62,6 +62,6 @@ <p><a href="http://freemarker.org/";>Visit the FreeMarker home page</a> (help, editor plugins, latest downloads, etc.)</p> - <p><i>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.</i></p> + <p><i><b>Disclaimer:</b> Apache FreeMarker is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. 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.</i></p> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/32b7be40/src/manual/en_US/book.xml ---------------------------------------------------------------------- diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index 9190e2a..b58779f 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -73,16 +73,17 @@ xlink:href="http://www.fsf.org/philosophy/free-sw.html";>Free</link>, released under the Apache License, Version 2.0.</para> - <para><emphasis><emphasis><emphasis role="bold">Disclaimer: Apache - FreeMarker is an effort undergoing <link - xlink:href="http://incubator.apache.org";>incubation</link> at The Apache - Software Foundation (ASF).</emphasis></emphasis> 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><emphasis role="bold">Disclaimer: </emphasis><emphasis>Apache + FreeMarker is an effort undergoing incubation at The Apache Software + Foundation (ASF), sponsored by the <link + xlink:href="http://incubator.apache.org";>Apache Incubator</link>. + 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> </preface> <part xml:id="dgui"> @@ -26752,15 +26753,17 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting> but the owner is different. The official full product name has changed to Apache FreeMarker.</para> - <para>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.</para> + <para><emphasis role="bold">Disclaimer:</emphasis><emphasis> Apache + FreeMarker is an effort undergoing incubation at The Apache Software + Foundation (ASF), sponsored by the <link + xlink:href="http://incubator.apache.org";>Apache Incubator</link>. + 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>
