Skip to content

Commit

Permalink
Even more incubation related parts are removed/update
Browse files Browse the repository at this point in the history
  • Loading branch information
ddekany committed Mar 30, 2018
1 parent d565f72 commit ac3c6d2
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 51 deletions.
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache FreeMarker (incubating)
Apache FreeMarker
Copyright 2015-2018 The Apache Software Foundation

This product includes software developed at
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Apache FreeMarker {version}
===========================

[![Build Status](https://travis-ci.org/apache/incubator-freemarker.svg?branch=2.3-gae)](https://travis-ci.org/apache/incubator-freemarker)
[![Build Status](https://travis-ci.org/apache/freemarker.svg?branch=2.3-gae)](https://travis-ci.org/apache/freemarker)

For the latest version or to report bugs visit:
https://freemarker.apache.org/
Expand Down
4 changes: 0 additions & 4 deletions rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ src/manual/zh_CN/figures/overview.png
src/manual/zh_CN/figures/tree.png
src/manual/zh_CN/logo.png

# Binaries/archives created in the Incubatir project:
src/manual/en_US/apache-incubator.png
src/manual/zh_CN/apache-incubator.png

# Rat thinks it's a binary, but it's UTF-16 text:
src/test/resources/freemarker/test/templatesuite/expected/output-encoding2.txt

Expand Down
16 changes: 3 additions & 13 deletions src/dist/bin/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,10 @@

=========================================================================

The Apache FreeMarker (incubating) documentation contains the following
binaries, which were created at the Apache FreeMarker (incubating)
project, and hence are covered by the same license as the other source
files of it:
The Apache FreeMarker documentation contains the following binaries,
which were created at the Apache FreeMarker project, and hence are
covered by the same license as the other source files of it:

documentation/_html/apache-incubator.png
documentation/_html/docgen-resources/img/patterned-bg.png
documentation/_html/docgen-resources/img/xxe.png
documentation/_html/favicon.png
Expand All @@ -219,14 +217,6 @@ files of it:

=========================================================================

The Apache FreeMarker (incubating) documentation contains the following
binaries, which were created at the Apache Incubator project, and hence
are covered by the same license as Apache FreeMarker (incubating):

documentation/_html/apache-incubator.png

=========================================================================

The documentation includes a selection of icons from various icon sets
(fonts), stored together inside these files, which were geneated with
https://icomoon.io/app/:
Expand Down
2 changes: 0 additions & 2 deletions src/dist/bin/documentation/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,5 @@
</ul>

<p><a href="https://freemarker.apache.org/">Visit the FreeMarker home page</a> (help, editor plugins, latest downloads, etc.)</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>
4 changes: 0 additions & 4 deletions src/dist/bin/rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ freemarker.jar
/documentation/_html/api/**

# Images/binaries that were create at FreeMarker:
documentation/_html/apache-incubator.png
documentation/_html/docgen-resources/img/patterned-bg.png
documentation/_html/docgen-resources/img/xxe.png
documentation/_html/favicon.png
Expand All @@ -29,9 +28,6 @@ documentation/_html/figures/overview.png
documentation/_html/figures/tree.png
documentation/_html/logo.png

# Images/binaries that were create at other Apache projects:
documentation/_html/apache-incubator.png

# Fonts whose license is detailed in the LICENSE file:
documentation/_html/docgen-resources/fonts/icomoon.eot
documentation/_html/docgen-resources/fonts/icomoon.svg
Expand Down
Binary file removed src/manual/en_US/apache-incubator.png
Binary file not shown.
32 changes: 14 additions & 18 deletions src/manual/en_US/book.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,6 @@
<para>FreeMarker is <link
xlink:href="http://www.fsf.org/philosophy/free-sw.html">Free</link>,
released under the Apache License, Version 2.0.</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">
Expand Down Expand Up @@ -27626,15 +27614,10 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
<title>Version history</title>

<section xml:id="versions_2_3_28">
<title>2.3.28 (incubating at Apache)</title>
<title>2.3.28</title>

<para>Release date: [FIXME]</para>

<para><emphasis role="bold">This is a stable, final
release.</emphasis> The <quote>incubating</quote> suffix is required
by the Apache Software Foundation until the project becomes a fully
accepted (graduated) Apache project.</para>

<section>
<title>Changes on the FTL side</title>

Expand Down Expand Up @@ -27955,6 +27938,19 @@ TemplateModel x = env.getVariable("x"); // get variable x</programlisting>
</listitem>
</itemizedlist>
</section>

<section>
<title>Other changes</title>

<itemizedlist>
<listitem>
<para>FreeMarker has graduated from the Apache Incubator (as of
2018-03-31), and now is a normal top-level project at Apache.
Therefore, the version number doesn't contain
<quote>-incubating</quote> anymore.</para>
</listitem>
</itemizedlist>
</section>
</section>

<section xml:id="versions_2_3_27">
Expand Down
4 changes: 0 additions & 4 deletions src/manual/en_US/docgen.cjson
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,3 @@ socialLinks: {
"Twitter": { class: "twitter", href: "olink:twitter" }
"Stack Overflow": { class: "stack-overflow", href: "olink:newStackOverflowQuestion" }
}

sideTOCLogos: [
{ src: "apache-incubator.png", alt: "Apache Incubator", href: "olink:asfIncubator" }
]
Binary file removed src/manual/zh_CN/apache-incubator.png
Binary file not shown.
4 changes: 0 additions & 4 deletions src/manual/zh_CN/docgen.cjson
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,3 @@ socialLinks: {
"Twitter": { class: "twitter", href: "olink:twitter" }
"Stack Overflow": { class: "stack-overflow", href: "olink:newStackOverflowQuestion" }
}

sideTOCLogos: [
{ src: "apache-incubator.png", alt: "Apache Incubator", href: "olink:asfIncubator" }
]

0 comments on commit ac3c6d2

Please sign in to comment.