You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/01/02 15:15:44 UTC
[3/7] incubator-freemarker git commit: Added disclaimer to more
places. Changed FreeMarker to Apache FreeMarker in Manual book title and
preface.
Added disclaimer to more places. Changed FreeMarker to Apache FreeMarker in Manual book title and preface.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b8e81873
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b8e81873
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b8e81873
Branch: refs/heads/2.3
Commit: b8e81873450c3b4da9cabeb51c2389e371acf77e
Parents: 72d6ac1
Author: ddekany <dd...@apache.org>
Authored: Sat Jan 2 11:45:24 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Jan 2 11:45:24 2016 +0100
----------------------------------------------------------------------
README | 11 +++++++++++
src/dist/bin/documentation/index.html | 4 +++-
src/manual/en_US/book.xml | 16 ++++++++++++++--
3 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b8e81873/README
----------------------------------------------------------------------
diff --git a/README b/README
index d3c373f..5f479a4 100644
--- a/README
+++ b/README
@@ -27,6 +27,17 @@
===============================================================================
+ 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.
+
What is Apache FreeMarker?
--------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b8e81873/src/dist/bin/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/bin/documentation/index.html b/src/dist/bin/documentation/index.html
index 6d98acd..5e31bc4 100644
--- a/src/dist/bin/documentation/index.html
+++ b/src/dist/bin/documentation/index.html
@@ -30,7 +30,7 @@
padding: 2em;
color: #000000;
font-family: Arial,sans-serif;
- font-size: 20px;
+ font-size: 16px;
}
h1 {
font-size: 166%;
@@ -61,5 +61,7 @@
</ul>
<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>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b8e81873/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 26dd513..56a8cd3 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -20,12 +20,13 @@
<book conformance="docgen" version="5.0" xml:lang="en"
xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:ns5="http://www.w3.org/1999/xhtml"
xmlns:ns4="http://www.w3.org/2000/svg"
xmlns:ns3="http://www.w3.org/1998/Math/MathML"
xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title>FreeMarker Manual</title>
+ <title>Apache FreeMarker Manual</title>
<titleabbrev>Manual</titleabbrev>
@@ -33,7 +34,7 @@
</info>
<preface role="index.html" xml:id="preface">
- <title>What is FreeMarker?</title>
+ <title>What is Apache FreeMarker?</title>
<para>FreeMarker is a <emphasis>template engine</emphasis>: a generic tool
to generate text output (HTML web pages, e-mails, configuration files,
@@ -71,6 +72,17 @@
<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><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>
</preface>
<part xml:id="dgui">