You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by fl...@apache.org on 2011/08/21 20:13:04 UTC

svn commit: r1160025 - in /incubator/jspwiki/site: docs/index.html xdocs/index.xml

Author: florianh
Date: Sun Aug 21 18:13:04 2011
New Revision: 1160025

URL: http://svn.apache.org/viewvc?rev=1160025&view=rev
Log:
JSPWIKI-701 (Website must display disclaimer text)

Modified:
    incubator/jspwiki/site/docs/index.html
    incubator/jspwiki/site/xdocs/index.xml

Modified: incubator/jspwiki/site/docs/index.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/docs/index.html?rev=1160025&r1=1160024&r2=1160025&view=diff
==============================================================================
--- incubator/jspwiki/site/docs/index.html (original)
+++ incubator/jspwiki/site/docs/index.html Sun Aug 21 18:13:04 2011
@@ -145,12 +145,28 @@ limitations under the License.
       <a name="Welcome to Apache JSPWiki">Welcome to Apache JSPWiki</a>
     </h1>
                         <p>
-       <img src="images/jspwiki_logo_s.png" align="left" />Apache JSPWiki is the apachified version of JSPWiki, a leading open source
+       <img src="images/jspwiki_logo_s.png" align="left" valign="top" />Apache JSPWiki is the apachified version of JSPWiki, a leading open source
        wiki engine.  It is currently ongoing a transformation from an LGPL project to an Apache project
        within the protective sheets of Apache Incubator.
     </p>
                 <p><a href="#top">Back to top</a></p>
                                                 <h1>
+      <a name="Disclaimer">Disclaimer</a>
+    </h1>
+                        <p>
+       Apache JSPWiki is an effort undergoing incubation at The Apache Software
+       Foundation (ASF), sponsored by the Apache Incubator.
+    </p>
+                                <p>
+       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.
+    </p>
+                <p><a href="#top">Back to top</a></p>
+                                                <h1>
       <a name="Project Status">Project Status</a>
     </h1>
                         <p>

Modified: incubator/jspwiki/site/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/site/xdocs/index.xml?rev=1160025&r1=1160024&r2=1160025&view=diff
==============================================================================
--- incubator/jspwiki/site/xdocs/index.xml (original)
+++ incubator/jspwiki/site/xdocs/index.xml Sun Aug 21 18:13:04 2011
@@ -29,11 +29,29 @@
   <section name="Welcome to Apache JSPWiki">
 
     <p>
-       <img src="images/jspwiki_logo_s.png" align="left"/>Apache JSPWiki is the apachified version of JSPWiki, a leading open source
+       <img src="images/jspwiki_logo_s.png" align="left" valign="top"/>Apache JSPWiki is the apachified version of JSPWiki, a leading open source
        wiki engine.  It is currently ongoing a transformation from an LGPL project to an Apache project
        within the protective sheets of Apache Incubator.
     </p>
-</section>
+
+  </section>
+
+  <section name="Disclaimer">
+
+    <p>
+       Apache JSPWiki is an effort undergoing incubation at The Apache Software
+       Foundation (ASF), sponsored by the Apache Incubator.
+    </p>
+    <p>
+       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.
+    </p>
+
+  </section>
 
 <section name="Project Status">