Permalink
Browse files

The "sponsored by" part was missing from the incubation disclaimer.

  • Loading branch information...
1 parent c739651 commit 32b7be4011a594fdfe064d47765188fa3aefabe2 ddekany committed Jul 1, 2016
Showing with 31 additions and 28 deletions.
  1. +8 −8 DISCLAIMER
  2. +1 −1 src/dist/bin/documentation/index.html
  3. +22 −19 src/manual/en_US/book.xml
View
@@ -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.
@@ -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>
@@ -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>

0 comments on commit 32b7be4

Please sign in to comment.