You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by je...@apache.org on 2011/08/23 22:07:15 UTC
svn commit: r1160880 - in /xmlgraphics/site: README.txt
src/documentation/content/xdocs/legal.xml
src/documentation/content/xdocs/team.xml src/documentation/skinconf.xml
Author: jeremias
Date: Tue Aug 23 20:07:15 2011
New Revision: 1160880
URL: http://svn.apache.org/viewvc?rev=1160880&view=rev
Log:
Changed README.txt to indicate that Forrest 0.9 is now required to build the website (because of the trademark-statement element in skinconf.xml).
Fixed legal page (contained wrong and incomplete information).
Fixed team.xml.
Made skinconf.xml well-formed and valid and fixed trademark information.
Modified:
xmlgraphics/site/README.txt
xmlgraphics/site/src/documentation/content/xdocs/legal.xml
xmlgraphics/site/src/documentation/content/xdocs/team.xml
xmlgraphics/site/src/documentation/skinconf.xml
Modified: xmlgraphics/site/README.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/site/README.txt?rev=1160880&r1=1160879&r2=1160880&view=diff
==============================================================================
--- xmlgraphics/site/README.txt (original)
+++ xmlgraphics/site/README.txt Tue Aug 23 20:07:15 2011
@@ -2,7 +2,7 @@ How to manage the XML Graphics website
=========================================
-* Make sure you have Apache Forrest 0.7 installed.
+* Make sure you have Apache Forrest 0.9 installed.
* FORREST_HOME must be set
* PATH should have an entry to Forrest's bin directory so you can easily run Forrest.
Modified: xmlgraphics/site/src/documentation/content/xdocs/legal.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/legal.xml?rev=1160880&r1=1160879&r2=1160880&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/legal.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/legal.xml Tue Aug 23 20:07:15 2011
@@ -26,17 +26,25 @@
<section id="Legal">
<title>Legal Stuff</title>
- <p>All material on this website is Copyright (c) 2004-2006 The Apache Software Foundation. All Rights Reserved.</p>
- </section>
-
- <section id="MoreDetails">
- <title>Details</title>
- <p> For details look at the file: <a href="http://www.apache.org/licenses/">Licenses - The Apache Software Foundation</a>.</p>
+ <p>All software and material on this website is licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License V2.0</a>.</p>
+ <p>For more details, please see the <a href="http://www.apache.org/licenses/">licenses page of The Apache Software Foundation</a>.</p>
</section>
<section id="Trademarks">
<title>Trademarks</title>
- <p>IBM is a trademark of International Business Systems, Inc. Lotus is a trademark of Lotus Development Corporation. Sun and Sun Microsystems are trademarks or registered trademarks of Sun Microsystems, Inc. UNIX is a registered trademark in the United States and other countries, exclusively licensed through X/Open Company, Ltd. Windows, WindowsNT, and Win32 are registered trademarks of Microsoft Corp. Mac OS X and Macintosh are registered trademarks of Apple Computer, Inc. All other product names mentioned herein and throughout the entire web site are trademarks of their respective owners.</p>
+ <p>
+ Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics
+ logos are trademarks of The Apache Software Foundation.
+ </p>
+ <p>
+ IBM is a trademark of International Business Systems, Inc.
+ Lotus is a trademark of Lotus Development Corporation.
+ Sun and Sun Microsystems are trademarks or registered trademarks of Sun Microsystems, Inc.
+ UNIX is a registered trademark in the United States and other countries, exclusively licensed through X/Open Company, Ltd.
+ Windows, WindowsNT, and Win32 are registered trademarks of Microsoft Corp.
+ Mac OS X and Macintosh are registered trademarks of Apple Computer, Inc.
+ </p>
+ <p>All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
</section>
</body>
Modified: xmlgraphics/site/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/team.xml?rev=1160880&r1=1160879&r2=1160880&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/team.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/team.xml Tue Aug 23 20:07:15 2011
@@ -48,10 +48,12 @@
<li><a href="mailto:spepping@apache.org">Simon Pepping</a></li>
<li><a href="mailto:pietsch@apache.org">Jörg Pietschmann</a></li>
</ul>
- <title>Emeritus Project Management Committee Members</title>
- <ul>
- <li><a href="mailto:chrisg@apache.org">Christian Geisert</a></li>
- </ul>
+ <section id="PMC-emeritus">
+ <title>Emeritus Project Management Committee Members</title>
+ <ul>
+ <li><a href="mailto:chrisg@apache.org">Christian Geisert</a></li>
+ </ul>
+ </section>
<note>
If you need to get into contact with the Apache XML Graphics PMC and require confidentiality,
send your mail to <a href="mailto:private@xmlgraphics.apache.org"><code>private@xmlgraphics.apache.org</code></a>.
Modified: xmlgraphics/site/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/skinconf.xml?rev=1160880&r1=1160879&r2=1160880&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/skinconf.xml (original)
+++ xmlgraphics/site/src/documentation/skinconf.xml Tue Aug 23 20:07:15 2011
@@ -68,7 +68,7 @@ See main/fresh-site/src/documentation/sk
<project-name>Apache XML Graphics</project-name>
<project-description>The Apache XML Graphics Project is responsible
for software licensed to the Apache Software Foundation intended
- for the creation & maintenance of: the conversion of XML formats
+ for the creation & maintenance of: the conversion of XML formats
to graphical output & related software components</project-description>
<project-url>http://xmlgraphics.apache.org/</project-url>
<project-logo>images/apache-xml-graphics.gif</project-logo>
@@ -96,7 +96,7 @@ See main/fresh-site/src/documentation/sk
<copyright-link>http://www.apache.org/licenses/</copyright-link>
<!-- Optional text trademark statement below the copyright statement -->
<trademark-statement>
- Apache, Apache Forrest, the Apache feather logo, and the Apache Forrest
+ Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics
logos are trademarks of The Apache Software Foundation. All other marks
mentioned may be trademarks or registered trademarks of their respective
owners.
@@ -113,6 +113,7 @@ See main/fresh-site/src/documentation/sk
<trail location="alt">
<link1 name="The Apache Software Foundation" href="http://www.apache.org/"/>
<link2 name="Apache XML Graphics Project" href="http://xmlgraphics.apache.org/"/>
+ <link3 name="" href=""/>
</trail>
<!-- Configure the TOC, i.e. the Table of Contents.
@max-depth
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org